Revert "Revert "Revert "Renamed FileMoveAction helpers from copy to…

… `move`""" This reverts commit 2320cdb.
neo4j · Jun 28, 2018 · 66dc5de · 66dc5de
1 parent b6ccf4c
commit 66dc5de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveAction.java
@@ -38,7 +38,7 @@ public interface FileMoveAction
 
     File file();
 
-    static FileMoveAction moveViaPageCache( File file, PageCache pageCache )
+    static FileMoveAction copyViaPageCache( File file, PageCache pageCache )
     {
         return new FileMoveAction()
         {
@@ -61,7 +61,7 @@ public File file()
         };
     }
 
-    static FileMoveAction moveViaFileSystem( File file, File basePath )
+    static FileMoveAction copyViaFileSystem( File file, File basePath )
     {
         Path base = basePath.toPath();
         return new FileMoveAction()

diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/FileMoveProvider.java
@@ -175,8 +175,8 @@ private FileMoveAction moveFileCorrectly( File fileToMove, File basePath )
     {
         if ( fileMoveActionInformer.shouldBeManagedByPageCache( fileToMove.getName() ) )
         {
-            return FileMoveAction.moveViaPageCache( fileToMove, pageCache );
+            return FileMoveAction.copyViaPageCache( fileToMove, pageCache );
         }
-        return FileMoveAction.moveViaFileSystem( fileToMove, basePath );
+        return FileMoveAction.copyViaFileSystem( fileToMove, basePath );
     }
 }
diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ToFileStoreWriter.java
@@ -103,7 +103,7 @@ public long write( String path, ReadableByteChannel data, ByteBuffer temporaryBu
     // the page cache later on when we want to move the files written through the page cache.
     private void addPageCacheMoveAction( File file )
     {
-        fileMoveActions.add( FileMoveAction.moveViaPageCache( file, pageCache ) );
+        fileMoveActions.add( FileMoveAction.copyViaPageCache( file, pageCache ) );
     }
 
     private int filePageSize( int alignment )

diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/FileMoveActionTest.java
@@ -59,7 +59,7 @@ public void pageCacheFilesMovedDoNotLeaveOriginal() throws IOException
 
         // when
         File targetRename = new File( "target" );
-        FileMoveAction.moveViaPageCache( pageCacheFile, pageCache ).move( targetRename );
+        FileMoveAction.copyViaPageCache( pageCacheFile, pageCache ).move( targetRename );
 
         // then
         assertFalse( pageCacheFile.exists() );
@@ -84,7 +84,7 @@ public void nonPageCacheFilesMovedDoNotLeaveOriginal() throws IOException
         assertFalse( targetFile.exists() );
 
         // when
-        FileMoveAction.moveViaFileSystem( sourceFile, sourceDirectory ).move( targetDirectory );
+        FileMoveAction.copyViaFileSystem( sourceFile, sourceDirectory ).move( targetDirectory );
 
         // then
         assertTrue( targetFile.exists() );