Replace Embulk's TimestampFormatter to embulk-util-timestamp's

Author: Dai MIKURUBE

build.gradle

@@ -41,6 +41,7 @@ subprojects {
 
     dependencies {
         compileOnly "org.embulk:embulk-core:0.9.23"
+        compile "org.embulk:embulk-util-timestamp:0.2.0"
 
         testCompile "org.embulk:embulk-core:0.9.23"
         testCompile "org.embulk:embulk-test:0.9.23"

embulk-output-db2/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,3 +1,5 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0

embulk-output-jdbc/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,3 +1,5 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/ColumnSetterFactory.java

@@ -8,11 +8,11 @@
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.spi.Exec;
-import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.JdbcColumnOption;
 import org.embulk.config.ConfigException;
+import org.embulk.util.timestamp.TimestampFormatter;
 
 public class ColumnSetterFactory
 {
@@ -77,28 +77,11 @@ public ColumnSetter newColumnSetter(JdbcColumn column, JdbcColumnOption option)
         }
     }
 
-    private static interface FormatterIntlTask extends Task, TimestampFormatter.Task {}
-    private static interface FormatterIntlColumnOption extends Task, TimestampFormatter.TimestampColumnOption {}
-
     protected TimestampFormatter newTimestampFormatter(JdbcColumnOption option)
     {
-        // TODO: Switch to a newer TimestampFormatter constructor after a reasonable interval.
-        // Traditional constructor is used here for compatibility.
-        final ConfigSource configSource = Exec.newConfigSource();
-        configSource.set("format", option.getTimestampFormat().getFormat());
-        configSource.set("timezone", getTimeZone(option));
-
-        final FormatterIntlTask task = Exec.newConfigSource().loadConfig(FormatterIntlTask.class);
-        final Optional<? extends TimestampFormatter.TimestampColumnOption> columnOption =
-                Optional.ofNullable(configSource.loadConfig(FormatterIntlColumnOption.class));
-
-        return TimestampFormatter.of(
-                columnOption.isPresent()
-                        ? columnOption.get().getFormat().or(task.getDefaultTimestampFormat())
-                        : task.getDefaultTimestampFormat(),
-                columnOption.isPresent()
-                        ? columnOption.get().getTimeZoneId().or(task.getDefaultTimeZoneId())
-                        : task.getDefaultTimeZoneId());
+        final String format = option.getTimestampFormat().getFormat();
+        final String timezone = option.getTimeZone().orElse(this.defaultTimeZone);
+        return TimestampFormatter.builder(format, true).setDefaultZoneFromString(timezone).build();
     }
 
     protected Calendar newCalendar(JdbcColumnOption option)

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/NStringColumnSetter.java

@@ -4,9 +4,9 @@
 import java.sql.SQLException;
 
 import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.util.timestamp.TimestampFormatter;
 import org.msgpack.value.Value;
 
 public class NStringColumnSetter
@@ -55,7 +55,7 @@ public void stringValue(String v) throws IOException, SQLException
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        batch.setNString(timestampFormatter.format(v));
+        batch.setNString(timestampFormatter.format(v.getInstant()));
     }
 
     @Override

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java

@@ -4,9 +4,9 @@
 import java.sql.SQLException;
 
 import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.util.timestamp.TimestampFormatter;
 import org.msgpack.value.Value;
 
 public class StringColumnSetter
@@ -55,7 +55,7 @@ public void stringValue(String v) throws IOException, SQLException
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        batch.setString(timestampFormatter.format(v));
+        batch.setString(timestampFormatter.format(v.getInstant()));
     }
 
     @Override

embulk-output-mysql/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,3 +1,5 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0

embulk-output-oracle/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,3 +1,5 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0

embulk-output-postgresql/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -1,3 +1,5 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0

embulk-output-redshift/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -12,6 +12,8 @@ commons-logging:commons-logging:1.2
 org.apache.httpcomponents:httpclient:4.5.5
 org.apache.httpcomponents:httpcore:4.4.9
 org.embulk.input.s3:embulk-util-aws-credentials:0.3.5
+org.embulk:embulk-util-rubytime:0.3.0
+org.embulk:embulk-util-timestamp:0.2.0
 org.postgresql:postgresql:9.4-1205-jdbc41
 org.slf4j:jcl-over-slf4j:1.7.12
 software.amazon.ion:ion-java:1.0.2