fix for issue awslabs#237

stefanofornari · Nov 7, 2023 · aec6203 · aec6203
1 parent 59e08ad
commit aec6203
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/software/amazon/nio/spi/s3/S3Path.java b/src/main/java/software/amazon/nio/spi/s3/S3Path.java
@@ -615,6 +615,10 @@ public URI toUri() {
         Iterator<Path> elements = path.iterator();
 
         StringBuilder uri = new StringBuilder(fileSystem.provider().getScheme() + "://");
+        String endpoint = fileSystem.configuration().getEndpoint();
+        if (!endpoint.isEmpty()) {
+            uri.append(fileSystem.configuration().getEndpoint()).append(PATH_SEPARATOR);
+        }
         uri.append(bucketName());
         elements.forEachRemaining(
             (e) -> {

diff --git a/src/test/java/software/amazon/nio/spi/s3/S3PathTest.java b/src/test/java/software/amazon/nio/spi/s3/S3PathTest.java
@@ -506,4 +506,13 @@ public void stripCredentialsAndEndpointNIO() {
         then(Paths.get(URI.create("s3x://key:[email protected]:1010/bucket/afile.txt")).toString()).isEqualTo("/afile.txt");
     }
 
+    @Test
+    public void toUriProvidesFullUri() {
+        URI uri = URI.create("s3://bucket/subfolder/afile.txt");
+        then(Paths.get(uri).toUri()).isEqualTo(uri);
+
+        uri = URI.create("s3x://somewhere.com:1010/bucket/subfolder/afile.txt");
+        then(Paths.get(uri).toUri()).isEqualTo(uri);
+    }
+
 }
diff --git a/src/test/java/software/amazon/nio/spi/s3/util/S3XFileSystemInfoTest.java b/src/test/java/software/amazon/nio/spi/s3/util/S3XFileSystemInfoTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.BDDAssertions.then;
 import org.junit.jupiter.api.Test;
-import software.amazon.nio.spi.s3.util.S3XFileSystemInfo;
 
 /**
  *