Remove FileWatcherLifecycleAdapter.

It was only used in tests, while the DefaultFileSystemWatcherService was only used in the product code. The existing test for FileWatcherLifecycleAdapter now tests the DefaultFileSystemWatcherService instead, and has been renamed to match.
neo4j · Mar 20, 2018 · bd65172 · bd65172
1 parent e2a5f5d
commit bd65172
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 113 deletions.
diff --git a/.../kernel/src/main/java/org/neo4j/kernel/impl/util/watcher/FileWatcherLifecycleAdapter.java b/.../kernel/src/main/java/org/neo4j/kernel/impl/util/watcher/FileWatcherLifecycleAdapter.java
diff --git a/...util/FileWatcherLifecycleAdapterTest.java → .../DefaultFileSystemWatcherServiceTest.java b/...util/FileWatcherLifecycleAdapterTest.java → .../DefaultFileSystemWatcherServiceTest.java
@@ -29,11 +29,11 @@
 import org.neo4j.io.fs.watcher.FileWatcher;
 import org.neo4j.io.fs.watcher.SilentFileWatcher;
 import org.neo4j.kernel.impl.scheduler.CentralJobScheduler;
-import org.neo4j.kernel.impl.util.watcher.FileWatcherLifecycleAdapter;
+import org.neo4j.kernel.impl.util.watcher.DefaultFileSystemWatcherService;
 
 import static org.mockito.Mockito.verify;
 
-public class FileWatcherLifecycleAdapterTest
+public class DefaultFileSystemWatcherServiceTest
 {
 
     private static CentralJobScheduler jobScheduler;
@@ -56,32 +56,32 @@ public void startMonitoringWhenLifecycleStarting() throws Throwable
     {
         CountDownLatch latch = new CountDownLatch( 1 );
         FileWatcher watcher = new TestFileWatcher( latch );
-        FileWatcherLifecycleAdapter watcherAdapter = new FileWatcherLifecycleAdapter( jobScheduler, watcher );
+        DefaultFileSystemWatcherService service = new DefaultFileSystemWatcherService( jobScheduler, watcher );
-        watcherAdapter.init();
+        service.init();
-        watcherAdapter.start();
+        service.start();
 
         latch.await();
     }
 
     @Test
     public void stopMonitoringWhenLifecycleStops() throws Throwable
     {
-        FileWatcherLifecycleAdapter watcherAdapter = new FileWatcherLifecycleAdapter( jobScheduler, fileWatcher );
+        DefaultFileSystemWatcherService service = new DefaultFileSystemWatcherService( jobScheduler, fileWatcher );
-        watcherAdapter.init();
+        service.init();
-        watcherAdapter.start();
+        service.start();
-        watcherAdapter.stop();
+        service.stop();
 
         verify( fileWatcher ).stopWatching();
     }
 
     @Test
     public void closeFileWatcherOnShutdown() throws Throwable
     {
-        FileWatcherLifecycleAdapter watcherAdapter = new FileWatcherLifecycleAdapter( jobScheduler, fileWatcher );
+        DefaultFileSystemWatcherService service = new DefaultFileSystemWatcherService( jobScheduler, fileWatcher );
-        watcherAdapter.init();
+        service.init();
-        watcherAdapter.start();
+        service.start();
-        watcherAdapter.stop();
+        service.stop();
-        watcherAdapter.shutdown();
+        service.shutdown();
 
         verify( fileWatcher ).close();
     }