Merge pull request #30 from embulk/use-util-csv-CsvTokenizer

Replace CsvTokenizer with embulk-util-csv:0.2.1

Author: dmikurube

embulk-guess-csv/build.gradle

@@ -37,6 +37,7 @@ dependencies {
 
     implementation project(":embulk-parser-csv")
     implementation "com.ibm.icu:icu4j:54.1.1"
+    implementation "org.embulk:embulk-util-csv:0.2.1"
     implementation "org.embulk:embulk-util-guess:0.2.0"
 
     testImplementation "junit:junit:4.13.2"

embulk-guess-csv/gradle.lockfile

@@ -10,6 +10,7 @@ javax.validation:validation-api:1.1.0.Final=runtimeClasspath
 org.embulk:embulk-api:0.10.33=compileClasspath
 org.embulk:embulk-spi:0.10.33=compileClasspath
 org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
+org.embulk:embulk-util-csv:0.2.1=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-guess:0.2.0=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-json:0.1.1=runtimeClasspath

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

@@ -30,14 +30,14 @@
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.parser.csv.CsvParserPlugin;
-import org.embulk.parser.csv.CsvTokenizer;
-import org.embulk.parser.csv.InvalidCsvQuotationException;
-import org.embulk.parser.csv.RecordDoesNotHaveExpectedColumnException;
 import org.embulk.spi.Buffer;
 import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.Exec;
 import org.embulk.spi.GuessPlugin;
 import org.embulk.util.config.ConfigMapperFactory;
+import org.embulk.util.csv.CsvTokenizer;
+import org.embulk.util.csv.InvalidCsvQuotationException;
+import org.embulk.util.csv.RecordDoesNotHaveExpectedColumnException;
 import org.embulk.util.file.ListFileInput;
 import org.embulk.util.guess.CharsetGuess;
 import org.embulk.util.guess.GuesstimatedType;

embulk-guess-csv_all_strings/gradle.lockfile

@@ -10,6 +10,7 @@ javax.validation:validation-api:1.1.0.Final=runtimeClasspath
 org.embulk:embulk-api:0.10.33=compileClasspath
 org.embulk:embulk-spi:0.10.33=compileClasspath
 org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
+org.embulk:embulk-util-csv:0.2.1=runtimeClasspath
 org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-guess:0.2.0=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-json:0.1.1=runtimeClasspath

embulk-parser-csv/build.gradle

@@ -38,6 +38,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations:2.6.7"
     implementation "com.fasterxml.jackson.core:jackson-core:2.6.7"
     implementation "com.fasterxml.jackson.core:jackson-databind:2.6.7"
+    implementation "org.embulk:embulk-util-csv:0.2.1"
     implementation "org.embulk:embulk-util-config:0.3.1"
     implementation "org.embulk:embulk-util-file:0.1.3"
     implementation "org.embulk:embulk-util-json:0.1.1"

embulk-parser-csv/gradle.lockfile

@@ -9,6 +9,7 @@ javax.validation:validation-api:1.1.0.Final=runtimeClasspath
 org.embulk:embulk-api:0.10.33=compileClasspath
 org.embulk:embulk-spi:0.10.33=compileClasspath
 org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
+org.embulk:embulk-util-csv:0.2.1=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath
 org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath

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

@@ -48,6 +48,9 @@
 import org.embulk.util.config.Task;
 import org.embulk.util.config.units.ColumnConfig;
 import org.embulk.util.config.units.SchemaConfig;
+import org.embulk.util.csv.CsvTokenizer;
+import org.embulk.util.csv.InvalidCsvFormatException;
+import org.embulk.util.csv.RecordHasUnexpectedTrailingColumnException;
 import org.embulk.util.json.JsonParseException;
 import org.embulk.util.json.JsonParser;
 import org.embulk.util.text.LineDecoder;