[CSV-241] CSVFormat#valiadte() does not account for

Gary Gregory · Gary Gregory · commit d6e494b44d85 · 2019-06-05T18:03:25.000-04:00
llowDuplicateHeaderNames. Applying a different version of the GitHub patch with adjustments to the tests. Also remove trailing whitespace from CSVRecord. Closes #43.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -38,6 +38,9 @@
     <title>Release Notes</title>
   </properties>
   <body>
+    <release version="1.8" date="2019-MM-DD" description="Feature and bug fix release (Java 8)">
+      <action issue="CSV-241" type="fix" dev="ggregory" due-to="LuckyIlam, Gary Gregory">CSVFormat#valiadte() does not account for allowDuplicateHeaderNames #43.</action>
+    </release>
     <release version="1.7" date="2019-06-01" description="Feature and bug fix release (Java 8)">
       <action issue="CSV-233" type="add" dev="ggregory" due-to="Gary Gregory">Add predefined CSVFormats for printing MongoDB CSV and TSV.</action>
       <action issue="CSV-208" type="fix" dev="ggregory" due-to="Jurrie Overgoor">Fix escape character for POSTGRESQL_TEXT and POSTGRESQL_CSV formats.</action>
diff --git a/src/main/java/org/apache/commons/csv/CSVFormat.java b/src/main/java/org/apache/commons/csv/CSVFormat.java
@@ -1668,7 +1668,7 @@ private void validate() throws IllegalArgumentException {
         }
 
         // validate header
-        if (header != null) {
+        if (header != null && !allowDuplicateHeaderNames) {
             final Set<String> dupCheck = new HashSet<>();
             for (final String hdr : header) {
                 if (!dupCheck.add(hdr)) {
diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java b/src/main/java/org/apache/commons/csv/CSVRecord.java
@@ -281,7 +281,7 @@ public Map<String, String> toMap() {
      */
     @Override
     public String toString() {
-        return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" + 
+        return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" +
             Arrays.toString(values) + "]";
     }
 
diff --git a/src/test/java/org/apache/commons/csv/CSVFormatTest.java b/src/test/java/org/apache/commons/csv/CSVFormatTest.java
@@ -72,8 +72,20 @@ public void testDelimiterSameAsEscapeThrowsException() {
     }
 
     @Test(expected = IllegalArgumentException.class)
+    public void testDuplicateHeaderElementsFalse() {
+        CSVFormat.DEFAULT.withAllowDuplicateHeaderNames(false).withHeader("A", "A");
+    }
+
+    public void testDuplicateHeaderElementsTrue() {
+        CSVFormat.DEFAULT.withAllowDuplicateHeaderNames(true).withHeader("A", "A");
+    }
+
+    @Test
     public void testDuplicateHeaderElements() {
-        CSVFormat.DEFAULT.withHeader("A", "A");
+        final String[] header = { "A", "A" };
+        final CSVFormat format = CSVFormat.DEFAULT.withHeader(header);
+        assertEquals(2, format.getHeader().length);
+        assertArrayEquals(header, format.getHeader());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ private void validate() throws IllegalArgumentException {`
`1668`	`1668`	`}`
`1669`	`1669`
`1670`	`1670`	`// validate header`
`1671`		`- if (header != null) {`
	`1671`	`+ if (header != null && !allowDuplicateHeaderNames) {`
`1672`	`1672`	`final Set<String> dupCheck = new HashSet<>();`
`1673`	`1673`	`for (final String hdr : header) {`
`1674`	`1674`	`if (!dupCheck.add(hdr)) {`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ public Map<String, String> toMap() {`
`281`	`281`	`*/`
`282`	`282`	`@Override`
`283`	`283`	`public String toString() {`
`284`		`- return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" +`
	`284`	`+ return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" +`
`285`	`285`	`Arrays.toString(values) + "]";`
`286`	`286`	`}`
`287`	`287`