Correctly use slashes in paths

Fix: #1
io7m · Nov 25, 2020 · 409987b · 409987b
1 parent 1a1ddec
commit 409987b
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <c:changelog project="com.io7m.jbssio" xmlns:c="urn:com.io7m.changelog:4.0">
   <c:releases>
-    <c:release date="2020-11-25T20:09:47+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.0">
+    <c:release date="2020-11-25T00:00:00+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.0">
       <c:changes>
-        <c:change date="2020-11-25T20:09:47+00:00" summary="Initial public release"/>
+        <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:changes>
+        <c:change date="2020-11-25T00:00:00+00:00" summary="Correctly use slashes in paths">
+          <c:tickets>
+            <c:ticket id="1"/>
+          </c:tickets>
+        </c:change>
       </c:changes>
     </c:release>
   </c:releases>

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.0</version>
+    <version>1.0.1-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.0</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jbssio.tests</artifactId>

diff --git a/...bssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessByteBufferTest.java b/...bssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessByteBufferTest.java
@@ -60,11 +60,11 @@ public void testNames()
       try (var s0 = reader.createSubReaderAt("x", 0L)) {
         try (var s1 = s0.createSubReaderAt("y", 0L)) {
           try (var s2 = s1.createSubReaderAt("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", reader.path());
     }

diff --git a/...ssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessChannelContract.java b/...ssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessChannelContract.java
@@ -77,11 +77,11 @@ public void testNames()
       try (var s0 = reader.createSubReaderAt("x", 0L)) {
         try (var s1 = s0.createSubReaderAt("y", 0L)) {
           try (var s2 = s1.createSubReaderAt("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", reader.path());
     }

diff --git a/...ssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersRandomAccessChannelContract.java b/...ssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersRandomAccessChannelContract.java
@@ -109,11 +109,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.0</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jbssio.vanilla</artifactId>

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSPaths.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSPaths.java
@@ -18,7 +18,7 @@
 
 final class BSSPaths
 {
-  static final char PATH_SEPARATOR = '.';
+  static final char PATH_SEPARATOR = '/';
 
   private BSSPaths()
   {

diff --git a/...7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderByteBuffer.java b/...7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderByteBuffer.java
@@ -152,8 +152,7 @@ private int readS8p(final String name)
     final var position = this.offsetCurrentAbsolute();
     this.increaseOffsetRelative(1L);
     this.map.position(0);
-    return this.map.get(longPositionTo2GBLimitedByteBufferPosition(
-      position));
+    return this.map.get(longPositionTo2GBLimitedByteBufferPosition(position));
   }
 
   private int readU8p(final String name)

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.0</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>com.io7m.jbssio</name>