WIP

Author: sungshik

src/main/java/engineering/swat/watch/impl/mac/NativeEventStream.java

@@ -26,19 +26,9 @@
  */
 package engineering.swat.watch.impl.mac;
 
-import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
-import static java.nio.file.StandardWatchEventKinds.OVERFLOW;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.function.BiConsumer;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import engineering.swat.watch.impl.mac.jni.FileSystemEvents;
 
 // Note: This file is designed to be the only place in this package where JNA is
 // used and/or the native APIs are invoked. If the need to do so arises outside
@@ -58,6 +48,10 @@
  * </p>
  */
 class NativeEventStream implements Closeable {
+    static {
+        NativeLibrary.load();
+    }
+
     private final Path path;
     private final NativeEventHandler handler;
     private volatile boolean closed;
@@ -76,7 +70,7 @@ public synchronized void open() {
             closed = false;
         }
 
-        nativeWatch = FileSystemEvents.start(path.toString(), handler);
+        nativeWatch = NativeLibrary.start(path.toString(), handler);
     }
 
     // -- Closeable --
@@ -89,6 +83,6 @@ public synchronized void close() {
             closed = true;
         }
 
-        FileSystemEvents.stop(nativeWatch);
+        NativeLibrary.stop(nativeWatch);
     }
 }

src/main/java/engineering/swat/watch/impl/mac/jni/NativeLibrary.java renamed to src/main/java/engineering/swat/watch/impl/mac/NativeLibrary.java

@@ -24,7 +24,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package engineering.swat.watch.impl.mac.jni;
+package engineering.swat.watch.impl.mac;
 
 import static java.nio.file.attribute.PosixFilePermission.*;
 
@@ -36,6 +36,10 @@
 import java.util.Set;
 
 public class NativeLibrary {
+
+    public static native long start(String path, NativeEventHandler handler);
+    public static native void stop(long watchId);
+
     private static boolean isMac() {
         var os = System.getProperty("os.name");
         return os != null && (os.toLowerCase().contains("mac") || os.toLowerCase().contains("darwin"));
@@ -74,7 +78,7 @@ public static void load() {
 
     private static void loadLibrary(String path) {
         try {
-            var localFile = FileSystemEvents.class.getResource(path);
+            var localFile = NativeLibrary.class.getResource(path);
             if (localFile != null && localFile.getProtocol().equals("file")) {
                 System.load(localFile.getPath());
                 return;
@@ -83,7 +87,7 @@ private static void loadLibrary(String path) {
             // so we have to copy it out and load that file instead
             var localCopy = Files.createTempFile("watch", ".dylib"/*  , PRIVATE_FILE*/);
             localCopy.toFile().deleteOnExit();
-            try (var libStream = FileSystemEvents.class.getResourceAsStream(path)) {
+            try (var libStream = NativeLibrary.class.getResourceAsStream(path)) {
                 if (libStream != null) {
                     try (var writer = Files.newOutputStream(localCopy, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
                         libStream.transferTo(writer);

src/main/java/engineering/swat/watch/impl/mac/jni/FileSystemEvents.java

@@ -46,7 +46,7 @@ impl HandlerExecutor {
 
 #[unsafe(no_mangle)]
 #[allow(unused_variables)]
-pub extern "system" fn Java_engineering_swat_watch_impl_mac_jni_FileSystemEvents_start<'local>(
+pub extern "system" fn Java_engineering_swat_watch_impl_mac_NativeLibrary_start<'local>(
     mut env: JNIEnv<'local>,
     class: JClass<'local>,
     path: JString<'local>,
@@ -63,7 +63,7 @@ pub extern "system" fn Java_engineering_swat_watch_impl_mac_jni_FileSystemEvents
 
 #[unsafe(no_mangle)]
 #[allow(unused_variables)]
-pub extern "system" fn Java_engineering_swat_watch_impl_mac_jni_FileSystemEvents_stop<'local>(
+pub extern "system" fn Java_engineering_swat_watch_impl_mac_NativeLibrary_stop<'local>(
     env: JNIEnv<'local>,
     class: JClass<'local>,
     stream: jlong,