Sort members.

Author: garydgregory

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

@@ -122,19 +122,6 @@ int lookAhead() throws IOException {
         return c;
     }
 
-    /**
-     * Returns the next n characters in the current reader without consuming them. The next call to {@link #read()} will still return the next value. This
-     * doesn't affect line number or last character.
-     *
-     * @param n the number characters look ahead.
-     * @return the next n characters.
-     * @throws IOException If an I/O error occurs
-     */
-    char[] lookAhead(final int n) throws IOException {
-        final char[] buf = new char[n];
-        return lookAhead(buf);
-    }
-
     /**
      * Populates the buffer with the next {@code buf.length} characters in the
      * current reader without consuming them. The next call to {@link #read()} will
@@ -154,6 +141,19 @@ char[] lookAhead(final char[] buf) throws IOException {
         return buf;
     }
 
+    /**
+     * Returns the next n characters in the current reader without consuming them. The next call to {@link #read()} will still return the next value. This
+     * doesn't affect line number or last character.
+     *
+     * @param n the number characters look ahead.
+     * @return the next n characters.
+     * @throws IOException If an I/O error occurs
+     */
+    char[] lookAhead(final int n) throws IOException {
+        final char[] buf = new char[n];
+        return lookAhead(buf);
+    }
+
     @Override
     public int read() throws IOException {
         final int current = super.read();

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

@@ -42,6 +42,11 @@ public class CSVFileParserTest {
 
     private static final File BASE_DIR = new File("src/test/resources/org/apache/commons/csv/CSVFileParser");
 
+    public static Stream<File> generateData() {
+        final File[] files = BASE_DIR.listFiles((dir, name) -> name.startsWith("test") && name.endsWith(".txt"));
+        return files != null ? Stream.of(files) : Stream.empty();
+    }
+
     private String readTestData(final BufferedReader reader) throws IOException {
         String line;
         do {
@@ -50,11 +55,6 @@ private String readTestData(final BufferedReader reader) throws IOException {
         return line;
     }
 
-    public static Stream<File> generateData() {
-        final File[] files = BASE_DIR.listFiles((dir, name) -> name.startsWith("test") && name.endsWith(".txt"));
-        return files != null ? Stream.of(files) : Stream.empty();
-    }
-
     @ParameterizedTest
     @MethodSource("generateData")
     public void testCSVFile(final File testFile) throws Exception {

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

@@ -42,28 +42,28 @@ public void testExcel() {
     }
 
     @Test
-    public void testMySQL() {
-        test(CSVFormat.MYSQL, "MySQL");
+    public void testMongoDbCsv() {
+        test(CSVFormat.MONGODB_CSV, "MongoDBCsv");
     }
 
     @Test
-    public void testOracle() {
-        test(CSVFormat.ORACLE, "Oracle");
+    public void testMongoDbTsv() {
+        test(CSVFormat.MONGODB_TSV, "MongoDBTsv");
     }
 
     @Test
-    public void testPostgreSqlCsv() {
-        test(CSVFormat.POSTGRESQL_CSV, "PostgreSQLCsv");
+    public void testMySQL() {
+        test(CSVFormat.MYSQL, "MySQL");
     }
 
     @Test
-    public void testMongoDbCsv() {
-        test(CSVFormat.MONGODB_CSV, "MongoDBCsv");
+    public void testOracle() {
+        test(CSVFormat.ORACLE, "Oracle");
     }
 
     @Test
-    public void testMongoDbTsv() {
-        test(CSVFormat.MONGODB_TSV, "MongoDBTsv");
+    public void testPostgreSqlCsv() {
+        test(CSVFormat.POSTGRESQL_CSV, "PostgreSQLCsv");
     }
 
     @Test

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

@@ -264,6 +264,15 @@ public void testSerialization() throws IOException, ClassNotFoundException {
         }
     }
 
+    @Test
+    public void testStream() {
+        final AtomicInteger i = new AtomicInteger();
+        record.stream().forEach(value -> {
+            assertEquals(values[i.get()], value);
+            i.incrementAndGet();
+        });
+    }
+
     @Test
     public void testToList() {
         int i = 0;
@@ -297,15 +306,6 @@ public void testToMapWithShortRecord() throws Exception {
         }
     }
 
-    @Test
-    public void testStream() {
-        final AtomicInteger i = new AtomicInteger();
-        record.stream().forEach(value -> {
-            assertEquals(values[i.get()], value);
-            i.incrementAndGet();
-        });
-    }
-
     @Test
     public void testToString() {
         assertNotNull(recordWithHeader.toString());