Add InvalidCharacterAfterQuoteException instead of InvalidCsvQuotationException(String.format("Unexpected extra character '%c' after a value quoted by '%c'", ...)

Author: Dai MIKURUBE

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

@@ -473,7 +473,7 @@ public String nextColumn() {
                         // column has trailing spaces and quoted. TODO should this be rejected?
 
                     } else {
-                        throw new InvalidCsvQuotationException(String.format("Unexpected extra character '%c' after a value quoted by '%c'", c, this.quote));
+                        throw new InvalidCharacterAfterQuoteException(c, this.quote);
                     }
                     break;
 

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

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 The Embulk project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.embulk.parser.csv;
+
+public class InvalidCharacterAfterQuoteException extends InvalidCsvQuotationException {
+    public InvalidCharacterAfterQuoteException(final char extraChar, final char quoteChar) {
+        super(String.format("Unexpected extra character '%c' after a quote by '%c'.", extraChar, quoteChar));
+        this.extraChar = extraChar;
+        this.quoteChar = quoteChar;
+    }
+
+    private final char extraChar;
+    private final char quoteChar;
+}

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

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