Validate RecordDoesNotHaveExpectedColumnException and RecordHasUnexpectedTrailingColumnException

Author: Dai MIKURUBE

embulk-guess-csv/src/main/java/org/embulk/guess/csv/CsvGuessPlugin.java

@@ -32,7 +32,7 @@
 import org.embulk.parser.csv.CsvParserPlugin;
 import org.embulk.parser.csv.CsvTokenizer;
 import org.embulk.parser.csv.InvalidCsvQuotationException;
-import org.embulk.parser.csv.TooFewColumnsException;
+import org.embulk.parser.csv.RecordDoesNotHaveExpectedColumnException;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.Exec;
@@ -319,7 +319,7 @@ private static List<List<String>> splitLines(
                             } else {
                                 columns.add(column);
                             }
-                        } catch (final TooFewColumnsException ex) {
+                        } catch (final RecordDoesNotHaveExpectedColumnException ex) {
                             rows.add(Collections.unmodifiableList(columns));
                             break;
                         }

embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvParserPlugin.java

@@ -431,7 +431,7 @@ private String nextColumn() {
 
                         try {
                             hasNextRecord = tokenizer.nextRecord();
-                        } catch (TooManyColumnsException ex) {
+                        } catch (final RecordHasUnexpectedTrailingColumnException ex) {
                             if (allowExtraColumns) {
                                 String tooManyColumnsLine = tokenizer.skipCurrentLine();
                                 // TODO warning

embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvTokenizer.java

@@ -221,7 +221,7 @@ public boolean nextRecord() {
     public boolean nextRecord(final boolean skipEmptyLine) {
         // If at the end of record, read the next line and initialize the state
         if (this.recordState != RecordState.END) {
-            throw new TooManyColumnsException("Too many columns");
+            throw new RecordHasUnexpectedTrailingColumnException();
         }
 
         final boolean hasNext = this.nextLine(skipEmptyLine);
@@ -260,7 +260,7 @@ public boolean hasNextColumn() {
 
     public String nextColumn() {
         if (!this.hasNextColumn()) {
-            throw new TooFewColumnsException("Too few columns");
+            throw new RecordDoesNotHaveExpectedColumnException();
         }
 
         // reset last state

embulk-parser-csv/src/main/java/org/embulk/parser/csv/RecordDoesNotHaveExpectedColumnException.java

@@ -16,8 +16,8 @@
 
 package org.embulk.parser.csv;
 
-public class TooFewColumnsException extends InvalidCsvFormatException {
-    public TooFewColumnsException(final String message) {
-        super(message);
+public class RecordDoesNotHaveExpectedColumnException extends InvalidCsvFormatException {
+    public RecordDoesNotHaveExpectedColumnException() {
+        super("A record does not have an expected column (i.e. too few columns).");
     }
 }

embulk-parser-csv/src/main/java/org/embulk/parser/csv/RecordHasUnexpectedTrailingColumnException.java

@@ -16,8 +16,8 @@
 
 package org.embulk.parser.csv;
 
-public class TooManyColumnsException extends InvalidCsvFormatException {
-    public TooManyColumnsException(final String message) {
-        super(message);
+public class RecordHasUnexpectedTrailingColumnException extends InvalidCsvFormatException {
+    public RecordHasUnexpectedTrailingColumnException() {
+        super("A record has an unexpected trailing column (i.e. too many columns).");
     }
 }