Correctly use slashes in paths (again!)

Fix: #1
io7m · Nov 25, 2020 · 985c65e · 985c65e
1 parent 1f023bd
commit 985c65e
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -6,7 +6,7 @@
         <c:change date="2020-11-25T00:00:00+00:00" summary="Initial public release"/>
       </c:changes>
     </c:release>
-    <c:release date="2020-11-25T21:27:07+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.1">
+    <c:release date="2020-11-25T00:00:00+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.1">
       <c:changes>
         <c:change date="2020-11-25T00:00:00+00:00" summary="Correctly use slashes in paths">
           <c:tickets>
@@ -15,6 +15,15 @@
         </c:change>
       </c:changes>
     </c:release>
+    <c:release date="2020-11-25T21:50:59+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.2">
+      <c:changes>
+        <c:change date="2020-11-25T21:50:59+00:00" summary="Correctly use slashes in paths (again!)">
+          <c:tickets>
+            <c:ticket id="1"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
+    </c:release>
   </c:releases>
   <c:ticket-systems>
     <c:ticket-system default="true" id="com.github.io7m.jbssio" url="https://www.github.com/io7m/jbssio/issues/"/>

diff --git a/com.io7m.jbssio.api/pom.xml b/com.io7m.jbssio.api/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>com.io7m.jbssio</artifactId>
     <groupId>com.io7m.jbssio</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jbssio.api</artifactId>

diff --git a/com.io7m.jbssio.tests/pom.xml b/com.io7m.jbssio.tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>com.io7m.jbssio</artifactId>
     <groupId>com.io7m.jbssio</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jbssio.tests</artifactId>

diff --git a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersSequentialTest.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersSequentialTest.java
@@ -80,11 +80,11 @@ public void testNames()
         try (var s0 = reader.createSubReader("x")) {
           try (var s1 = s0.createSubReader("y")) {
             try (var s2 = s1.createSubReader("z")) {
-              Assertions.assertEquals("a.x.y.z", s2.path());
+              Assertions.assertEquals("a/x/y/z", s2.path());
             }
-            Assertions.assertEquals("a.x.y", s1.path());
+            Assertions.assertEquals("a/x/y", s1.path());
           }
-          Assertions.assertEquals("a.x", s0.path());
+          Assertions.assertEquals("a/x", s0.path());
         }
         Assertions.assertEquals("a", reader.path());
       }

diff --git a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersSequentialTest.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersSequentialTest.java
@@ -97,11 +97,11 @@ public void testNames()
         try (var s0 = writer.createSubWriterAt("x", 0L)) {
           try (var s1 = s0.createSubWriterAt("y", 0L)) {
             try (var s2 = s1.createSubWriterAt("z", 0L)) {
-              Assertions.assertEquals("a.x.y.z", s2.path());
+              Assertions.assertEquals("a/x/y/z", s2.path());
             }
-            Assertions.assertEquals("a.x.y", s1.path());
+            Assertions.assertEquals("a/x/y", s1.path());
           }
-          Assertions.assertEquals("a.x", s0.path());
+          Assertions.assertEquals("a/x", s0.path());
         }
         Assertions.assertEquals("a", writer.path());
       }

diff --git a/com.io7m.jbssio.vanilla/pom.xml b/com.io7m.jbssio.vanilla/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>com.io7m.jbssio</artifactId>
     <groupId>com.io7m.jbssio</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jbssio.vanilla</artifactId>

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderStream.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderStream.java
@@ -36,6 +36,8 @@
 import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;
+
 public final class BSSReaderStream implements BSSReaderSequentialType
 {
   private static final Logger LOG =
@@ -782,7 +784,7 @@ public BSSReaderSequentialType createSubReader(final String name)
     final var newName =
       new StringBuilder(this.path.length() + name.length() + 2)
         .append(this.path)
-        .append(".")
+        .append(PATH_SEPARATOR)
         .append(name)
         .toString();
 
@@ -821,7 +823,7 @@ public BSSReaderSequentialType createSubReaderBounded(
     final var newName =
       new StringBuilder(this.path.length() + name.length() + 2)
         .append(this.path)
-        .append(".")
+        .append(PATH_SEPARATOR)
         .append(name)
         .toString();
 

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSWriterStream.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSWriterStream.java
@@ -34,6 +34,7 @@
 import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
@@ -817,7 +818,7 @@ public BSSWriterSequentialType createSubWriterAt(
     final var newName =
       new StringBuilder(this.path.length() + name.length() + 2)
         .append(this.path)
-        .append(".")
+        .append(PATH_SEPARATOR)
         .append(name)
         .toString();
 
@@ -880,7 +881,7 @@ public BSSWriterSequentialType createSubWriterAtBounded(
     final var newName =
       new StringBuilder(this.path.length() + name.length() + 2)
         .append(this.path)
-        .append(".")
+        .append(PATH_SEPARATOR)
         .append(name)
         .toString();
 

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.io7m.jbssio</groupId>
   <artifactId>com.io7m.jbssio</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>com.io7m.jbssio</name>