refine path declaration in config-loader FileWatch

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2116c38b0b2a03a24c7492dc2662e6a51e9e2f48
(cherry picked from commit c53a40d924e1ae10c683e280f63b79ed8d92a118)

diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java
index b761a4813cbc1789c40c19861b9390c9fe3298a2..a46c02389277ef3ad1334e7773bf84628700365b 100644 (file)
--- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java
+++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherImpl.java
@@ -23,18 +23,16 @@ import org.slf4j.LoggerFactory;
 public final class FileWatcherImpl implements FileWatcher, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(FileWatcherImpl.class);
     private static final String INTERRUPTED = "InterruptedException";
-    private static final String BGPCEP_CONFIG_FOLDER = "bgpcep";
-    private static final String DEFAULT_APP_CONFIG_FILE_PATH = "etc" + File.separator + "opendaylight"
-            + File.separator + BGPCEP_CONFIG_FOLDER + File.separator;
-    private static final Path PATH = Paths.get(DEFAULT_APP_CONFIG_FILE_PATH);
+    //BGPCEP config folder OS agnostic path
+    private static final Path PATH = Paths.get("etc","opendaylight","bgpcep");
     private final WatchService watchService;
 
     public FileWatcherImpl() throws IOException {
         this.watchService = FileSystems.getDefault().newWatchService();
-        final File file = new File(DEFAULT_APP_CONFIG_FILE_PATH);
+        final File file = new File(PATH.toString());
         if (!file.exists()) {
             if (!file.mkdirs()) {
-                LOG.warn("Failed to create config directory {}", DEFAULT_APP_CONFIG_FILE_PATH);
+                LOG.warn("Failed to create config directory {}", PATH);
                 return;
             }
         }
@@ -52,7 +50,7 @@ public final class FileWatcherImpl implements FileWatcher, AutoCloseable {
 
     @Override
     public String getPathFile() {
-        return DEFAULT_APP_CONFIG_FILE_PATH;
+        return PATH.toString();
     }
 
     @Override

diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java
index 9d8047e12d59cbbb355b7dcdc839cd610cf76c09..ae03c75241f147d3b0555c2bf4310705ee565046 100644 (file)
--- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java
+++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/FileWatcherTest.java
@@ -15,8 +15,7 @@ import java.io.File;
 import org.junit.Test;
 
 public class FileWatcherTest {
-    private static final String PATH = "etc" + File.separator + "opendaylight" + File.separator
-            + "bgpcep" + File.separator;
+    private static final String PATH = String.join(File.separator, "etc", "opendaylight", "bgpcep");
 
     @Test
     public void bgpFileWatcherTest() throws Exception {
@@ -25,4 +24,4 @@ public class FileWatcherTest {
         assertNotNull(bgpFileWatcher.getWatchService());
         bgpFileWatcher.close();
     }
-}
\ No newline at end of file
+}