From c68e2f274a2bede1c6d0b20f7793821c1859758a Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Mon, 29 Jul 2019 09:10:00 +0200 Subject: [PATCH] HBASE-22756 Removed deprecated method from SingleColumnValueFilter (#422) Signed-off-by: Peter Somogyi --- .../hbase/filter/SingleColumnValueExcludeFilter.java | 2 +- .../hadoop/hbase/filter/SingleColumnValueFilter.java | 9 --------- .../org/apache/hadoop/hbase/rest/model/ScannerModel.java | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java index 0c0d4f3e220..dbbd59e90b1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java @@ -115,7 +115,7 @@ public class SingleColumnValueExcludeFilter extends SingleColumnValueFilter { SingleColumnValueFilter.createFilterFromArguments(filterArguments); SingleColumnValueExcludeFilter filter = new SingleColumnValueExcludeFilter ( tempFilter.getFamily(), tempFilter.getQualifier(), - tempFilter.getOperator(), tempFilter.getComparator()); + tempFilter.getCompareOperator(), tempFilter.getComparator()); if (filterArguments.size() == 6) { filter.setFilterIfMissing(tempFilter.getFilterIfMissing()); diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java index 5563ae70ec4..283ea9b9300 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java @@ -138,15 +138,6 @@ public class SingleColumnValueFilter extends FilterBase { this.latestVersionOnly = latestVersionOnly; } - /** - * @return operator - * @deprecated since 2.0.0. Will be removed in 3.0.0. Use {@link #getCompareOperator()} instead. - */ - @Deprecated - public CompareOperator getOperator() { - return CompareOperator.valueOf(op.name()); - } - public CompareOperator getCompareOperator() { return op; } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java index 831bb3a630b..dff0e9968fe 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java @@ -339,7 +339,7 @@ public class ScannerModel implements ProtobufMessageHandler, Serializable { if (qualifier != null) { this.qualifier = Bytes.toString(Base64.getEncoder().encode(qualifier)); } - this.op = scvf.getOperator().toString(); + this.op = scvf.getCompareOperator().toString(); this.comparator = new ByteArrayComparableModel(scvf.getComparator()); if (scvf.getFilterIfMissing()) {