Sort members.

Author: garydgregory

src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java

@@ -43,6 +43,23 @@
  */
 final class ExtendedBufferedReader extends UnsynchronizedBufferedReader {
 
+    /**
+     * Measures the byte-order mark that {@code encoder} prepends to every {@link CharsetEncoder#encode(CharBuffer)} call. Charsets such as {@code UTF-16} emit
+     * a BOM each time, which would otherwise be counted once per character. The BOM is the constant prefix shared by encoding one and two characters.
+     *
+     * @param encoder The encoder to measure.
+     * @return The byte-order mark length in bytes, or 0 when the encoder writes none.
+     */
+    private static int measureBomLength(final CharsetEncoder encoder) {
+        try {
+            final int one = encoder.encode(CharBuffer.wrap(new char[] { 'a' })).limit();
+            final int two = encoder.encode(CharBuffer.wrap(new char[] { 'a', 'a' })).limit();
+            return Math.max(0, 2 * one - two);
+        } catch (final CharacterCodingException e) {
+            return 0;
+        }
+    }
+
     /** The last char returned */
     private int lastChar = UNDEFINED;
 
@@ -166,23 +183,6 @@ private int getEncodedCharLength(final int previous, final int current) throws C
         throw new CharacterCodingException();
     }
 
-    /**
-     * Measures the byte-order mark that {@code encoder} prepends to every {@link CharsetEncoder#encode(CharBuffer)} call. Charsets such as {@code UTF-16} emit
-     * a BOM each time, which would otherwise be counted once per character. The BOM is the constant prefix shared by encoding one and two characters.
-     *
-     * @param encoder The encoder to measure.
-     * @return The byte-order mark length in bytes, or 0 when the encoder writes none.
-     */
-    private static int measureBomLength(final CharsetEncoder encoder) {
-        try {
-            final int one = encoder.encode(CharBuffer.wrap(new char[] { 'a' })).limit();
-            final int two = encoder.encode(CharBuffer.wrap(new char[] { 'a', 'a' })).limit();
-            return Math.max(0, 2 * one - two);
-        } catch (final CharacterCodingException e) {
-            return 0;
-        }
-    }
-
     /**
      * Returns the last character that was read as an integer (0 to 65535). This will be the last character returned by any of the read methods. This will not
      * include a character read using the {@link #peek()} method. If no character has been read then this will return {@link Constants#UNDEFINED}. If the end of

src/test/java/org/apache/commons/csv/CSVPrinterTest.java

@@ -1107,6 +1107,17 @@ void testMultiLineComment() throws IOException {
         }
     }
 
+    @Test
+    void testMultiLineCommentWithoutRecordSeparator() throws IOException {
+        // A null record separator writes nothing between comment lines, matching the record output path.
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setCommentMarker('#').setRecordSeparator(null).get();
+        final StringWriter sw = new StringWriter();
+        try (CSVPrinter printer = new CSVPrinter(sw, format)) {
+            printer.printComment("a\nb");
+        }
+        assertEquals("# a# b", sw.toString());
+    }
+
     @Test
     void testMultiLineCommentWithTrailingDelimiter() throws IOException {
         // A comment is not a record, so the trailing delimiter must not follow comment lines, or it becomes
@@ -1128,17 +1139,6 @@ void testMultiLineCommentWithTrailingDelimiter() throws IOException {
         }
     }
 
-    @Test
-    void testMultiLineCommentWithoutRecordSeparator() throws IOException {
-        // A null record separator writes nothing between comment lines, matching the record output path.
-        final CSVFormat format = CSVFormat.DEFAULT.builder().setCommentMarker('#').setRecordSeparator(null).get();
-        final StringWriter sw = new StringWriter();
-        try (CSVPrinter printer = new CSVPrinter(sw, format)) {
-            printer.printComment("a\nb");
-        }
-        assertEquals("# a# b", sw.toString());
-    }
-
     @Test
     void testMySqlNullOutput() throws IOException {
         Object[] s = new String[] { "NULL", null };