Merge pull request #20 from embulk/non-inner-class-Exceptions-from-CsvTokenizer

dmikurube · web-flow · commit 9b6ed6badb5a · 2022-04-07T23:15:01.000+09:00
Replace CsvTokenizer's Exceptions not to be inner classes
diff --git a/embulk-guess-csv/src/main/java/org/embulk/guess/csv/CsvGuessPlugin.java b/embulk-guess-csv/src/main/java/org/embulk/guess/csv/CsvGuessPlugin.java
@@ -31,6 +31,8 @@
 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.TooFewColumnsException;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.Exec;
@@ -324,12 +326,12 @@ private static List<List<String>> splitLines(
                                 } else {
                                     columns.add(column);
                                 }
-                            } catch (final CsvTokenizer.TooFewColumnsException ex) {
+                            } catch (final TooFewColumnsException ex) {
                                 rows.add(Collections.unmodifiableList(columns));
                                 break;
                             }
                         }
-                    } catch (final CsvTokenizer.InvalidValueException ex) {
+                    } catch (final InvalidValueException ex) {
                         // TODO warning
                         tokenizer.skipCurrentLine();
                     }
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvParserPlugin.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvParserPlugin.java
@@ -429,7 +429,7 @@ private String nextColumn() {
 
                         try {
                             hasNextRecord = tokenizer.nextRecord();
-                        } catch (CsvTokenizer.TooManyColumnsException ex) {
+                        } catch (TooManyColumnsException ex) {
                             if (allowExtraColumns) {
                                 String tooManyColumnsLine = tokenizer.skipCurrentLine();
                                 // TODO warning
@@ -441,7 +441,7 @@ private String nextColumn() {
                         }
                         pageBuilder.addRecord();
 
-                    } catch (CsvTokenizer.InvalidFormatException | CsvTokenizer.InvalidValueException | CsvRecordValidateException e) {
+                    } catch (InvalidFormatException | InvalidValueException | CsvRecordValidateException e) {
                         String skippedLine = tokenizer.skipCurrentLine();
                         long lineNumber = tokenizer.getCurrentLineNumber();
                         if (stopOnInvalidRecord) {
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvTokenizer.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/CsvTokenizer.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import org.embulk.config.ConfigException;
 import org.embulk.parser.csv.CsvParserPlugin.QuotesInQuotedFields;
-import org.embulk.spi.DataException;
 import org.embulk.util.text.LineDecoder;
 
 public class CsvTokenizer {
@@ -62,35 +61,6 @@ public CsvTokenizer(final LineDecoder input, final CsvParserPlugin.PluginTask ta
         this.wasQuotedColumn = false;
     }
 
-    public static class InvalidFormatException extends DataException {
-        public InvalidFormatException(final String message) {
-            super(message);
-        }
-    }
-
-    public static class InvalidValueException extends DataException {
-        public InvalidValueException(final String message) {
-            super(message);
-        }
-    }
-
-    public static class QuotedSizeLimitExceededException extends InvalidValueException {
-        public QuotedSizeLimitExceededException(final String message) {
-            super(message);
-        }
-    }
-
-    public class TooManyColumnsException extends InvalidFormatException {
-        public TooManyColumnsException(final String message) {
-            super(message);
-        }
-    }
-
-    public class TooFewColumnsException extends InvalidFormatException {
-        public TooFewColumnsException(final String message) {
-            super(message);
-        }
-    }
 
     public long getCurrentLineNumber() {
         return this.lineNumber;
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/InvalidFormatException.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/InvalidFormatException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 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;
+
+import org.embulk.spi.DataException;
+
+public class InvalidFormatException extends DataException {
+    public InvalidFormatException(final String message) {
+        super(message);
+    }
+}
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/InvalidValueException.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/InvalidValueException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 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;
+
+import org.embulk.spi.DataException;
+
+public class InvalidValueException extends DataException {
+    public InvalidValueException(final String message) {
+        super(message);
+    }
+}
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/QuotedSizeLimitExceededException.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/QuotedSizeLimitExceededException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 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 QuotedSizeLimitExceededException extends InvalidValueException {
+    public QuotedSizeLimitExceededException(final String message) {
+        super(message);
+    }
+}
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/TooFewColumnsException.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/TooFewColumnsException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 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 TooFewColumnsException extends InvalidFormatException {
+    public TooFewColumnsException(final String message) {
+        super(message);
+    }
+}
diff --git a/embulk-parser-csv/src/main/java/org/embulk/parser/csv/TooManyColumnsException.java b/embulk-parser-csv/src/main/java/org/embulk/parser/csv/TooManyColumnsException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 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 TooManyColumnsException extends InvalidFormatException {
+    public TooManyColumnsException(final String message) {
+        super(message);
+    }
+}
diff --git a/embulk-parser-csv/src/test/java/org/embulk/parser/csv/TestCsvTokenizer.java b/embulk-parser-csv/src/test/java/org/embulk/parser/csv/TestCsvTokenizer.java
@@ -321,7 +321,7 @@ public void throwWithDefaultQuotesInQuotedFields() throws Exception {
             parse(task, "\"foo\"bar\",\"hoge\"fuga\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof CsvTokenizer.InvalidValueException);
+            assertTrue(e instanceof InvalidValueException);
             assertEquals("Unexpected extra character 'b' after a value quoted by '\"'", e.getMessage());
             return;
         }
@@ -336,7 +336,7 @@ public void throwWithQuotesInQuotedFields_ACCEPT_ONLY_RFC4180_ESCAPED() throws E
             parse(task, "\"foo\"bar\",\"hoge\"fuga\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof CsvTokenizer.InvalidValueException);
+            assertTrue(e instanceof InvalidValueException);
             assertEquals("Unexpected extra character 'b' after a value quoted by '\"'", e.getMessage());
             return;
         }
@@ -370,7 +370,7 @@ public void throwQuotedSizeLimitExceededException() throws Exception {
                     "v3,\"0123456789\"");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof CsvTokenizer.QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedSizeLimitExceededException);
         }
 
         // multi-line
@@ -380,7 +380,7 @@ public void throwQuotedSizeLimitExceededException() throws Exception {
                     "\"012345\n6789\",v3");
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof CsvTokenizer.QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedSizeLimitExceededException);
         }
     }
 
@@ -412,7 +412,7 @@ public void recoverFromQuotedSizeLimitExceededException() throws Exception {
             tokenizer.nextColumn();
             fail();
         } catch (Exception e) {
-            assertTrue(e instanceof CsvTokenizer.QuotedSizeLimitExceededException);
+            assertTrue(e instanceof QuotedSizeLimitExceededException);
         }
         assertEquals("v3,\"0123", tokenizer.skipCurrentLine());
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`import org.embulk.config.ConfigSource;`
`32`	`32`	`import org.embulk.parser.csv.CsvParserPlugin;`
`33`	`33`	`import org.embulk.parser.csv.CsvTokenizer;`
	`34`	`+import org.embulk.parser.csv.InvalidValueException;`
	`35`	`+import org.embulk.parser.csv.TooFewColumnsException;`
`34`	`36`	`import org.embulk.spi.Buffer;`
`35`	`37`	`import org.embulk.spi.BufferAllocator;`
`36`	`38`	`import org.embulk.spi.Exec;`
`@@ -324,12 +326,12 @@ private static List<List<String>> splitLines(`
`324`	`326`	`} else {`
`325`	`327`	`columns.add(column);`
`326`	`328`	`}`
`327`		`- } catch (final CsvTokenizer.TooFewColumnsException ex) {`
	`329`	`+ } catch (final TooFewColumnsException ex) {`
`328`	`330`	`rows.add(Collections.unmodifiableList(columns));`
`329`	`331`	`break;`
`330`	`332`	`}`
`331`	`333`	`}`
`332`		`- } catch (final CsvTokenizer.InvalidValueException ex) {`
	`334`	`+ } catch (final InvalidValueException ex) {`
`333`	`335`	`// TODO warning`
`334`	`336`	`tokenizer.skipCurrentLine();`
`335`	`337`	`}`