You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/11 00:29:37 UTC
[1/3] accumulo git commit: ACCUMULO-3789 Re-remove deprecation and
just note binary compat reasons
Repository: accumulo
Updated Branches:
refs/heads/1.7 f91385488 -> 67effa0fb
refs/heads/master 688fa0419 -> 411f87a93
ACCUMULO-3789 Re-remove deprecation and just note binary compat reasons
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67effa0f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67effa0f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67effa0f
Branch: refs/heads/1.7
Commit: 67effa0fb2472e68981d6874973634bcd1aaf059
Parents: f913854
Author: Josh Elser <el...@apache.org>
Authored: Sun May 10 18:24:53 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 10 18:24:53 2015 -0400
----------------------------------------------------------------------
.../client/lexicoder/BigIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/DateLexicoder.java | 6 +-----
.../core/client/lexicoder/DoubleLexicoder.java | 6 +-----
.../core/client/lexicoder/IntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ListLexicoder.java | 6 +-----
.../core/client/lexicoder/PairLexicoder.java | 6 +-----
.../core/client/lexicoder/StringLexicoder.java | 6 +-----
.../core/client/lexicoder/TextLexicoder.java | 6 +-----
.../core/client/lexicoder/UIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ULongLexicoder.java | 6 +-----
.../core/client/lexicoder/UUIDLexicoder.java | 6 +-----
.../accumulo/core/iterators/LongCombiner.java | 18 +++---------------
.../core/iterators/user/BigDecimalCombiner.java | 6 +-----
.../core/iterators/user/SummingArrayCombiner.java | 12 ++----------
14 files changed, 17 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
index 59db11c..8147f18 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
@@ -63,13 +63,9 @@ public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> implement
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public BigInteger decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 2d928b4..84ad808 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -34,13 +34,9 @@ public class DateLexicoder extends AbstractLexicoder<Date> implements Lexicoder<
return longEncoder.encode(data.getTime());
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Date decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index c473f5f..67cf4d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -38,13 +38,9 @@ public class DoubleLexicoder extends AbstractLexicoder<Double> implements Lexico
return longEncoder.encode(l);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Double decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index f3c481d..f113f48 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -33,13 +33,9 @@ public class IntegerLexicoder extends AbstractLexicoder<Integer> implements Lexi
return uil.encode(i ^ 0x80000000);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Integer decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index 99ffe3b..d78cff2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -56,13 +56,9 @@ public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Le
return concat(encElements);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<LT> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index 679e823..9198b43 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -65,13 +65,9 @@ public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> exte
return concat(escape(firstLexicoder.encode(data.getFirst())), escape(secondLexicoder.encode(data.getSecond())));
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public ComparablePair<A,B> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index 94558ce..cec78de 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -34,13 +34,9 @@ public class StringLexicoder extends AbstractLexicoder<String> implements Lexico
return data.getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public String decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 55702b6..2129ce7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -34,13 +34,9 @@ public class TextLexicoder extends AbstractLexicoder<Text> implements Lexicoder<
return TextUtil.getBytes(data);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Text decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index 8194244..bd41ab6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -53,13 +53,9 @@ public class UIntegerLexicoder extends AbstractLexicoder<Integer> implements Lex
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Integer decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index 72d4a52..0176043 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -74,13 +74,9 @@ public class ULongLexicoder extends AbstractLexicoder<Long> implements Lexicoder
return l;
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index 423c371..70405f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -56,13 +56,9 @@ public class UUIDLexicoder extends AbstractLexicoder<UUID> implements Lexicoder<
}
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public UUID decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 7bd8079..35ceb6e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -133,13 +133,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return baos.toByteArray();
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -172,13 +168,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return b;
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -212,13 +204,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return Long.toString(v).getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index f2c03f3..d9e6cdd 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -108,13 +108,9 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal>
return v.toString().getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public BigDecimal decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 32b7a7a..260fa36 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -162,13 +162,9 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
return baos.toByteArray();
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<V> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -225,13 +221,9 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
return sb.toString().getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<Long> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
[3/3] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/411f87a9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/411f87a9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/411f87a9
Branch: refs/heads/master
Commit: 411f87a93fec4dedc1699d271a6a806c80141595
Parents: 688fa04 67effa0
Author: Josh Elser <el...@apache.org>
Authored: Sun May 10 18:29:25 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 10 18:29:25 2015 -0400
----------------------------------------------------------------------
.../client/lexicoder/BigIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/DateLexicoder.java | 6 +-----
.../core/client/lexicoder/DoubleLexicoder.java | 6 +-----
.../core/client/lexicoder/IntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ListLexicoder.java | 6 +-----
.../core/client/lexicoder/PairLexicoder.java | 6 +-----
.../core/client/lexicoder/StringLexicoder.java | 6 +-----
.../core/client/lexicoder/TextLexicoder.java | 6 +-----
.../core/client/lexicoder/UIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ULongLexicoder.java | 6 +-----
.../core/client/lexicoder/UUIDLexicoder.java | 6 +-----
.../accumulo/core/iterators/LongCombiner.java | 18 +++---------------
.../core/iterators/user/BigDecimalCombiner.java | 6 +-----
.../core/iterators/user/SummingArrayCombiner.java | 12 ++----------
14 files changed, 17 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3789 Re-remove deprecation and
just note binary compat reasons
Posted by el...@apache.org.
ACCUMULO-3789 Re-remove deprecation and just note binary compat reasons
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67effa0f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67effa0f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67effa0f
Branch: refs/heads/master
Commit: 67effa0fb2472e68981d6874973634bcd1aaf059
Parents: f913854
Author: Josh Elser <el...@apache.org>
Authored: Sun May 10 18:24:53 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun May 10 18:24:53 2015 -0400
----------------------------------------------------------------------
.../client/lexicoder/BigIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/DateLexicoder.java | 6 +-----
.../core/client/lexicoder/DoubleLexicoder.java | 6 +-----
.../core/client/lexicoder/IntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ListLexicoder.java | 6 +-----
.../core/client/lexicoder/PairLexicoder.java | 6 +-----
.../core/client/lexicoder/StringLexicoder.java | 6 +-----
.../core/client/lexicoder/TextLexicoder.java | 6 +-----
.../core/client/lexicoder/UIntegerLexicoder.java | 6 +-----
.../core/client/lexicoder/ULongLexicoder.java | 6 +-----
.../core/client/lexicoder/UUIDLexicoder.java | 6 +-----
.../accumulo/core/iterators/LongCombiner.java | 18 +++---------------
.../core/iterators/user/BigDecimalCombiner.java | 6 +-----
.../core/iterators/user/SummingArrayCombiner.java | 12 ++----------
14 files changed, 17 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
index 59db11c..8147f18 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
@@ -63,13 +63,9 @@ public class BigIntegerLexicoder extends AbstractLexicoder<BigInteger> implement
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public BigInteger decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 2d928b4..84ad808 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -34,13 +34,9 @@ public class DateLexicoder extends AbstractLexicoder<Date> implements Lexicoder<
return longEncoder.encode(data.getTime());
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Date decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index c473f5f..67cf4d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -38,13 +38,9 @@ public class DoubleLexicoder extends AbstractLexicoder<Double> implements Lexico
return longEncoder.encode(l);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Double decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index f3c481d..f113f48 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -33,13 +33,9 @@ public class IntegerLexicoder extends AbstractLexicoder<Integer> implements Lexi
return uil.encode(i ^ 0x80000000);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Integer decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index 99ffe3b..d78cff2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -56,13 +56,9 @@ public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Le
return concat(encElements);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<LT> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index 679e823..9198b43 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -65,13 +65,9 @@ public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> exte
return concat(escape(firstLexicoder.encode(data.getFirst())), escape(secondLexicoder.encode(data.getSecond())));
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public ComparablePair<A,B> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index 94558ce..cec78de 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -34,13 +34,9 @@ public class StringLexicoder extends AbstractLexicoder<String> implements Lexico
return data.getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public String decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 55702b6..2129ce7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -34,13 +34,9 @@ public class TextLexicoder extends AbstractLexicoder<Text> implements Lexicoder<
return TextUtil.getBytes(data);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Text decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index 8194244..bd41ab6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -53,13 +53,9 @@ public class UIntegerLexicoder extends AbstractLexicoder<Integer> implements Lex
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Integer decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index 72d4a52..0176043 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -74,13 +74,9 @@ public class ULongLexicoder extends AbstractLexicoder<Long> implements Lexicoder
return l;
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index 423c371..70405f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -56,13 +56,9 @@ public class UUIDLexicoder extends AbstractLexicoder<UUID> implements Lexicoder<
}
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public UUID decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 7bd8079..35ceb6e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -133,13 +133,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return baos.toByteArray();
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -172,13 +168,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return b;
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -212,13 +204,9 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
return Long.toString(v).getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public Long decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index f2c03f3..d9e6cdd 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -108,13 +108,9 @@ public abstract class BigDecimalCombiner extends TypedValueCombiner<BigDecimal>
return v.toString().getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public BigDecimal decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67effa0f/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 32b7a7a..260fa36 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -162,13 +162,9 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
return baos.toByteArray();
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<V> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}
@@ -225,13 +221,9 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
return sb.toString().getBytes(UTF_8);
}
- /**
- * @deprecated Since 1.7.0
- */
@Override
- @Deprecated
public List<Long> decode(byte[] b) {
- // This concrete implementation is provided for backwards compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
+ // This concrete implementation is provided for binary compatibility with 1.6; it can be removed in 2.0. See ACCUMULO-3789.
return super.decode(b);
}