Validate InvalidCsvFormatException and InvalidCsvValueException

Author: Dai MIKURUBE

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

@@ -31,7 +31,7 @@
 import org.embulk.config.ConfigSource;
 import org.embulk.parser.csv.CsvParserPlugin;
 import org.embulk.parser.csv.CsvTokenizer;
-import org.embulk.parser.csv.InvalidValueException;
+import org.embulk.parser.csv.InvalidCsvQuotationException;
 import org.embulk.parser.csv.TooFewColumnsException;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.BufferAllocator;
@@ -324,7 +324,7 @@ private static List<List<String>> splitLines(
                             break;
                         }
                     }
-                } catch (final InvalidValueException ex) {
+                } catch (final InvalidCsvQuotationException ex) {
                     // TODO warning
                     tokenizer.skipCurrentLine();
                 }

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

@@ -443,7 +443,7 @@ private String nextColumn() {
                         }
                         pageBuilder.addRecord();
 
-                    } catch (InvalidFormatException | InvalidValueException | CsvRecordValidateException e) {
+                    } catch (InvalidCsvFormatException | InvalidCsvQuotationException | CsvRecordValidateException e) {
                         String skippedLine = tokenizer.skipCurrentLine();
                         long lineNumber = tokenizer.getCurrentLineNumber();
                         if (stopOnInvalidRecord) {

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

@@ -402,7 +402,7 @@ public String nextColumn() {
                         quotedValue.append(this.newline);
                         this.quotedValueLines.add(this.line);
                         if (!this.nextLine(false)) {
-                            throw new InvalidValueException("Unexpected end of line during parsing a quoted value");
+                            throw new InvalidCsvQuotationException("Unexpected end of line during parsing a quoted value");
                         }
                         valueStartPos = 0;
 
@@ -438,7 +438,7 @@ public String nextColumn() {
                             quotedValue.append(this.line.substring(valueStartPos, this.linePos));
                             this.quotedValueLines.add(this.line);
                             if (!this.nextLine(false)) {
-                                throw new InvalidValueException("Unexpected end of line during parsing a quoted value");
+                                throw new InvalidCsvQuotationException("Unexpected end of line during parsing a quoted value");
                             }
                             valueStartPos = 0;
                         } else if (this.isQuote(next) || this.isEscape(next)) { // escaped quote
@@ -473,7 +473,7 @@ public String nextColumn() {
                         // column has trailing spaces and quoted. TODO should this be rejected?
 
                     } else {
-                        throw new InvalidValueException(String.format("Unexpected extra character '%c' after a value quoted by '%c'", c, this.quote));
+                        throw new InvalidCsvQuotationException(String.format("Unexpected extra character '%c' after a value quoted by '%c'", c, this.quote));
                     }
                     break;
 

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

@@ -18,8 +18,8 @@
 
 import org.embulk.spi.DataException;
 
-public class InvalidFormatException extends DataException {
-    public InvalidFormatException(final String message) {
+public class InvalidCsvFormatException extends DataException {
+    public InvalidCsvFormatException(final String message) {
         super(message);
     }
 }

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

@@ -18,8 +18,8 @@
 
 import org.embulk.spi.DataException;
 
-public class InvalidValueException extends DataException {
-    public InvalidValueException(final String message) {
+public class InvalidCsvQuotationException extends DataException {
+    public InvalidCsvQuotationException(final String message) {
         super(message);
     }
 }

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

@@ -16,7 +16,7 @@
 
 package org.embulk.parser.csv;
 
-public class QuotedSizeLimitExceededException extends InvalidValueException {
+public class QuotedSizeLimitExceededException extends InvalidCsvQuotationException {
     public QuotedSizeLimitExceededException(final String message) {
         super(message);
     }

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

@@ -16,7 +16,7 @@
 
 package org.embulk.parser.csv;
 
-public class TooFewColumnsException extends InvalidFormatException {
+public class TooFewColumnsException extends InvalidCsvFormatException {
     public TooFewColumnsException(final String message) {
         super(message);
     }

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

@@ -16,7 +16,7 @@
 
 package org.embulk.parser.csv;
 
-public class TooManyColumnsException extends InvalidFormatException {
+public class TooManyColumnsException extends InvalidCsvFormatException {
     public TooManyColumnsException(final String message) {
         super(message);
     }

embulk-parser-csv/src/test/java/org/embulk/parser/csv/TestCsvTokenizer.java

@@ -300,7 +300,7 @@ public void throwWithDefaultQuotesInQuotedFields() throws Exception {
             parse(builder, "\n", 2, "\"foo\"bar\",\"hoge\"fuga\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof InvalidValueException);
+            assertTrue(e instanceof InvalidCsvQuotationException);
             assertEquals("Unexpected extra character 'b' after a value quoted by '\"'", e.getMessage());
             return;
         }
@@ -314,7 +314,7 @@ public void throwWithQuotesInQuotedFields_ACCEPT_ONLY_RFC4180_ESCAPED() throws E
             parse(builder, "\n", 2, "\"foo\"bar\",\"hoge\"fuga\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof InvalidValueException);
+            assertTrue(e instanceof InvalidCsvQuotationException);
             assertEquals("Unexpected extra character 'b' after a value quoted by '\"'", e.getMessage());
             return;
         }