OAK-11420: Remove usage of Guava Files.move() - changes undone

apache · Jan 27, 2025 · 7efcf23 · 7efcf23
1 parent 20c0a5a
commit 7efcf23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java b/...plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
@@ -449,7 +449,7 @@ public void reconcile(File recs) throws IOException {
                     }
                 }
 
-                Files.move(removed.toPath(), delFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                org.apache.jackrabbit.guava.common.io.Files.move(removed, delFile);
                 LOG.trace("removed active delete records");
             } finally {
                 lock.unlock();

diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
@@ -74,7 +74,7 @@ private FileIOUtils() {
     public static void sort(File file) throws IOException {
         File sorted = createTempFile("fleioutilssort", null);
         merge(sortInBatch(file, lexComparator, true), sorted);
-        Files.move(sorted.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        org.apache.jackrabbit.guava.common.io.Files.move(sorted, file);
     }
 
     /**
@@ -87,7 +87,7 @@ public static void sort(File file) throws IOException {
     public static void sort(File file, Comparator<String> comparator) throws IOException {
         File sorted = createTempFile("fleioutilssort", null);
         merge(sortInBatch(file, comparator, true), sorted, comparator);
-        Files.move(sorted.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        org.apache.jackrabbit.guava.common.io.Files.move(sorted, file);
     }
 
     /**