[GEOS-7946] Using java.nio.file.Files.move() with ATOMIC_MOVE option …

…to avoid case sensitivity issues

src/platform/src/main/java/org/geoserver/platform/resource/FileSystemResourceStore.java

@@ -15,6 +15,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.NoSuchFileException;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -135,7 +136,10 @@ public boolean move(String path, String target) {
 
         try {
             dest.getParentFile().mkdirs(); // Make sure there's somewhere to move to.
-            return Files.move(file, dest);
+            java.nio.file.Files.move(java.nio.file.Paths.get(file.getAbsolutePath()),
+                    java.nio.file.Paths.get(dest.getAbsolutePath()),
+                    StandardCopyOption.ATOMIC_MOVE);
+            return true;
         } catch (IOException e) {
             throw new IllegalStateException("Unable to move " + path + " to " + target, e);
         }

src/platform/src/test/java/org/geoserver/platform/resource/FileSystemResourceStoreTest.java

@@ -1,22 +1,15 @@
 package org.geoserver.platform.resource;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ System.class, Files.class})
 public class FileSystemResourceStoreTest {
 
     TemporaryFolder folder = new TemporaryFolder();
@@ -33,54 +26,70 @@ public void deleteTmpFolder() throws IOException {
     }
 
     @Test
-    public void renameDirNamesDifferLinux() throws IOException, InterruptedException {
-        PowerMockito.mockStatic(System.class);
-        Mockito.when(System.getProperty("os.name")).thenReturn("linux");
-        String newName = "DirB";
+    public void renameSameFileName() throws IOException, InterruptedException {
+        String sameName = "Filea";
 
-        attemptRename("DirA", newName);
+        attemptRenameFile(sameName, sameName);
 
-        assertEquals(newName, folder.getRoot().list()[0]);
+        assertEquals(sameName, folder.getRoot().list()[0]);
     }
 
     @Test
-    public void renameDirNamesCaseDifferLinux() throws IOException, InterruptedException {
-        PowerMockito.mockStatic(System.class);
-        Mockito.when(System.getProperty("os.name")).thenReturn("linux");
-        String newName = "Dira";
+    public void renameFileNamesCaseDiffer() throws IOException, InterruptedException {
+        String newName = "Filea";
 
-        attemptRename("DirA", newName);
+        attemptRenameFile("FileA", newName);
 
         assertEquals(newName, folder.getRoot().list()[0]);
     }
 
-
     @Test
-    public void renameDirNamesDifferWindows() throws IOException, InterruptedException {
-        PowerMockito.mockStatic(System.class);
-        Mockito.when(System.getProperty("os.name")).thenReturn("Windows");
-        String newName = "DirB";
+    public void renameFileNamesDiffer() throws IOException, InterruptedException {
+        String newName = "FileB";
 
-        attemptRename("DirA", newName);
+        attemptRenameFile("FileA", newName);
 
         assertEquals(newName, folder.getRoot().list()[0]);
+    }
 
+    @Test
+    public void renameSameDirName() throws IOException, InterruptedException {
+        String sameName = "Dira";
+
+        attemptRenameDir(sameName, sameName);
+
+        assertEquals(sameName, folder.getRoot().list()[0]);
     }
 
     @Test
-    public void renameDirNamesCaseDifferWindows() throws IOException, InterruptedException {
-        PowerMockito.mockStatic(System.class);
-        Mockito.when(System.getProperty("os.name")).thenReturn("Windows");
-        String oldName = "DirA";
+    public void renameDirNamesCaseDiffer() throws IOException, InterruptedException {
         String newName = "Dira";
 
-        attemptRename("DirA", newName);
+        attemptRenameDir("DirA", newName);
 
-        assertEquals(oldName, folder.getRoot().list()[0]);
+        assertEquals(newName, folder.getRoot().list()[0]);
     }
 
-    private void attemptRename(String oldName, String newName) throws IOException {
+    @Test
+    public void renameDirNamesDiffer() throws IOException, InterruptedException {
+        String newName = "DirB";
+
+        attemptRenameDir("DirA", newName);
+
+        assertEquals(newName, folder.getRoot().list()[0]);
+    }
+
+    private void attemptRenameDir(String oldName, String newName) throws IOException {
         File toBeRenamed = folder.newFolder(oldName);
+        attemptRename(oldName, newName);
+    }
+
+    private void attemptRenameFile(String oldName, String newName) throws IOException {
+        File toBeRenamed = folder.newFile(oldName);
+        attemptRename(oldName, newName);
+    }
+
+    private void attemptRename(String oldName, String newName) throws IOException {
         assertEquals(1, folder.getRoot().list().length);
         FileSystemResourceStore toTest = new FileSystemResourceStore(folder.getRoot());