From ef887e52927a391e820d7c22188c16f6ee9853e3 Mon Sep 17 00:00:00 2001
From: Jan Hentschel <jan.hentschel@ultratendency.com>
Date: Sun, 11 Aug 2019 21:42:53 +0200
Subject: [PATCH] HBASE-22832 Removed deprecated method from HFileOutputFormat2

Signed-off-by: stack <stack@apache.org>
---
 .../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 14 --------------
 .../hbase/mapreduce/TestHFileOutputFormat2.java    |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 1ae6a2a6e2e..c963c6c18ae 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.TableName;
@@ -117,19 +116,6 @@ public class HFileOutputFormat2
       this.regionLocator = regionLocator;
     }
 
-    /**
-     * The modification for the returned HTD doesn't affect the inner TD.
-     * @return A clone of inner table descriptor
-     * @deprecated since 2.0.0 and will be removed in 3.0.0. Use {@link #getTableDescriptor()}
-     *   instead.
-     * @see #getTableDescriptor()
-     * @see <a href="https://issues.apache.org/jira/browse/HBASE-18241">HBASE-18241</a>
-     */
-    @Deprecated
-    public HTableDescriptor getHTableDescriptor() {
-      return new HTableDescriptor(tableDesctiptor);
-    }
-
     public TableDescriptor getTableDescriptor() {
       return tableDesctiptor;
     }
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
index 40f1a08f32d..60127a66524 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
@@ -787,7 +787,7 @@ public class TestHFileOutputFormat2  {
     }
     else {
       RegionLocator regionLocator = tableInfo.get(0).getRegionLocator();
-      HFileOutputFormat2.configureIncrementalLoad(job, tableInfo.get(0).getHTableDescriptor(),
+      HFileOutputFormat2.configureIncrementalLoad(job, tableInfo.get(0).getTableDescriptor(),
               regionLocator);
       assertEquals(regionLocator.getAllRegionLocations().size(), job.getNumReduceTasks());
     }