Keep members sorted

Author: garydgregory

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

@@ -164,10 +164,6 @@ private BoundedInputStream(final InputStream inputStream, final long maxCount, f
         this.propagateClose = propagateClose;
     }
 
-    private CountingInputStream getCountingInputStream() {
-        return (CountingInputStream) in;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -203,6 +199,10 @@ public long getCount() {
         return getCountingInputStream().getByteCount();
     }
 
+    private CountingInputStream getCountingInputStream() {
+        return (CountingInputStream) in;
+    }
+
     /**
      * Gets the max count of bytes to read.
      *

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

@@ -118,6 +118,11 @@ private ThrottledInputStream(final InputStream proxy, final long maxBytesPerSeco
         this.maxBytesPerSecond = maxBytesPerSecond;
     }
 
+    @Override
+    protected void beforeRead(final int n) throws IOException {
+        throttle();
+    }
+
     /**
      * Gets the read-rate from this stream, since creation. Calculated as bytesRead/elapsedTimeSinceStart.
      *
@@ -144,11 +149,6 @@ Duration getTotalSleepDuration() {
         return totalSleepDuration;
     }
 
-    @Override
-    protected void beforeRead(final int n) throws IOException {
-        throttle();
-    }
-
     private void throttle() throws InterruptedIOException {
         final long sleepMillis = getSleepMillis();
         if (sleepMillis > 0) {

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

@@ -192,6 +192,17 @@ public void testBufferedRead_UTF8() throws IOException {
         testBufferedRead(TEST_STRING, UTF_8);
     }
 
+    @Test
+    public void testCharacterCodingException() throws IOException {
+        final Charset charset = StandardCharsets.US_ASCII;
+        final CharSequenceInputStream in = CharSequenceInputStream.builder()
+            .setCharsetEncoder(charset.newEncoder().onUnmappableCharacter(CodingErrorAction.REPORT))
+            .setCharSequence("\u0080")
+            .get();
+        assertEquals(0, in.available());
+        assertThrows(UnmappableCharacterException.class, in::read);
+    }
+
     private void testCharsetMismatchInfiniteLoop(final String csName) throws IOException {
         // Input is UTF-8 bytes: 0xE0 0xB2 0xA0
         final char[] inputChars = { (char) 0xE0, (char) 0xB2, (char) 0xA0 };
@@ -527,15 +538,4 @@ public void testSkip_RequiredCharsets(final String csName) throws Exception {
             assertEquals(-1, r.read(), csName);
         }
     }
-
-    @Test
-    public void testCharacterCodingException() throws IOException {
-        final Charset charset = StandardCharsets.US_ASCII;
-        final CharSequenceInputStream in = CharSequenceInputStream.builder()
-            .setCharsetEncoder(charset.newEncoder().onUnmappableCharacter(CodingErrorAction.REPORT))
-            .setCharSequence("\u0080")
-            .get();
-        assertEquals(0, in.available());
-        assertThrows(UnmappableCharacterException.class, in::read);
-    }
 }