WIP hfs 1

runtime/filesystem-http/src/main/java/io/aklivity/zilla/runtime/filesystem/http/HttpBaseFileSystemProvider.java → runtime/filesystem-http/src/main/java/io/aklivity/zilla/runtime/filesystem/http/AbstractHttpFileSystemProvider.java

@@ -49,7 +49,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 
-public abstract class HttpBaseFileSystemProvider extends FileSystemProvider
+public abstract class AbstractHttpFileSystemProvider extends FileSystemProvider
 {
     private static final Duration TIMEOUT = Duration.ofSeconds(5);
     private static final HttpClient HTTP_CLIENT = HttpClient.newBuilder()
@@ -119,6 +119,7 @@ public InputStream newInputStream(
         Path path,
         OpenOption... options)
     {
+        // TODO: Ati - chk if path is http/s -> cast it to HttpPath
         return new ByteArrayInputStream(resolveBody(path));
     }
 
@@ -155,6 +156,7 @@ public SeekableByteChannel newByteChannel(
         Set<? extends OpenOption> options,
         FileAttribute<?>... attrs)
     {
+        // TODO: Ati - chk if path is http/s -> cast it to HttpPath
         return new ReadOnlyByteArrayChannel(resolveBody(path));
     }
 
@@ -314,19 +316,30 @@ private void checkUri(
         }
     }
 
+    // TODO: Ati - this should be the new resolveBody
+    /*private byte[] resolveBody(
+        Path path)
+    //HttpPath path)
+    {
+        // TODO: Ati - this should delegate the call to HttpPath path.resolveBody()
+        return readBody(path);
+    }*/
+
+    // TODO: Ati - remove this
     private byte[] resolveBody(
         Path path)
     {
         byte[] body;
-        HttpFileSystem fileSystem = fileSystems.get(path.toUri());
+        //HttpFileSystem fileSystem = fileSystems.get(path.toUri());
+        HttpFileSystem fileSystem = (HttpFileSystem) path.getFileSystem();
         if (fileSystem != null && fileSystem.body() != null)
         {
-            System.out.println("HBFSP resolveBody fs.body"); // TODO: Ati
+            System.out.println("AHFSP resolveBody fs.body"); // TODO: Ati
             body = fileSystem.body();
         }
         else
         {
-            System.out.println("HBFSP resolveBody readBody"); // TODO: Ati
+            System.out.println("AHFSP resolveBody readBody"); // TODO: Ati
             body = readBody(path);
         }
         return body;
@@ -343,17 +356,17 @@ private static byte[] readBody(
                 .uri(path.toUri())
                 .timeout(TIMEOUT)
                 .build();
-            System.out.println("HBFSP readBody path " + path + " request " + request); // TODO: Ati
+            System.out.println("AHFSP readBody path " + path + " request " + request); // TODO: Ati
             HttpResponse<byte[]> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofByteArray());
-            System.out.println("HBFSP readBody response.body " + new String(response.body())); // TODO: Ati
+            System.out.println("AHFSP readBody response.body " + new String(response.body())); // TODO: Ati
             if (response.statusCode() == HTTP_OK)
             {
                 body = response.body();
             }
         }
         catch (Exception ex)
         {
-            System.out.println("HBFSP readBody exception " + ex);  // TODO: Ati
+            System.out.println("AHFSP readBody exception " + ex);  // TODO: Ati
             rethrowUnchecked(ex);
         }
         return body;

runtime/filesystem-http/src/main/java/io/aklivity/zilla/runtime/filesystem/http/HttpFileSystem.java

@@ -23,27 +23,26 @@
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
-import java.nio.file.WatchService;
 import java.nio.file.attribute.UserPrincipalLookupService;
 import java.nio.file.spi.FileSystemProvider;
 import java.util.Set;
 
-public class HttpFileSystem extends FileSystem
+public final class HttpFileSystem extends FileSystem
 {
     public static final String SEPARATOR = "/";
 
-    private final HttpBaseFileSystemProvider provider;
-    private final URI uri;
+    private final AbstractHttpFileSystemProvider provider;
+    private final URI root;
 
-    private byte[] body;
+    private byte[] body; // TODO: Ati - body should be moved from HFS to HttpPath
 
     HttpFileSystem(
-        HttpBaseFileSystemProvider provider,
-        URI uri)
+        AbstractHttpFileSystemProvider provider,
+        URI root)
     {
         this.provider = provider;
-        this.uri = uri;
-        this.body = null;
+        this.root = root;
+        this.body = null; // TODO: Ati - body should be moved from HFS to HttpPath
     }
 
     @Override
@@ -55,7 +54,7 @@ public FileSystemProvider provider()
     @Override
     public void close()
     {
-        provider.closeFileSystem(uri);
+        provider.closeFileSystem(root);
     }
 
     @Override
@@ -129,21 +128,27 @@ public UserPrincipalLookupService getUserPrincipalLookupService()
     }
 
     @Override
-    public WatchService newWatchService()
+    //public WatchService newWatchService()
+    public HttpWatchService newWatchService()
     {
-        return new HttpWatchService(this);
+        //return new HttpWatchService(this);
+        HttpWatchService service = new HttpWatchService(this);
+        service.start();
+        return service;
     }
 
     URI baseUri()
     {
-        return this.uri;
+        return this.root;
     }
 
+    // TODO: Ati - body should be moved from HFS to HttpPath
     byte[] body()
     {
         return body;
     }
 
+    // TODO: Ati - body should be moved from HFS to HttpPath
     void body(
         byte[] body)
     {

runtime/filesystem-http/src/main/java/io/aklivity/zilla/runtime/filesystem/http/HttpFileSystemProvider.java

@@ -14,12 +14,12 @@
  */
 package io.aklivity.zilla.runtime.filesystem.http;
 
-public class HttpFileSystemProvider extends HttpBaseFileSystemProvider
+public final class HttpFileSystemProvider extends AbstractHttpFileSystemProvider
 {
-    public static final String SCHEME = "http";
+    private static final String SCHEME = "http";
 
     @Override
-    public final String getScheme()
+    public String getScheme()
     {
         return SCHEME;
     }

runtime/filesystem-http/src/main/java/io/aklivity/zilla/runtime/filesystem/http/HttpPath.java

@@ -14,7 +14,6 @@
  */
 package io.aklivity.zilla.runtime.filesystem.http;
 
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.util.Objects.requireNonNull;
 import static org.agrona.LangUtil.rethrowUnchecked;
 
@@ -23,7 +22,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.file.FileSystem;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.ProviderMismatchException;
@@ -37,10 +35,12 @@ public class HttpPath implements Path
 {
     private final HttpFileSystem fs;
     private final URL url;
+    //private final URI location;
 
     HttpPath(
         HttpFileSystem fs,
         URL url)
+    //URI location)
     {
         if (!fs.provider().getScheme().equals(url.getProtocol()))
         {
@@ -50,8 +50,15 @@ public class HttpPath implements Path
         this.url = url;
     }
 
+    HttpPath()
+    {
+        this.fs = null;
+        this.url = null;
+    }
+
     @Override
-    public FileSystem getFileSystem()
+    //public FileSystem getFileSystem()
+    public HttpFileSystem getFileSystem()
     {
         return fs;
     }
@@ -154,6 +161,7 @@ public Path resolveSibling(
         Path other)
     {
         return resolveSibling(other.toString());
+        //return fs.resolveSibling(this, other);
     }
 
     @Override
@@ -164,6 +172,8 @@ public Path resolveSibling(
         try
         {
             path = new HttpPath(fs, new URL(fs.baseUri().toURL(), other));
+            //path = new HttpPath(fs, fs.baseUri().resolve(URI.create(other))); // TODO: Ati - test
+            // return fs.resolveSibling(this, other); // TODO: Ati - this should be here
         }
         catch (Exception ex)
         {
@@ -225,17 +235,6 @@ public WatchKey register(
         {
             throw new ProviderMismatchException();
         }
-        for (WatchEvent.Kind<?> event : events)
-        {
-            if (!event.equals(ENTRY_MODIFY))
-            {
-                throw new IllegalArgumentException("Only ENTRY_MODIFY event kind is supported");
-            }
-        }
-        if (modifiers.length > 0)
-        {
-            throw new IllegalArgumentException("Modifiers are not supported");
-        }
         return ((HttpWatchService) watcher).register(this, events, modifiers);
     }