diff --git a/README-CHANGES.xml b/README-CHANGES.xml index 94e34f2..d2d5f12 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -1,9 +1,18 @@ - + - + + + + + + + + + + diff --git a/com.io7m.jbssio.api/pom.xml b/com.io7m.jbssio.api/pom.xml index b44cc7b..4c543df 100644 --- a/com.io7m.jbssio.api/pom.xml +++ b/com.io7m.jbssio.api/pom.xml @@ -8,7 +8,7 @@ com.io7m.jbssio com.io7m.jbssio - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.jbssio.api diff --git a/com.io7m.jbssio.tests/pom.xml b/com.io7m.jbssio.tests/pom.xml index 1ae56d9..3d31f62 100644 --- a/com.io7m.jbssio.tests/pom.xml +++ b/com.io7m.jbssio.tests/pom.xml @@ -8,7 +8,7 @@ com.io7m.jbssio com.io7m.jbssio - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.jbssio.tests diff --git a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessByteBufferTest.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessByteBufferTest.java index 2e9a6a7..987bcd4 100644 --- a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessByteBufferTest.java +++ b/com.io7m.jbssio.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/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessChannelContract.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessChannelContract.java index b835519..6308a96 100644 --- a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSReadersRandomAccessChannelContract.java +++ b/com.io7m.jbssio.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/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersRandomAccessChannelContract.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersRandomAccessChannelContract.java index 21c9449..ff2f31c 100644 --- a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSWritersRandomAccessChannelContract.java +++ b/com.io7m.jbssio.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 index 9659cc4..af3820f 100644 --- a/com.io7m.jbssio.vanilla/pom.xml +++ b/com.io7m.jbssio.vanilla/pom.xml @@ -8,7 +8,7 @@ com.io7m.jbssio com.io7m.jbssio - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.jbssio.vanilla 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 index 4103c9d..71e061e 100644 --- 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/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderByteBuffer.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderByteBuffer.java index f033797..55d7a06 100644 --- a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/BSSReaderByteBuffer.java +++ b/com.io7m.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 index 26e2189..9c2cdc7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.io7m.jbssio com.io7m.jbssio - 1.0.0 + 1.0.1-SNAPSHOT pom com.io7m.jbssio