Sort members

Author: garydgregory

src/main/java/org/apache/commons/io/IOUtils.java

@@ -2162,6 +2162,20 @@ public static void readFully(final Reader reader, final char[] buffer, final int
         }
     }
 
+    /**
+     * Gets the contents of a {@link CharSequence} as a list of Strings, one entry per line.
+     *
+     * @param csq the {@link CharSequence} to read, not null
+     * @return the list of Strings, never null
+     * @throws UncheckedIOException if an I/O error occurs
+     * @since 2.18.0
+     */
+    public static List<String> readLines(final CharSequence csq) throws UncheckedIOException {
+        try (CharSequenceReader reader = new CharSequenceReader(csq)) {
+            return readLines(reader);
+        }
+    }
+
     /**
      * Gets the contents of an {@link InputStream} as a list of Strings,
      * one entry per line, using the default character encoding of the platform.
@@ -2244,20 +2258,6 @@ public static List<String> readLines(final Reader reader) throws UncheckedIOExce
         return toBufferedReader(reader).lines().collect(Collectors.toList());
     }
 
-    /**
-     * Gets the contents of a {@link CharSequence} as a list of Strings, one entry per line.
-     *
-     * @param csq the {@link CharSequence} to read, not null
-     * @return the list of Strings, never null
-     * @throws UncheckedIOException if an I/O error occurs
-     * @since 2.18.0
-     */
-    public static List<String> readLines(final CharSequence csq) throws UncheckedIOException {
-        try (CharSequenceReader reader = new CharSequenceReader(csq)) {
-            return readLines(reader);
-        }
-    }
-
     /**
      * Gets the contents of a resource as a byte array.
      * <p>

src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java

@@ -97,6 +97,10 @@ public static Builder builder() {
         return new Builder();
     }
 
+    private AutoCloseInputStream(final Builder builder) throws IOException {
+        super(builder);
+    }
+
     /**
      * Constructs an automatically closing proxy for the given input stream.
      *
@@ -109,10 +113,6 @@ public AutoCloseInputStream(final InputStream in) {
         super(ClosedInputStream.ifNull(in));
     }
 
-    private AutoCloseInputStream(final Builder builder) throws IOException {
-        super(builder);
-    }
-
     /**
      * Automatically closes the stream if the end of stream was reached.
      *

src/main/java/org/apache/commons/io/input/BufferedFileChannelInputStream.java

@@ -157,6 +157,12 @@ public BufferedFileChannelInputStream(final File file, final int bufferSize) thr
         this(file.toPath(), bufferSize);
     }
 
+    private BufferedFileChannelInputStream(final FileChannel fileChannel, final int bufferSize) {
+        this.fileChannel = Objects.requireNonNull(fileChannel, "path");
+        byteBuffer = ByteBuffer.allocateDirect(bufferSize);
+        byteBuffer.flip();
+    }
+
     /**
      * Constructs a new instance for the given Path.
      *
@@ -183,12 +189,6 @@ public BufferedFileChannelInputStream(final Path path, final int bufferSize) thr
         this(FileChannel.open(path, StandardOpenOption.READ), bufferSize);
     }
 
-    private BufferedFileChannelInputStream(final FileChannel fileChannel, final int bufferSize) {
-        this.fileChannel = Objects.requireNonNull(fileChannel, "path");
-        byteBuffer = ByteBuffer.allocateDirect(bufferSize);
-        byteBuffer.flip();
-    }
-
     @Override
     public synchronized int available() throws IOException {
         if (!fileChannel.isOpen()) {

src/main/java/org/apache/commons/io/input/ProxyInputStream.java

@@ -102,18 +102,6 @@ public B setAfterRead(final IOIntConsumer afterRead) {
 
     private final IOIntConsumer afterRead;
 
-    /**
-     * Constructs a new ProxyInputStream.
-     *
-     * @param proxy  the InputStream to proxy.
-     */
-    public ProxyInputStream(final InputStream proxy) {
-        // the delegate is stored in a protected superclass variable named 'in'.
-        super(proxy);
-        this.exceptionHandler = Erase::rethrow;
-        this.afterRead = IOIntConsumer.NOOP;
-    }
-
     /**
      * Constructs a new ProxyInputStream.
      *
@@ -127,6 +115,18 @@ protected ProxyInputStream(final AbstractBuilder<?, ?> builder) throws IOExcepti
         this(builder.getInputStream(), builder);
     }
 
+    /**
+     * Constructs a new ProxyInputStream.
+     *
+     * @param proxy  the InputStream to proxy.
+     */
+    public ProxyInputStream(final InputStream proxy) {
+        // the delegate is stored in a protected superclass variable named 'in'.
+        super(proxy);
+        this.exceptionHandler = Erase::rethrow;
+        this.afterRead = IOIntConsumer.NOOP;
+    }
+
     /**
      * Constructs a new ProxyInputStream.
      *

src/main/java/org/apache/commons/io/output/RandomAccessFileOutputStream.java

@@ -84,8 +84,9 @@ private RandomAccessFileOutputStream(final RandomAccessFile randomAccessFile) {
     }
 
     @Override
-    public void write(final int b) throws IOException {
-        randomAccessFile.write(b);
+    public void close() throws IOException {
+        this.randomAccessFile.close();
+        super.close();
     }
 
     @SuppressWarnings("resource")
@@ -96,9 +97,8 @@ public void flush() throws IOException {
     }
 
     @Override
-    public void close() throws IOException {
-        this.randomAccessFile.close();
-        super.close();
+    public void write(final int b) throws IOException {
+        randomAccessFile.write(b);
     }
 
 }

src/test/java/org/apache/commons/io/input/BoundedInputStreamTest.java

@@ -51,6 +51,35 @@ private void compare(final String message, final byte[] expected, final byte[] a
         }
     }
 
+    @Test
+    public void testAfterReadConsumer() throws Exception {
+        final byte[] hello = "Hello".getBytes(StandardCharsets.UTF_8);
+        final AtomicBoolean boolRef = new AtomicBoolean();
+        // @formatter:off
+        try (InputStream bounded = BoundedInputStream.builder()
+                .setInputStream(new ByteArrayInputStream(hello))
+                .setMaxCount(hello.length)
+                .setAfterRead(i -> boolRef.set(true))
+                .get()) {
+            IOUtils.consume(bounded);
+        }
+        // @formatter:on
+        assertTrue(boolRef.get());
+        // Throwing
+        final String message = "test exception message";
+        // @formatter:off
+        try (InputStream bounded = BoundedInputStream.builder()
+                .setInputStream(new ByteArrayInputStream(hello))
+                .setMaxCount(hello.length)
+                .setAfterRead(i -> {
+                    throw new CustomIOException(message);
+                })
+                .get()) {
+            assertEquals(message, assertThrowsExactly(CustomIOException.class, () -> IOUtils.consume(bounded)).getMessage());
+        }
+        // @formatter:on
+    }
+
     @SuppressWarnings("resource")
     @Test
     public void testAvailableAfterClose() throws Exception {
@@ -80,22 +109,6 @@ public void testCloseHandleIOException() throws IOException {
         ProxyInputStreamTest.testCloseHandleIOException(BoundedInputStream.builder());
     }
 
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testPublicConstructors() throws IOException {
-        final byte[] helloWorld = "Hello World".getBytes(StandardCharsets.UTF_8);
-        try (ByteArrayInputStream baos = new ByteArrayInputStream(helloWorld);
-                BoundedInputStream inputStream = new BoundedInputStream(baos)) {
-            assertSame(baos, inputStream.unwrap());
-        }
-        final long maxCount = 2;
-        try (ByteArrayInputStream baos = new ByteArrayInputStream(helloWorld);
-                BoundedInputStream inputStream = new BoundedInputStream(baos, maxCount)) {
-            assertSame(baos, inputStream.unwrap());
-            assertSame(maxCount, inputStream.getMaxCount());
-        }
-    }
-
     @ParameterizedTest
     @ValueSource(longs = { -100, -1, 0, 1, 2, 4, 8, 16, 32, 64 })
     public void testCounts(final long startCount) throws Exception {
@@ -287,35 +300,6 @@ public void testMarkReset() throws Exception {
         }
     }
 
-    @Test
-    public void testAfterReadConsumer() throws Exception {
-        final byte[] hello = "Hello".getBytes(StandardCharsets.UTF_8);
-        final AtomicBoolean boolRef = new AtomicBoolean();
-        // @formatter:off
-        try (InputStream bounded = BoundedInputStream.builder()
-                .setInputStream(new ByteArrayInputStream(hello))
-                .setMaxCount(hello.length)
-                .setAfterRead(i -> boolRef.set(true))
-                .get()) {
-            IOUtils.consume(bounded);
-        }
-        // @formatter:on
-        assertTrue(boolRef.get());
-        // Throwing
-        final String message = "test exception message";
-        // @formatter:off
-        try (InputStream bounded = BoundedInputStream.builder()
-                .setInputStream(new ByteArrayInputStream(hello))
-                .setMaxCount(hello.length)
-                .setAfterRead(i -> {
-                    throw new CustomIOException(message);
-                })
-                .get()) {
-            assertEquals(message, assertThrowsExactly(CustomIOException.class, () -> IOUtils.consume(bounded)).getMessage());
-        }
-        // @formatter:on
-    }
-
     @Test
     public void testOnMaxCountConsumer() throws Exception {
         final byte[] hello = "Hello".getBytes(StandardCharsets.UTF_8);
@@ -444,6 +428,22 @@ public void testOnMaxLength() throws Exception {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testPublicConstructors() throws IOException {
+        final byte[] helloWorld = "Hello World".getBytes(StandardCharsets.UTF_8);
+        try (ByteArrayInputStream baos = new ByteArrayInputStream(helloWorld);
+                BoundedInputStream inputStream = new BoundedInputStream(baos)) {
+            assertSame(baos, inputStream.unwrap());
+        }
+        final long maxCount = 2;
+        try (ByteArrayInputStream baos = new ByteArrayInputStream(helloWorld);
+                BoundedInputStream inputStream = new BoundedInputStream(baos, maxCount)) {
+            assertSame(baos, inputStream.unwrap());
+            assertSame(maxCount, inputStream.getMaxCount());
+        }
+    }
+
     @SuppressWarnings("resource")
     @Test
     public void testReadAfterClose() throws Exception {