Sort members

Author: garydgregory

src/main/java/org/apache/commons/io/build/AbstractOrigin.java

@@ -61,6 +61,17 @@ protected static ByteArrayOrigin newByteArrayOrigin(final byte[] origin) {
         return new ByteArrayOrigin(origin);
     }
 
+    /**
+     * Constructs a new channel origin for a channel.
+     *
+     * @param origin the channel.
+     * @return a new channel origin.
+     * @since 2.21.0
+     */
+    protected static ChannelOrigin newChannelOrigin(final Channel origin) {
+        return new ChannelOrigin(origin);
+    }
+
     /**
      * Constructs a new CharSequence origin for a CharSequence.
      *
@@ -184,17 +195,6 @@ protected static WriterOrigin newWriterOrigin(final Writer origin) {
         return new WriterOrigin(origin);
     }
 
-    /**
-     * Constructs a new channel origin for a channel.
-     *
-     * @param origin the channel.
-     * @return a new channel origin.
-     * @since 2.21.0
-     */
-    protected static ChannelOrigin newChannelOrigin(final Channel origin) {
-        return new ChannelOrigin(origin);
-    }
-
     /**
      * The underlying origin.
      */
@@ -248,6 +248,17 @@ public B setByteArray(final byte[] origin) {
         return setOrigin(newByteArrayOrigin(origin));
     }
 
+    /**
+     * Sets a new origin.
+     *
+     * @param origin the new origin.
+     * @return {@code this} instance.
+     * @since 2.21.0
+     */
+    public B setChannel(final Channel origin) {
+        return setOrigin(newChannelOrigin(origin));
+    }
+
     /**
      * Sets a new origin.
      *
@@ -381,15 +392,4 @@ public B setURI(final URI origin) {
     public B setWriter(final Writer origin) {
         return setOrigin(newWriterOrigin(origin));
     }
-
-    /**
-     * Sets a new origin.
-     *
-     * @param origin the new origin.
-     * @return {@code this} instance.
-     * @since 2.21.0
-     */
-    public B setChannel(final Channel origin) {
-        return setOrigin(newChannelOrigin(origin));
-    }
 }

src/main/java/org/apache/commons/io/build/AbstractOriginSupplier.java

@@ -120,6 +120,23 @@ public int getBufferSizeDefault() {
         return bufferSizeDefault;
     }
 
+    /**
+     * Gets a Channel from the origin with OpenOption[].
+     *
+     * @param channelType The channel type, not null.
+     * @return A channel of the specified type.
+     * @param <C>         The channel type.
+     * @throws IllegalStateException         if the {@code origin} is {@code null}.
+     * @throws UnsupportedOperationException if the origin cannot be converted to a {@link ReadableByteChannel}.
+     * @throws IOException                   if an I/O error occurs.
+     * @see AbstractOrigin#getChannel
+     * @see #getOpenOptions()
+     * @since 2.21.0
+     */
+    public <C extends Channel> C getChannel(final Class<C> channelType) throws IOException {
+        return checkOrigin().getChannel(channelType, getOpenOptions());
+    }
+
     /**
      * Gets a CharSequence from the origin with a Charset.
      *
@@ -260,23 +277,6 @@ public Writer getWriter() throws IOException {
         return checkOrigin().getWriter(getCharset(), getOpenOptions());
     }
 
-    /**
-     * Gets a Channel from the origin with OpenOption[].
-     *
-     * @param channelType The channel type, not null.
-     * @return A channel of the specified type.
-     * @param <C>         The channel type.
-     * @throws IllegalStateException         if the {@code origin} is {@code null}.
-     * @throws UnsupportedOperationException if the origin cannot be converted to a {@link ReadableByteChannel}.
-     * @throws IOException                   if an I/O error occurs.
-     * @see AbstractOrigin#getChannel
-     * @see #getOpenOptions()
-     * @since 2.21.0
-     */
-    public <C extends Channel> C getChannel(final Class<C> channelType) throws IOException {
-        return checkOrigin().getChannel(channelType, getOpenOptions());
-    }
-
     /**
      * Sets the buffer size. Invalid input (bufferSize &lt;= 0) resets the value to its default.
      * <p>

src/main/java/org/apache/commons/io/build/AbstractStreamBuilder.java

@@ -84,6 +84,12 @@ public ByteArraySeekableByteChannel() {
         this(IOUtils.DEFAULT_BUFFER_SIZE);
     }
 
+    private ByteArraySeekableByteChannel(final byte[] data) {
+        this.data = data;
+        this.position = 0;
+        this.size = data.length;
+    }
+
     /**
      * Constructs a new instance, with an internal buffer of the given capacity, in bytes.
      * <p>
@@ -102,12 +108,6 @@ public ByteArraySeekableByteChannel(final int size) {
         this.size = 0;
     }
 
-    private ByteArraySeekableByteChannel(final byte[] data) {
-        this.data = data;
-        this.position = 0;
-        this.size = data.length;
-    }
-
     /**
      * Gets the raw byte array backing this channel, <em>this is not a copy</em>.
      * <p>
@@ -120,18 +120,6 @@ public byte[] array() {
         return data;
     }
 
-    /**
-     * Gets a copy of the data stored in this channel.
-     * <p>
-     * The returned array is a copy of the internal buffer, sized to the actual data stored in this channel.
-     * </p>
-     *
-     * @return a new byte array containing the data stored in this channel.
-     */
-    public byte[] toByteArray() {
-        return Arrays.copyOf(data, size);
-    }
-
     private void checkOpen() throws ClosedChannelException {
         if (!isOpen()) {
             throw new ClosedChannelException();
@@ -235,6 +223,18 @@ public long size() throws ClosedChannelException {
         }
     }
 
+    /**
+     * Gets a copy of the data stored in this channel.
+     * <p>
+     * The returned array is a copy of the internal buffer, sized to the actual data stored in this channel.
+     * </p>
+     *
+     * @return a new byte array containing the data stored in this channel.
+     */
+    public byte[] toByteArray() {
+        return Arrays.copyOf(data, size);
+    }
+
     @Override
     public SeekableByteChannel truncate(final long newSize) throws ClosedChannelException {
         checkOpen();

src/main/java/org/apache/commons/io/channels/ByteArraySeekableByteChannel.java

@@ -79,6 +79,23 @@ void beforeEach() throws IOException {
         setOriginRw(newOriginRw());
     }
 
+    private void checkRead(final ReadableByteChannel channel) throws IOException {
+        final ByteBuffer buffer = ByteBuffer.allocate(RO_LENGTH);
+        int read = channel.read(buffer);
+        assertEquals(RO_LENGTH, read);
+        assertArrayEquals(getFixtureByteArray(), buffer.array());
+        // Channel is at EOF
+        buffer.clear();
+        read = channel.read(buffer);
+        assertEquals(-1, read);
+    }
+
+    private void checkWrite(final WritableByteChannel channel) throws IOException {
+        final ByteBuffer buffer = ByteBuffer.wrap(getFixtureByteArray());
+        final int written = channel.write(buffer);
+        assertEquals(RO_LENGTH, written);
+    }
+
     @AfterEach
     void cleanup() {
         final T originRo = getOriginRo().get();
@@ -91,6 +108,14 @@ void cleanup() {
         }
     }
 
+    byte[] getFixtureByteArray() throws IOException {
+        return IOUtils.resourceToByteArray(FILE_RES_RO);
+    }
+
+    String getFixtureString() throws IOException {
+        return IOUtils.resourceToString(FILE_RES_RO, StandardCharsets.UTF_8);
+    }
+
     protected AbstractOrigin<T, B> getOriginRo() {
         return Objects.requireNonNull(originRo, "originRo");
     }
@@ -108,24 +133,16 @@ private boolean isValid(final RandomAccessFile raf) throws IOException {
 
     protected abstract B newOriginRw() throws IOException;
 
-    protected void setOriginRo(final AbstractOrigin<T, B> origin) {
-        this.originRo = origin;
-    }
-
-    protected void setOriginRw(final AbstractOrigin<T, B> origin) {
-        this.originRw = origin;
-    }
-
     protected void resetOriginRw() throws IOException {
         // No-op
     }
 
-    byte[] getFixtureByteArray() throws IOException {
-        return IOUtils.resourceToByteArray(FILE_RES_RO);
+    protected void setOriginRo(final AbstractOrigin<T, B> origin) {
+        this.originRo = origin;
     }
 
-    String getFixtureString() throws IOException {
-        return IOUtils.resourceToString(FILE_RES_RO, StandardCharsets.UTF_8);
+    protected void setOriginRw(final AbstractOrigin<T, B> origin) {
+        this.originRw = origin;
     }
 
     @Test
@@ -258,33 +275,6 @@ void testGetRandomAccessFile(final OpenOption openOption) throws IOException {
         }
     }
 
-    @Test
-    void testGetReader() throws IOException {
-        try (Reader reader = getOriginRo().getReader(Charset.defaultCharset())) {
-            assertNotNull(reader);
-        }
-        setOriginRo(newOriginRo());
-        try (Reader reader = getOriginRo().getReader(null)) {
-            assertNotNull(reader);
-        }
-        setOriginRo(newOriginRo());
-        try (Reader reader = getOriginRo().getReader(StandardCharsets.UTF_8)) {
-            assertNotNull(reader);
-            assertEquals(getFixtureString(), IOUtils.toString(reader));
-        }
-    }
-
-    @Test
-    void testGetWriter() throws IOException {
-        try (Writer writer = getOriginRw().getWriter(Charset.defaultCharset())) {
-            assertNotNull(writer);
-        }
-        setOriginRw(newOriginRw());
-        try (Writer writer = getOriginRw().getWriter(null)) {
-            assertNotNull(writer);
-        }
-    }
-
     @Test
     void testGetReadableByteChannel() throws IOException {
         try (ReadableByteChannel channel =
@@ -304,15 +294,20 @@ void testGetReadableByteChannel() throws IOException {
         }
     }
 
-    private void checkRead(final ReadableByteChannel channel) throws IOException {
-        final ByteBuffer buffer = ByteBuffer.allocate(RO_LENGTH);
-        int read = channel.read(buffer);
-        assertEquals(RO_LENGTH, read);
-        assertArrayEquals(getFixtureByteArray(), buffer.array());
-        // Channel is at EOF
-        buffer.clear();
-        read = channel.read(buffer);
-        assertEquals(-1, read);
+    @Test
+    void testGetReader() throws IOException {
+        try (Reader reader = getOriginRo().getReader(Charset.defaultCharset())) {
+            assertNotNull(reader);
+        }
+        setOriginRo(newOriginRo());
+        try (Reader reader = getOriginRo().getReader(null)) {
+            assertNotNull(reader);
+        }
+        setOriginRo(newOriginRo());
+        try (Reader reader = getOriginRo().getReader(StandardCharsets.UTF_8)) {
+            assertNotNull(reader);
+            assertEquals(getFixtureString(), IOUtils.toString(reader));
+        }
     }
 
     @Test
@@ -367,10 +362,15 @@ void testGetWritableByteChannel() throws IOException {
         }
     }
 
-    private void checkWrite(final WritableByteChannel channel) throws IOException {
-        final ByteBuffer buffer = ByteBuffer.wrap(getFixtureByteArray());
-        final int written = channel.write(buffer);
-        assertEquals(RO_LENGTH, written);
+    @Test
+    void testGetWriter() throws IOException {
+        try (Writer writer = getOriginRw().getWriter(Charset.defaultCharset())) {
+            assertNotNull(writer);
+        }
+        setOriginRw(newOriginRw());
+        try (Writer writer = getOriginRw().getWriter(null)) {
+            assertNotNull(writer);
+        }
     }
 
     @Test