Sort members

garydgregory · garydgregory · commit c69016a2a670 · 2023-01-28T12:19:53.000-05:00
diff --git a/src/main/java/org/apache/commons/csv/IOUtils.java b/src/main/java/org/apache/commons/csv/IOUtils.java
@@ -126,11 +126,6 @@ static long copyLarge(final Reader input, final Writer output, final char[] buff
         return count;
     }
 
-    /** No instances. */
-    private IOUtils() {
-        // Noop
-    }
-
     /**
      * Throws the given throwable.
      *
@@ -144,4 +139,9 @@ static <T extends Throwable> RuntimeException rethrow(final Throwable throwable)
         throw (T) throwable;
     }
 
+    /** No instances. */
+    private IOUtils() {
+        // Noop
+    }
+
 }
diff --git a/src/test/java/org/apache/commons/csv/CSVDuplicateHeaderTest.java b/src/test/java/org/apache/commons/csv/CSVDuplicateHeaderTest.java
@@ -34,6 +34,40 @@
  */
 public class CSVDuplicateHeaderTest {
 
+    /**
+     * Return test cases for duplicate header data for use in CSVFormat.
+     * <p>
+     * This filters the parsing test data to all cases where the allow missing column
+     * names flag is true and ignore header case is false: these flags are exclusively for parsing.
+     * CSVFormat validation applies to both parsing and writing and thus validation
+     * is less strict and behaves as if the allow missing column names constraint and
+     * the ignore header case behavior are absent.
+     * The filtered data is then returned with the parser flags set to both true and false
+     * for each test case.
+     * </p>
+     *
+     * @return the stream of arguments
+     */
+    static Stream<Arguments> duplicateHeaderAllowsMissingColumnsNamesData() {
+        return duplicateHeaderData()
+            .filter(arg -> Boolean.TRUE.equals(arg.get()[1]) && Boolean.FALSE.equals(arg.get()[2]))
+            .flatMap(arg -> {
+                // Return test case with flags as all true/false combinations
+                final Object[][] data = new Object[4][];
+                final Boolean[] flags = {Boolean.TRUE, Boolean.FALSE};
+                int i = 0;
+                for (final Boolean a : flags) {
+                    for (final Boolean b : flags) {
+                        data[i] = arg.get().clone();
+                        data[i][1] = a;
+                        data[i][2] = b;
+                        i++;
+                    }
+                }
+                return Arrays.stream(data).map(Arguments::of);
+            });
+    }
+
     /**
      * Return test cases for duplicate header data for use in parsing (CSVParser). Uses the order:
      * <pre>
@@ -225,40 +259,6 @@ static Stream<Arguments> duplicateHeaderData() {
         );
     }
 
-    /**
-     * Return test cases for duplicate header data for use in CSVFormat.
-     * <p>
-     * This filters the parsing test data to all cases where the allow missing column
-     * names flag is true and ignore header case is false: these flags are exclusively for parsing.
-     * CSVFormat validation applies to both parsing and writing and thus validation
-     * is less strict and behaves as if the allow missing column names constraint and
-     * the ignore header case behavior are absent.
-     * The filtered data is then returned with the parser flags set to both true and false
-     * for each test case.
-     * </p>
-     *
-     * @return the stream of arguments
-     */
-    static Stream<Arguments> duplicateHeaderAllowsMissingColumnsNamesData() {
-        return duplicateHeaderData()
-            .filter(arg -> Boolean.TRUE.equals(arg.get()[1]) && Boolean.FALSE.equals(arg.get()[2]))
-            .flatMap(arg -> {
-                // Return test case with flags as all true/false combinations
-                final Object[][] data = new Object[4][];
-                final Boolean[] flags = {Boolean.TRUE, Boolean.FALSE};
-                int i = 0;
-                for (final Boolean a : flags) {
-                    for (final Boolean b : flags) {
-                        data[i] = arg.get().clone();
-                        data[i][1] = a;
-                        data[i][2] = b;
-                        i++;
-                    }
-                }
-                return Arrays.stream(data).map(Arguments::of);
-            });
-    }
-
     /**
      * Tests duplicate headers with the CSVFormat.
      *

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,6 @@ static long copyLarge(final Reader input, final Writer output, final char[] buff`
`126`	`126`	`return count;`
`127`	`127`	`}`
`128`	`128`
`129`		`- /** No instances. */`
`130`		`- private IOUtils() {`
`131`		`- // Noop`
`132`		`- }`
`133`		`-`
`134`	`129`	`/**`
`135`	`130`	`* Throws the given throwable.`
`136`	`131`	`*`
`@@ -144,4 +139,9 @@ static <T extends Throwable> RuntimeException rethrow(final Throwable throwable)`
`144`	`139`	`throw (T) throwable;`
`145`	`140`	`}`
`146`	`141`
	`142`	`+ /** No instances. */`
	`143`	`+ private IOUtils() {`
	`144`	`+ // Noop`
	`145`	`+ }`
	`146`	`+`
`147`	`147`	`}`