Fix resolvePath() method in UriUtils

Author: pcastornii

shellfx-dialogs/src/main/java/com/techsenger/shellfx/dialogs/file/FileChooserDialogPresenter.java

@@ -385,7 +385,7 @@ void onLocationsOpened() {
                 var previousUri = storage.getUri();
                 for (var i = 0; i < segments.size(); i++) {
                     var segment = segments.get(i);
-                    var segmentUri = UriUtils.resolvePath(previousUri, segment);
+                    var segmentUri = UriUtils.resolvePath(previousUri, segment, true);
                     var directoryLocation = new Location(
                             DialogIcons.FOLDER,
                             segment,
@@ -456,7 +456,7 @@ protected void onRename(int fileIndex) {
     protected void onEditCommitted(T file) {
         switch (editType) {
             case NEW_DIRECTORY -> {
-                var dirUri = UriUtils.resolvePath(directory, file.getName());
+                var dirUri = UriUtils.resolvePath(directory, file.getName(), true);
                 try {
                     this.storage.createDirectory(dirUri);
                     updateFiles(file);
@@ -727,7 +727,7 @@ private void createInitialColumns() {
             showWarning("The file '" + fileName + "' does not exist.");
             return null;
         }
-        URI fileUri = UriUtils.resolvePath(getDirectory(), fileName);
+        URI fileUri = UriUtils.resolvePath(getDirectory(), fileName, false);
         var file = this.storage.createVirtual(null, fileName, fileUri);
         return file;
     }

shellfx-storage/src/main/java/com/techsenger/shellfx/storage/DefaultGenericFile.java

@@ -151,7 +151,7 @@ public DefaultGenericFile getChild(String childName, FileEntryType childEntryTyp
         child.storage = this.storage;
         child.entryType = childEntryType;
         child.name = childName;
-        child.uri = UriUtils.resolvePath(this.uri, childName);
+        child.uri = UriUtils.resolvePath(this.uri, childName, childEntryType == FileEntryType.DIRECTORY);
         child.virtual = true;
         return child;
     }
@@ -280,7 +280,7 @@ private List<DefaultGenericFile> buildParents(int limit) {
         var segments = UriUtils.getPathSegments(rootUri, this.uri);
         var parents = new ArrayList<DefaultGenericFile>(Math.min(segments.size(), limit));
         for (int i = segments.size() - 1; i >= 1 && parents.size() < limit; i--) {
-            var parentUri = UriUtils.resolvePath(rootUri, String.join("/", segments.subList(0, i)));
+            var parentUri = UriUtils.resolvePath(rootUri, String.join("/", segments.subList(0, i)), true);
             var parent = new DefaultGenericFile();
             parent.storage = this.storage;
             parent.entryType = FileEntryType.DIRECTORY;

shellfx-storage/src/main/java/com/techsenger/shellfx/storage/UriUtils.java

@@ -137,11 +137,15 @@ public static List<String> getPathSegments(URI baseUri, URI childUri) {
      * @param baseUri the base URI (e.g., {@code "gs://bucket/folder/"}). Must not be {@code null}.
      * @param path the path to resolve against the base URI (e.g., {@code "file.txt"}). Leading/trailing slashes are
      * handled gracefully. Must not be {@code null}.
+     * @param isDirectory whether the resolved path denotes a directory; when {@code true}, a trailing slash is
+     * appended (if not already present) so the result matches the URI form a storage would report for that same
+     * directory once it exists (e.g. from a directory listing) &mdash; this matters when the caller resolves a
+     * path before the entry is created, so there is nothing on disk yet to derive the trailing slash from.
      * @return A new URI with the resolved path.
      * @throws IllegalArgumentException If {@code baseUri} or {@code path} is {@code null}, or if the resolved URI
      * is invalid.
      */
-    public static URI resolvePath(URI baseUri, String path) {
+    public static URI resolvePath(URI baseUri, String path, boolean isDirectory) {
         if (baseUri == null || path == null) {
             throw new IllegalArgumentException("URI and path must not be null");
         }
@@ -150,10 +154,22 @@ public static URI resolvePath(URI baseUri, String path) {
             basePath = "/";
         }
         String joinedPath = joinPaths(basePath, path);
+        if (isDirectory && !joinedPath.endsWith("/")) {
+            joinedPath = joinedPath + "/";
+        }
+        // URI#getAuthority() returns null both when the authority component is truly absent and when it is
+        // present but empty (e.g. "file:///path"). Passing that null straight to the URI constructor below
+        // would silently drop the "//" marker, turning "file:///path" into "file:/path" - a different URI
+        // string for the same file, which then fails equals() against URIs produced elsewhere (e.g. by
+        // listing the directory), even though both resolve to the same Path.
+        var authority = baseUri.getAuthority();
+        if (authority == null && baseUri.toString().startsWith(baseUri.getScheme() + "://")) {
+            authority = "";
+        }
         try {
             return new URI(
                 baseUri.getScheme(),
-                baseUri.getAuthority(),
+                authority,
                 joinedPath, //path passed to constructor can't be encoded
                 baseUri.getQuery(),
                 baseUri.getFragment()

shellfx-storage/src/test/java/com/techsenger/shellfx/storage/DefaultGenericFileTest.java

@@ -71,8 +71,8 @@ void getParent_immediateParent_returned() {
         var parent = child.getParent();
 
         URI expectedUri = IS_WINDOWS
-                ? URI.create("file:///C:/home/user/foo")
-                : URI.create("file:///home/user/foo");
+                ? URI.create("file:///C:/home/user/foo/")
+                : URI.create("file:///home/user/foo/");
 
         assertThat(parent.getUri()).isEqualTo(expectedUri);
         assertThat(parent.getName()).isEqualTo("foo");
@@ -103,14 +103,14 @@ void getParents_deeplyNestedFile_allParentsReturnedFromImmediateToRoot() {
         var parents = child.getParents();
 
         URI fooUri = IS_WINDOWS
-                ? URI.create("file:///C:/home/user/foo")
-                : URI.create("file:///home/user/foo");
+                ? URI.create("file:///C:/home/user/foo/")
+                : URI.create("file:///home/user/foo/");
         URI userUri = IS_WINDOWS
-                ? URI.create("file:///C:/home/user")
-                : URI.create("file:///home/user");
+                ? URI.create("file:///C:/home/user/")
+                : URI.create("file:///home/user/");
         URI homeUri = IS_WINDOWS
-                ? URI.create("file:///C:/home")
-                : URI.create("file:///home");
+                ? URI.create("file:///C:/home/")
+                : URI.create("file:///home/");
 
         assertThat(parents).hasSize(4);
         assertThat(parents.get(0).getUri()).isEqualTo(fooUri);