Replace Joda-Time DateTimeZone to Java 8 java.time classes

Author: Dai MIKURUBE

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java

@@ -28,7 +28,6 @@
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.joda.time.DateTimeZone;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -105,7 +104,7 @@ public interface PluginTask
 
         @Config("default_timezone")
         @ConfigDefault("\"UTC\"")
-        public DateTimeZone getDefaultTimeZone();
+        public String getDefaultTimeZone();
 
         @Config("retry_limit")
         @ConfigDefault("12")
@@ -633,7 +632,7 @@ public JdbcSchema get()
         }
     }
 
-    protected ColumnSetterFactory newColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    protected ColumnSetterFactory newColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         return new ColumnSetterFactory(batch, defaultTimeZone);
     }

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcColumnOption.java

@@ -1,7 +1,6 @@
 package org.embulk.output.jdbc;
 
 import java.util.Optional;
-import org.joda.time.DateTimeZone;
 import org.embulk.config.Task;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -25,5 +24,5 @@ public interface JdbcColumnOption
 
     @Config("timezone")
     @ConfigDefault("null")
-    public Optional<DateTimeZone> getTimeZone();
+    public Optional<String> getTimeZone();
 }

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

@@ -2,9 +2,9 @@
 
 import java.util.Calendar;
 import java.util.Locale;
+import java.util.TimeZone;
 import java.util.Optional;
 import java.sql.Types;
-import org.joda.time.DateTimeZone;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.spi.Exec;
@@ -17,9 +17,9 @@
 public class ColumnSetterFactory
 {
     protected final BatchInsert batch;
-    protected final DateTimeZone defaultTimeZone;
+    protected final String defaultTimeZone;
 
-    public ColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    public ColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         this.batch = batch;
         this.defaultTimeZone = defaultTimeZone;
@@ -103,10 +103,10 @@ protected TimestampFormatter newTimestampFormatter(JdbcColumnOption option)
 
     protected Calendar newCalendar(JdbcColumnOption option)
     {
-        return Calendar.getInstance(getTimeZone(option).toTimeZone(), Locale.ENGLISH);
+        return Calendar.getInstance(TimeZone.getTimeZone(getTimeZone(option)), Locale.ENGLISH);
     }
 
-    protected DateTimeZone getTimeZone(JdbcColumnOption option)
+    protected String getTimeZone(JdbcColumnOption option)
     {
         return option.getTimeZone().orElse(defaultTimeZone);
     }

embulk-output-postgresql/src/main/java/org/embulk/output/PostgreSQLOutputPlugin.java

@@ -16,7 +16,6 @@
 import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
 import org.embulk.spi.Schema;
-import org.joda.time.DateTimeZone;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -192,7 +191,7 @@ public void timestampColumn(Column column)
     }
 
     @Override
-    protected ColumnSetterFactory newColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    protected ColumnSetterFactory newColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         return new PostgreSQLColumnSetterFactory(batch, defaultTimeZone);
     }

embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/setter/PostgreSQLColumnSetterFactory.java

@@ -6,12 +6,11 @@
 import org.embulk.output.jdbc.setter.ColumnSetter;
 import org.embulk.output.jdbc.setter.ColumnSetterFactory;
 import org.embulk.output.jdbc.setter.JsonColumnSetter;
-import org.joda.time.DateTimeZone;
 
 public class PostgreSQLColumnSetterFactory
         extends ColumnSetterFactory
 {
-    public PostgreSQLColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    public PostgreSQLColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         super(batch, defaultTimeZone);
     }

embulk-output-sqlserver/src/main/java/org/embulk/output/SQLServerOutputPlugin.java

@@ -17,7 +17,6 @@
 import org.embulk.output.sqlserver.NativeBatchInsert;
 import org.embulk.output.sqlserver.SQLServerOutputConnector;
 import org.embulk.output.sqlserver.setter.SQLServerColumnSetterFactory;
-import org.joda.time.DateTimeZone;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -300,7 +299,7 @@ protected BatchInsert newBatchInsert(PluginTask task, Optional<MergeConfig> merg
     }
 
     @Override
-    protected ColumnSetterFactory newColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    protected ColumnSetterFactory newColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         return new SQLServerColumnSetterFactory(batch, defaultTimeZone);
     }

embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/setter/SQLServerColumnSetterFactory.java

@@ -8,12 +8,11 @@
 import org.embulk.output.jdbc.setter.ColumnSetter;
 import org.embulk.output.jdbc.setter.ColumnSetterFactory;
 import org.embulk.output.jdbc.setter.StringColumnSetter;
-import org.joda.time.DateTimeZone;
 
 public class SQLServerColumnSetterFactory
         extends ColumnSetterFactory
 {
-    public SQLServerColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    public SQLServerColumnSetterFactory(final BatchInsert batch, final String defaultTimeZone)
     {
         super(batch, defaultTimeZone);
     }