Validate QuotedFieldLengthLimitExceededException

Author: Dai MIKURUBE

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

@@ -423,7 +423,7 @@ public String nextColumn() {
                             // A non-escaped stray "quote character" in the field is processed as a regular character
                             // if ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMITERS_IN_FIELDS is specified,
                             if ((this.linePos - valueStartPos) + quotedValue.length() > this.maxQuotedFieldLength) {
-                                throw new QuotedSizeLimitExceededException("The size of the quoted value exceeds the limit size (" + this.maxQuotedFieldLength + ")");
+                                throw new QuotedFieldLengthLimitExceededException(this.maxQuotedFieldLength);
                             }
                         } else {
                             quotedValue.append(this.line.substring(valueStartPos, this.linePos - 1));
@@ -449,7 +449,7 @@ public String nextColumn() {
 
                     } else {
                         if ((this.linePos - valueStartPos) + quotedValue.length() > this.maxQuotedFieldLength) {
-                            throw new QuotedSizeLimitExceededException("The size of the quoted value exceeds the limit size (" + this.maxQuotedFieldLength + ")");
+                            throw new QuotedFieldLengthLimitExceededException(this.maxQuotedFieldLength);
                         }
                         // keep QUOTED_VALUE state
                     }

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

@@ -16,8 +16,11 @@
 
 package org.embulk.parser.csv;
 
-public class QuotedSizeLimitExceededException extends InvalidCsvQuotationException {
-    public QuotedSizeLimitExceededException(final String message) {
-        super(message);
+public class QuotedFieldLengthLimitExceededException extends InvalidCsvQuotationException {
+    public QuotedFieldLengthLimitExceededException(final long quotedFieldLengthLimit) {
+        super("The length of the quoted field exceeds the limit (" + quotedFieldLengthLimit + ")");
+        this.quotedFieldLengthLimit = quotedFieldLengthLimit;
     }
+
+    private final long quotedFieldLengthLimit;
 }

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

@@ -338,7 +338,7 @@ public void parseWithQuotesInQuotedFields_ACCEPT_STRAY_QUOTES_ASSUMING_NO_DELIMI
     }
 
     @Test
-    public void throwQuotedSizeLimitExceededException() throws Exception {
+    public void throwQuotedFieldLengthLimitExceededException() throws Exception {
         final CsvTokenizer.Builder builder = initialBuilder();
         builder.setMaxQuotedFieldLength(8);
 
@@ -348,7 +348,7 @@ public void throwQuotedSizeLimitExceededException() throws Exception {
                     "v3,\"0123456789\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedFieldLengthLimitExceededException);
         }
 
         // multi-line
@@ -358,12 +358,12 @@ public void throwQuotedSizeLimitExceededException() throws Exception {
                     "\"012345\n6789\",v3");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedFieldLengthLimitExceededException);
         }
     }
 
     @Test
-    public void recoverFromQuotedSizeLimitExceededException() throws Exception {
+    public void recoverFromQuotedFieldLengthLimitExceededException() throws Exception {
         final CsvTokenizer.Builder builder = initialBuilder();
         builder.setMaxQuotedFieldLength(12);
 
@@ -388,7 +388,7 @@ public void recoverFromQuotedSizeLimitExceededException() throws Exception {
             tokenizer.nextColumn();
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedFieldLengthLimitExceededException);
         }
         assertEquals("v3,\"0123", tokenizer.skipCurrentLine());