fixup! move file ops to FileSettingsService

Author: jfreden

server/src/main/java/org/elasticsearch/common/file/AbstractFileWatchingService.java

@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.ClosedWatchServiceException;
-import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardWatchEventKinds;
@@ -243,7 +242,7 @@ protected final void watcherThread() {
                         .collect(Collectors.toSet());
                     for (var changedPath : changedPaths) {
                         // If a symlinked dir changed in the settings dir, it could be linked to other symlinks, so reprocess all files
-                        if (Files.isDirectory(changedPath) && Files.isSymbolicLink(changedPath)) {
+                        if (filesIsDirectory(changedPath) && filesIsSymbolicLink(changedPath)) {
                             reprocessAllChangedFilesInSettingsDir();
                             break;
                         } else if (fileChanged(changedPath)) {
@@ -385,6 +384,8 @@ private record FileUpdateState(long timestamp, String path, Object fileKey) {}
 
     protected abstract boolean filesIsDirectory(Path path);
 
+    protected abstract boolean filesIsSymbolicLink(Path path);
+
     protected abstract <A extends BasicFileAttributes> A filesReadAttributes(Path path, Class<A> clazz) throws IOException;
 
     protected abstract Stream<Path> filesList(Path dir) throws IOException;

server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java

@@ -467,6 +467,11 @@ protected boolean filesIsDirectory(Path path) {
         return Files.isDirectory(path);
     }
 
+    @Override
+    protected boolean filesIsSymbolicLink(Path path) {
+        return Files.isSymbolicLink(path);
+    }
+
     @Override
     protected <A extends BasicFileAttributes> A filesReadAttributes(Path path, Class<A> clazz) throws IOException {
         return Files.readAttributes(path, clazz);

server/src/test/java/org/elasticsearch/common/file/AbstractFileWatchingServiceTests.java

@@ -98,6 +98,11 @@ protected boolean filesIsDirectory(Path path) {
             return Files.isDirectory(path);
         }
 
+        @Override
+        protected boolean filesIsSymbolicLink(Path path) {
+            return Files.isSymbolicLink(path);
+        }
+
         @Override
         protected <A extends BasicFileAttributes> A filesReadAttributes(Path path, Class<A> clazz) throws IOException {
             return Files.readAttributes(path, clazz);

server/src/test/java/org/elasticsearch/common/file/MasterNodeFileWatchingServiceTests.java

@@ -80,6 +80,11 @@ protected boolean filesIsDirectory(Path path) {
                 return Files.isDirectory(path);
             }
 
+            @Override
+            protected boolean filesIsSymbolicLink(Path path) {
+                return Files.isSymbolicLink(path);
+            }
+
             @Override
             protected <A extends BasicFileAttributes> A filesReadAttributes(Path path, Class<A> clazz) throws IOException {
                 return Files.readAttributes(path, clazz);