diff --git a/README-CHANGES.xml b/README-CHANGES.xml index d2d5f12..1d109a9 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -6,7 +6,7 @@ - + @@ -15,6 +15,15 @@ + + + + + + + + + diff --git a/com.io7m.jbssio.api/pom.xml b/com.io7m.jbssio.api/pom.xml index 7add1a2..12f45bf 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.1 + 1.0.2-SNAPSHOT com.io7m.jbssio.api diff --git a/com.io7m.jbssio.tests/pom.xml b/com.io7m.jbssio.tests/pom.xml index e0722ce..808de31 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.1 + 1.0.2-SNAPSHOT com.io7m.jbssio.tests 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 index 82e3709..ba86b9f 100644 --- 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 index 37e7d3d..e47f117 100644 --- 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 index c4a3c23..ead5b60 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.1 + 1.0.2-SNAPSHOT com.io7m.jbssio.vanilla 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 index 4fe718a..dd4b0c6 100644 --- 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 index 24dbd33..c70aa12 100644 --- 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 index 374afb4..156092d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.io7m.jbssio com.io7m.jbssio - 1.0.1 + 1.0.2-SNAPSHOT pom com.io7m.jbssio