[accumulo] branch master updated: Fix deprecation warnings

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 790001a  Fix deprecation warnings
790001a is described below

commit 790001ad335b9fb8db9211bfcd0212f530279b78
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Feb 22 14:28:44 2019 -0500

    Fix deprecation warnings
---
 .../java/org/apache/accumulo/core/clientImpl/OfflineIterator.java   | 2 ++
 .../org/apache/accumulo/core/iterators/system/MapFileIterator.java  | 1 +
 .../apache/accumulo/core/iterators/DefaultIteratorEnvironment.java  | 2 +-
 .../java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java | 6 +++---
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
index 0598ccb..46407f8 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
@@ -80,6 +80,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
       this.sampleConf = samplerConf;
     }
 
+    @Deprecated
     @Override
     public AccumuloConfiguration getConfig() {
       return conf;
@@ -102,6 +103,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> 
{
 
     private ArrayList<SortedKeyValueIterator<Key,Value>> topLevelIterators = 
new ArrayList<>();
 
+    @Deprecated
     @Override
     public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
       topLevelIterators.add(iter);
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
index 15f63c2..f893255 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
@@ -119,6 +119,7 @@ public class MapFileIterator implements FileSKVIterator {
   @Override
   public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
     try {
+      @SuppressWarnings("deprecation")
       SortedKeyValueIterator<Key,Value> other = 
env.reserveMapFileReader(dirName);
       ((InterruptibleIterator) other).setInterruptFlag(interruptFlag);
       log.debug("deep copying MapFile: {} -> {}", this, other);
diff --git 
a/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
 
b/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
index 2f8ba0a..cd5465c 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
@@ -39,8 +39,8 @@ public class DefaultIteratorEnvironment implements 
IteratorEnvironment {
     this.conf = DefaultConfiguration.getInstance();
   }
 
+  @Deprecated
   @Override
-  @SuppressWarnings("deprecation")
   public SortedKeyValueIterator<Key,Value> reserveMapFileReader(String 
mapFileName)
       throws IOException {
     FileSystem fs = FileSystem.get(hadoopConf);
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
index dbbec0d..1f6fbe7 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
@@ -122,8 +122,8 @@ public class TabletIteratorEnvironment implements 
SystemIteratorEnvironment {
     this.topLevelIterators = new ArrayList<>();
   }
 
+  @Deprecated
   @Override
-  @SuppressWarnings("deprecation")
   public AccumuloConfiguration getConfig() {
     return tableConfig;
   }
@@ -148,16 +148,16 @@ public class TabletIteratorEnvironment implements 
SystemIteratorEnvironment {
     return userCompaction;
   }
 
+  @Deprecated
   @Override
-  @SuppressWarnings("deprecation")
   public SortedKeyValueIterator<Key,Value> reserveMapFileReader(String 
mapFileName)
       throws IOException {
     FileRef ref = new FileRef(mapFileName, new Path(mapFileName));
     return trm.openFiles(Collections.singletonMap(ref, files.get(ref)), false, 
null).get(0);
   }
 
+  @Deprecated
   @Override
-  @SuppressWarnings("deprecation")
   public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
     topLevelIterators.add(iter);
   }