Move classes to internal package

io7m-com · Nov 25, 2020 · b969f24 · b969f24
1 parent 1cc6b81
commit b969f24
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 29 deletions.
diff --git a/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSRangeHalfOpenTest.java b/com.io7m.jbssio.tests/src/test/java/com/io7m/jbssio/tests/BSSRangeHalfOpenTest.java
@@ -17,7 +17,7 @@
 
 package com.io7m.jbssio.tests;
 
-import com.io7m.jbssio.vanilla.BSSRangeHalfOpen;
+import com.io7m.jbssio.vanilla.internal.BSSRangeHalfOpen;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/BSSReaders.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/BSSReaders.java
@@ -19,6 +19,9 @@
 import com.io7m.jbssio.api.BSSReaderProviderType;
 import com.io7m.jbssio.api.BSSReaderRandomAccessType;
 import com.io7m.jbssio.api.BSSReaderSequentialType;
+import com.io7m.jbssio.vanilla.internal.BSSReaderByteBuffer;
+import com.io7m.jbssio.vanilla.internal.BSSReaderSeekableChannel;
+import com.io7m.jbssio.vanilla.internal.BSSReaderStream;
 import org.osgi.service.component.annotations.Component;
 
 import java.io.IOException;

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/BSSWriters.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/BSSWriters.java
@@ -19,6 +19,9 @@
 import com.io7m.jbssio.api.BSSWriterProviderType;
 import com.io7m.jbssio.api.BSSWriterRandomAccessType;
 import com.io7m.jbssio.api.BSSWriterSequentialType;
+import com.io7m.jbssio.vanilla.internal.BSSWriterByteBuffer;
+import com.io7m.jbssio.vanilla.internal.BSSWriterSeekableChannel;
+import com.io7m.jbssio.vanilla.internal.BSSWriterStream;
 import org.osgi.service.component.annotations.Component;
 
 import java.io.OutputStream;

diff --git a/...om/io7m/jbssio/vanilla/BSSExceptions.java → ...bssio/vanilla/internal/BSSExceptions.java b/...om/io7m/jbssio/vanilla/BSSExceptions.java → ...bssio/vanilla/internal/BSSExceptions.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.jbssio.api.BSSAddressableType;
 

diff --git a/...ava/com/io7m/jbssio/vanilla/BSSPaths.java → ...o7m/jbssio/vanilla/internal/BSSPaths.java b/...ava/com/io7m/jbssio/vanilla/BSSPaths.java → ...o7m/jbssio/vanilla/internal/BSSPaths.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 final class BSSPaths
 {

diff --git a/.../io7m/jbssio/vanilla/BSSRandomAccess.java → ...sio/vanilla/internal/BSSRandomAccess.java b/.../io7m/jbssio/vanilla/BSSRandomAccess.java → ...sio/vanilla/internal/BSSRandomAccess.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.jbssio.api.BSSAddressableType;
 import com.io7m.jbssio.api.BSSCloseableType;

diff --git a/...io7m/jbssio/vanilla/BSSRangeHalfOpen.java → ...io/vanilla/internal/BSSRangeHalfOpen.java b/...io7m/jbssio/vanilla/BSSRangeHalfOpen.java → ...io/vanilla/internal/BSSRangeHalfOpen.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import java.util.Objects;
 import java.util.OptionalLong;

diff --git a/...va/com/io7m/jbssio/vanilla/BSSRanges.java → ...7m/jbssio/vanilla/internal/BSSRanges.java b/...va/com/io7m/jbssio/vanilla/BSSRanges.java → ...7m/jbssio/vanilla/internal/BSSRanges.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import java.util.Objects;
 

diff --git a/...m/jbssio/vanilla/BSSReaderByteBuffer.java → ...vanilla/internal/BSSReaderByteBuffer.java b/...m/jbssio/vanilla/BSSReaderByteBuffer.java → ...vanilla/internal/BSSReaderByteBuffer.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSReaderRandomAccessType;
@@ -29,9 +29,10 @@
 import java.util.OptionalLong;
 import java.util.concurrent.Callable;
 
-import static com.io7m.jbssio.vanilla.BSSPaths.PATH_SEPARATOR;
+import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;
 
-final class BSSReaderByteBuffer extends BSSRandomAccess<BSSReaderRandomAccessType>
+public final class BSSReaderByteBuffer
+  extends BSSRandomAccess<BSSReaderRandomAccessType>
   implements BSSReaderRandomAccessType
 {
   private final ByteBuffer map;
@@ -52,7 +53,7 @@ private BSSReaderByteBuffer(
       BSSRangeHalfOpen.create(0L, inMap.capacity());
   }
 
-  static BSSReaderRandomAccessType createFromByteBuffer(
+  public static BSSReaderRandomAccessType createFromByteBuffer(
     final URI uri,
     final ByteBuffer buffer,
     final String name)

diff --git a/...sio/vanilla/BSSReaderSeekableChannel.java → ...la/internal/BSSReaderSeekableChannel.java b/...sio/vanilla/BSSReaderSeekableChannel.java → ...la/internal/BSSReaderSeekableChannel.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSReaderRandomAccessType;
@@ -29,11 +29,11 @@
 import java.util.OptionalLong;
 import java.util.concurrent.Callable;
 
-import static com.io7m.jbssio.vanilla.BSSPaths.PATH_SEPARATOR;
+import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
-final class BSSReaderSeekableChannel
+public final class BSSReaderSeekableChannel
   extends BSSRandomAccess<BSSReaderRandomAccessType> implements
   BSSReaderRandomAccessType
 {
@@ -57,7 +57,7 @@ private BSSReaderSeekableChannel(
       Objects.requireNonNull(inBuffer, "buffer");
   }
 
-  static BSSReaderRandomAccessType createFromChannel(
+  public static BSSReaderRandomAccessType createFromChannel(
     final URI uri,
     final SeekableByteChannel channel,
     final String name,

diff --git a/.../io7m/jbssio/vanilla/BSSReaderStream.java → ...sio/vanilla/internal/BSSReaderStream.java b/.../io7m/jbssio/vanilla/BSSReaderStream.java → ...sio/vanilla/internal/BSSReaderStream.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSReaderSequentialType;
@@ -36,7 +36,7 @@
 import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-final class BSSReaderStream implements BSSReaderSequentialType
+public final class BSSReaderStream implements BSSReaderSequentialType
 {
   private static final Logger LOG =
     LoggerFactory.getLogger(BSSReaderStream.class);
@@ -82,7 +82,7 @@ private BSSReaderStream(
     this.buffer2w = ByteBuffer.wrap(this.buffer2);
   }
 
-  static BSSReaderStream create(
+  public static BSSReaderStream create(
     final URI uri,
     final InputStream inStream,
     final String inName,

diff --git a/...m/jbssio/vanilla/BSSWriterByteBuffer.java → ...vanilla/internal/BSSWriterByteBuffer.java b/...m/jbssio/vanilla/BSSWriterByteBuffer.java → ...vanilla/internal/BSSWriterByteBuffer.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSWriterRandomAccessType;
@@ -27,11 +27,11 @@
 import java.util.OptionalLong;
 import java.util.concurrent.Callable;
 
-import static com.io7m.jbssio.vanilla.BSSPaths.PATH_SEPARATOR;
+import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
-final class BSSWriterByteBuffer
+public final class BSSWriterByteBuffer
   extends BSSRandomAccess<BSSWriterRandomAccessType>
   implements BSSWriterRandomAccessType
 {
@@ -59,7 +59,7 @@ private BSSWriterByteBuffer(
       BSSRangeHalfOpen.create(0L, inMap.capacity());
   }
 
-  static BSSWriterRandomAccessType createFromByteBuffer(
+  public static BSSWriterRandomAccessType createFromByteBuffer(
     final URI uri,
     final ByteBuffer buffer,
     final String name)

diff --git a/...sio/vanilla/BSSWriterSeekableChannel.java → ...la/internal/BSSWriterSeekableChannel.java b/...sio/vanilla/BSSWriterSeekableChannel.java → ...la/internal/BSSWriterSeekableChannel.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSWriterRandomAccessType;
@@ -31,7 +31,7 @@
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
-final class BSSWriterSeekableChannel
+public final class BSSWriterSeekableChannel
   extends BSSRandomAccess<BSSWriterRandomAccessType> implements
   BSSWriterRandomAccessType
 {
@@ -64,7 +64,7 @@ private BSSWriterSeekableChannel(
       Objects.requireNonNull(inBuffer, "inBuffer");
   }
 
-  static BSSWriterRandomAccessType createFromChannel(
+  public static BSSWriterRandomAccessType createFromChannel(
     final URI uri,
     final SeekableByteChannel channel,
     final String name,

diff --git a/.../io7m/jbssio/vanilla/BSSWriterStream.java → ...sio/vanilla/internal/BSSWriterStream.java b/.../io7m/jbssio/vanilla/BSSWriterStream.java → ...sio/vanilla/internal/BSSWriterStream.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jbssio.vanilla;
+package com.io7m.jbssio.vanilla.internal;
 
 import com.io7m.ieee754b16.Binary16;
 import com.io7m.jbssio.api.BSSWriterSequentialType;
@@ -37,7 +37,7 @@
 import static java.nio.ByteOrder.BIG_ENDIAN;
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
-final class BSSWriterStream implements BSSWriterSequentialType
+public final class BSSWriterStream implements BSSWriterSequentialType
 {
   private final BSSWriterStream parent;
   private final String path;
@@ -77,7 +77,7 @@ private BSSWriterStream(
     this.buffer2w = ByteBuffer.wrap(this.buffer2);
   }
 
-  static BSSWriterStream create(
+  public static BSSWriterStream create(
     final URI uri,
     final OutputStream inStream,
     final String inName,

diff --git a/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/package-info.java b/com.io7m.jbssio.vanilla/src/main/java/com/io7m/jbssio/vanilla/internal/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2020 Mark Raynsford <code@io7m.com> http://io7m.com
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * Java bitstream structure I/O (Vanilla implementation [Internal classes])
+ */
+
+package com.io7m.jbssio.vanilla.internal;
diff --git a/com.io7m.jbssio.vanilla/src/main/java/module-info.java b/com.io7m.jbssio.vanilla/src/main/java/module-info.java
@@ -14,6 +14,9 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+import com.io7m.jbssio.vanilla.BSSReaders;
+import com.io7m.jbssio.vanilla.BSSWriters;
+
 /**
  * Java bitstream structure I/O (Vanilla implementation)
  */
@@ -30,8 +33,8 @@
   requires org.apache.commons.io;
   requires org.slf4j;
 
-  provides com.io7m.jbssio.api.BSSReaderProviderType with com.io7m.jbssio.vanilla.BSSReaders;
-  provides com.io7m.jbssio.api.BSSWriterProviderType with com.io7m.jbssio.vanilla.BSSWriters;
+  provides com.io7m.jbssio.api.BSSReaderProviderType with BSSReaders;
+  provides com.io7m.jbssio.api.BSSWriterProviderType with BSSWriters;
 
   exports com.io7m.jbssio.vanilla;
 }