[CSV-99] Revert Builder implementation in CSVFormat.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508470 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

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

@@ -42,7 +42,7 @@
  *
  * <pre>
  * Reader in = new StringReader(&quot;a\tb\nc\td&quot;);
- * Iterable&lt;CSVRecord&gt; parser = CSVFormat.newBuilder()
+ * Iterable&lt;CSVRecord&gt; parser = CSVFormat.DEFAULT
  *     .withCommentStart('#')
  *     .withDelimiter('\t')
  *     .withQuoteChar('"').parse(in);
@@ -120,8 +120,9 @@ public CSVParser(final Reader input) throws IOException {
      *             If an I/O error occurs
      */
     public CSVParser(final Reader input, final CSVFormat format) throws IOException {
-        this.lexer = new CSVLexer(format, new ExtendedBufferedReader(input));
+        format.validate();
         this.format = format;
+        this.lexer = new CSVLexer(format, new ExtendedBufferedReader(input));
         this.headerMap = initializeHeader();
     }
 

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

@@ -58,6 +58,7 @@ public class CSVPrinter implements Flushable, Closeable {
     public CSVPrinter(final Appendable out, final CSVFormat format) {
         this.out = out;
         this.format = format == null ? CSVFormat.DEFAULT : format;
+        format.validate();
     }
 
     // ======================================================

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

@@ -32,7 +32,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.csv.CSVFormat.CSVFormatBuilder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -90,18 +89,17 @@ public void testCSVFile() throws Exception {
         assertTrue(testName+" require 1 param", split.length >= 1);
          // first line starts with csv data file name
         final BufferedReader csvFile = new BufferedReader(new FileReader(new File(BASE, split[0])));
-        final CSVFormatBuilder builder = CSVFormat.newBuilder(',').withQuoteChar('"');
-        CSVFormat format = builder.build();
+        CSVFormat format = CSVFormat.newFormat(',').withQuoteChar('"');
         boolean checkComments = false;
         for(int i=1; i < split.length; i++) {
             final String option = split[i];
             final String[] option_parts = option.split("=",2);
             if ("IgnoreEmpty".equalsIgnoreCase(option_parts[0])){
-                format = builder.withIgnoreEmptyLines(Boolean.parseBoolean(option_parts[1])).build();
+                format = format.withIgnoreEmptyLines(Boolean.parseBoolean(option_parts[1]));
             } else if ("IgnoreSpaces".equalsIgnoreCase(option_parts[0])) {
-                format = builder.withIgnoreSurroundingSpaces(Boolean.parseBoolean(option_parts[1])).build();
+                format = format.withIgnoreSurroundingSpaces(Boolean.parseBoolean(option_parts[1]));
             } else if ("CommentStart".equalsIgnoreCase(option_parts[0])) {
-                format = builder.withCommentStart(option_parts[1].charAt(0)).build();
+                format = format.withCommentStart(option_parts[1].charAt(0));
             } else if ("CheckComments".equalsIgnoreCase(option_parts[0])) {
                 checkComments = true;
             } else {