Sort members

Author: garydgregory

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

@@ -271,17 +271,6 @@ public Builder setAllowDuplicateHeaderNames(final boolean allowDuplicateHeaderNa
             return this;
         }
 
-        /**
-         * Sets the duplicate header names behavior.
-         *
-         * @param duplicateHeaderMode the duplicate header names behavior
-         * @return This instance.
-         */
-        public Builder setDuplicateHeaderMode(final DuplicateHeaderMode duplicateHeaderMode) {
-          this.duplicateHeaderMode = duplicateHeaderMode;
-          return this;
-        }
-
         /**
          * Sets the missing column names behavior, {@code true} to allow missing column names in the header line, {@code false} to cause an
          * {@link IllegalArgumentException} to be thrown.
@@ -361,6 +350,17 @@ public Builder setDelimiter(final String delimiter) {
             return this;
         }
 
+        /**
+         * Sets the duplicate header names behavior.
+         *
+         * @param duplicateHeaderMode the duplicate header names behavior
+         * @return This instance.
+         */
+        public Builder setDuplicateHeaderMode(final DuplicateHeaderMode duplicateHeaderMode) {
+          this.duplicateHeaderMode = duplicateHeaderMode;
+          return this;
+        }
+
         /**
          * Sets the escape character.
          *
@@ -1472,16 +1472,6 @@ public boolean getAllowDuplicateHeaderNames() {
         return duplicateHeaderMode == DuplicateHeaderMode.ALLOW_ALL;
     }
 
-    /**
-     * Gets how duplicate headers are handled.
-     *
-     * @return if duplicate header values are allowed, allowed conditionally, or disallowed.
-     * @since 1.9.0
-     */
-    public DuplicateHeaderMode getDuplicateHeaderMode() {
-        return duplicateHeaderMode;
-    }
-
     /**
      * Specifies whether missing column names are allowed when parsing the header line.
      *
@@ -1530,6 +1520,16 @@ public String getDelimiterString() {
         return delimiter;
     }
 
+    /**
+     * Gets how duplicate headers are handled.
+     *
+     * @return if duplicate header values are allowed, allowed conditionally, or disallowed.
+     * @since 1.9.0
+     */
+    public DuplicateHeaderMode getDuplicateHeaderMode() {
+        return duplicateHeaderMode;
+    }
+
     /**
      * Returns the escape character.
      *

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

@@ -559,6 +559,17 @@ public String getFirstEndOfLine() {
         return lexer.getFirstEol();
     }
 
+    /**
+     * Returns the header comment, if any.
+     * The header comment appears before the header record.
+     *
+     * @return the header comment for this stream, or null if no comment is available.
+     * @since 1.10.0
+     */
+    public String getHeaderComment() {
+        return headerComment;
+    }
+
     /**
      * Returns a copy of the header map.
      * <p>
@@ -605,57 +616,6 @@ public List<String> getHeaderNames() {
         return Collections.unmodifiableList(headers.headerNames);
     }
 
-    /**
-     * Checks whether there is a header comment.
-     * The header comment appears before the header record.
-     * Note that if the parser's format has been given an explicit header
-     * (with {@link CSVFormat.Builder#setHeader(String... )} or another overload)
-     * and the header record is not being skipped
-     * ({@link CSVFormat.Builder#setSkipHeaderRecord} is false) then any initial comments
-     * will be associated with the first record, not the header.
-     *
-     * @return true if this parser has seen a header comment, false otherwise
-     * @since 1.10.0
-     */
-    public boolean hasHeaderComment() {
-        return headerComment != null;
-    }
-
-    /**
-     * Returns the header comment, if any.
-     * The header comment appears before the header record.
-     *
-     * @return the header comment for this stream, or null if no comment is available.
-     * @since 1.10.0
-     */
-    public String getHeaderComment() {
-        return headerComment;
-    }
-
-    /**
-     * Checks whether there is a trailer comment.
-     * Trailer comments are located between the last record and EOF.
-     * The trailer comments will only be available after the parser has
-     * finished processing this stream.
-     *
-     * @return true if this parser has seen a trailer comment, false otherwise
-     * @since 1.10.0
-     */
-    public boolean hasTrailerComment() {
-        return trailerComment != null;
-    }
-
-    /**
-     * Returns the trailer comment, if any.
-     * Trailer comments are located between the last record and EOF
-     *
-     * @return the trailer comment for this stream, or null if no comment is available.
-     * @since 1.10.0
-     */
-    public String getTrailerComment() {
-        return trailerComment;
-    }
-
     /**
      * Returns the current record number in the input stream.
      *
@@ -691,6 +651,17 @@ public List<CSVRecord> getRecords() throws IOException {
         return records;
     }
 
+    /**
+     * Returns the trailer comment, if any.
+     * Trailer comments are located between the last record and EOF
+     *
+     * @return the trailer comment for this stream, or null if no comment is available.
+     * @since 1.10.0
+     */
+    public String getTrailerComment() {
+        return trailerComment;
+    }
+
     /**
      * Handle whether input is parsed as null
      *
@@ -710,6 +681,35 @@ private String handleNull(final String input) {
         return strictQuoteMode && nullString == null && input.isEmpty() && !isQuoted ? null : input;
     }
 
+    /**
+     * Checks whether there is a header comment.
+     * The header comment appears before the header record.
+     * Note that if the parser's format has been given an explicit header
+     * (with {@link CSVFormat.Builder#setHeader(String... )} or another overload)
+     * and the header record is not being skipped
+     * ({@link CSVFormat.Builder#setSkipHeaderRecord} is false) then any initial comments
+     * will be associated with the first record, not the header.
+     *
+     * @return true if this parser has seen a header comment, false otherwise
+     * @since 1.10.0
+     */
+    public boolean hasHeaderComment() {
+        return headerComment != null;
+    }
+
+    /**
+     * Checks whether there is a trailer comment.
+     * Trailer comments are located between the last record and EOF.
+     * The trailer comments will only be available after the parser has
+     * finished processing this stream.
+     *
+     * @return true if this parser has seen a trailer comment, false otherwise
+     * @since 1.10.0
+     */
+    public boolean hasTrailerComment() {
+        return trailerComment != null;
+    }
+
     /**
      * Tests whether this parser is closed.
      *