[gobblin] branch master updated: GOBBLIN-1719 Replace moveToTrash with moveToAppropriateTrash for hadoop trash (#3573)

[zihanli58]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e642c7c13 GOBBLIN-1719 Replace moveToTrash with moveToAppropriateTrash 
for hadoop trash (#3573)
e642c7c13 is described below

commit e642c7c139198d0b4f8f1ffe120244172b24300a
Author: Xing Lin <linxing...@gmail.com>
AuthorDate: Mon Oct 3 14:46:16 2022 -0700

    GOBBLIN-1719 Replace moveToTrash with moveToAppropriateTrash for hadoop 
trash (#3573)
    
    Co-authored-by: Xing Lin <xing...@linkedin.com>
---
 .../src/main/java/org/apache/gobblin/util/HadoopUtils.java           | 3 +--
 .../src/test/java/org/apache/gobblin/util/HadoopUtilsTest.java       | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/gobblin-utility/src/main/java/org/apache/gobblin/util/HadoopUtils.java 
b/gobblin-utility/src/main/java/org/apache/gobblin/util/HadoopUtils.java
index 0a0846143..3e020f6f8 100644
--- a/gobblin-utility/src/main/java/org/apache/gobblin/util/HadoopUtils.java
+++ b/gobblin-utility/src/main/java/org/apache/gobblin/util/HadoopUtils.java
@@ -221,8 +221,7 @@ public class HadoopUtils {
    * @throws IOException
    */
   public static void moveToTrash(FileSystem fs, Path path, Configuration conf) 
throws IOException {
-    Trash trash = new Trash(fs, conf);
-    trash.moveToTrash(path);
+    Trash.moveToAppropriateTrash(fs, path, conf);
   }
 
   /**
diff --git 
a/gobblin-utility/src/test/java/org/apache/gobblin/util/HadoopUtilsTest.java 
b/gobblin-utility/src/test/java/org/apache/gobblin/util/HadoopUtilsTest.java
index a62193b0a..7c6d51c1b 100644
--- a/gobblin-utility/src/test/java/org/apache/gobblin/util/HadoopUtilsTest.java
+++ b/gobblin-utility/src/test/java/org/apache/gobblin/util/HadoopUtilsTest.java
@@ -324,11 +324,12 @@ public class HadoopUtilsTest {
     FileSystem fs = FileSystem.getLocal(conf);
     Trash trash = new Trash(fs, conf);
     TrashPolicy trashPolicy = TrashPolicy.getInstance(conf, fs, 
fs.getHomeDirectory());
-    Path trashPath = trashPolicy.getCurrentTrashDir();
+    Path trashPath = Path.mergePaths(trashPolicy.getCurrentTrashDir(), 
hadoopUtilsTestDir);
 
     fs.mkdirs(hadoopUtilsTestDir);
     Assert.assertTrue(fs.exists(hadoopUtilsTestDir));
-    trash.moveToTrash(hadoopUtilsTestDir.getParent());
+    // Move the parent dir to trash because we created it at the beginning of 
this function.
+    HadoopUtils.moveToTrash(fs, hadoopUtilsTestDir.getParent(), conf);
     Assert.assertFalse(fs.exists(hadoopUtilsTestDir));
     Assert.assertTrue(fs.exists(trashPath));
   }