Replace org.embulk.spi.time.Timestamp to java.time.Instant

embulk · Aug 19, 2020 · 7ea8fc6 · 7ea8fc6
1 parent 59b4a05
commit 7ea8fc6
Show file tree

Hide file tree

Showing 27 changed files with 68 additions and 74 deletions.
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/BatchInsert.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/BatchInsert.java
@@ -4,7 +4,7 @@
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
-import org.embulk.spi.time.Timestamp;
+import java.time.Instant;
 
 public interface BatchInsert
 {
@@ -47,9 +47,9 @@ public interface BatchInsert
 
     public void setBytes(byte[] v) throws IOException, SQLException;
 
-    public void setSqlDate(Timestamp v, Calendar cal) throws IOException, SQLException;
+    public void setSqlDate(Instant v, Calendar cal) throws IOException, SQLException;
 
-    public void setSqlTime(Timestamp v, Calendar cal) throws IOException, SQLException;
+    public void setSqlTime(Instant v, Calendar cal) throws IOException, SQLException;
 
-    public void setSqlTimestamp(Timestamp v, Calendar cal) throws IOException, SQLException;
+    public void setSqlTimestamp(Instant v, Calendar cal) throws IOException, SQLException;
 }
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/MemoryRecord.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/MemoryRecord.java
@@ -1,10 +1,9 @@
 package org.embulk.output.jdbc;
 
+import java.time.Instant;
 import org.embulk.spi.Column;
-import org.embulk.spi.time.Timestamp;
 import org.msgpack.value.Value;
 
-
 public class MemoryRecord implements Record
 {
     private final Object[] values;
@@ -40,9 +39,9 @@ public String getString(Column column)
         return (String)getValue(column);
     }
 
-    public Timestamp getTimestamp(Column column)
+    public Instant getTimestamp(Column column)
     {
-        return (Timestamp)getValue(column);
+        return ((org.embulk.spi.time.Timestamp) getValue(column)).getInstant();
     }
 
     public Value getJson(Column column)
@@ -60,4 +59,3 @@ public void setValue(Column column, Object value)
         values[column.getIndex()] = value;
     }
 }
-
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/PageReaderRecord.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/PageReaderRecord.java
@@ -1,15 +1,14 @@
 package org.embulk.output.jdbc;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.embulk.spi.Column;
 import org.embulk.spi.Page;
 import org.embulk.spi.PageReader;
-import org.embulk.spi.time.Timestamp;
 import org.msgpack.value.Value;
 
-
 /**
  * Record read by PageReader.
  * The class will save read records for retry.
@@ -62,9 +61,9 @@ public String getString(Column column)
         return save(column, pageReader.getString(column));
     }
 
-    public Timestamp getTimestamp(Column column)
+    public Instant getTimestamp(Column column)
     {
-        return save(column, pageReader.getTimestamp(column));
+        return save(column, pageReader.getTimestamp(column).getInstant());
     }
 
     public Value getJson(Column column)
@@ -93,4 +92,3 @@ private <T> T save(Column column, T value)
         return value;
     }
 }
-
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/Record.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/Record.java
@@ -1,7 +1,7 @@
 package org.embulk.output.jdbc;
 
+import java.time.Instant;
 import org.embulk.spi.Column;
-import org.embulk.spi.time.Timestamp;
 import org.msgpack.value.Value;
 
 public interface Record
@@ -16,8 +16,7 @@ public interface Record
 
     String getString(Column column);
 
-    Timestamp getTimestamp(Column column);
+    Instant getTimestamp(Column column);
 
     Value getJson(Column column);
 }
-
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/StandardBatchInsert.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/StandardBatchInsert.java
@@ -8,10 +8,10 @@
 import java.sql.SQLException;
 import java.sql.Date;
 import java.sql.Time;
+import java.time.Instant;
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.embulk.spi.time.Timestamp;
 
 public class StandardBatchInsert
         implements BatchInsert
@@ -184,7 +184,7 @@ public void setBytes(byte[] v) throws IOException, SQLException
         nextColumn(v.length + 4);
     }
 
-    public void setSqlDate(Timestamp v, Calendar cal) throws IOException, SQLException
+    public void setSqlDate(final Instant v, final Calendar cal) throws IOException, SQLException
     {
         // JavaDoc of java.sql.Time says:
         // >> To conform with the definition of SQL DATE, the millisecond values wrapped by a java.sql.Date instance must be 'normalized' by setting the hours, minutes, seconds, and milliseconds to zero in the particular time zone with which the instance is associated.
@@ -197,14 +197,14 @@ public void setSqlDate(Timestamp v, Calendar cal) throws IOException, SQLExcepti
         nextColumn(32);
     }
 
-    public void setSqlTime(Timestamp v, Calendar cal) throws IOException, SQLException
+    public void setSqlTime(final Instant v, final Calendar cal) throws IOException, SQLException
     {
         Time t = new Time(v.toEpochMilli());
         batch.setTime(index, t, cal);
         nextColumn(32);
     }
 
-    public void setSqlTimestamp(Timestamp v, Calendar cal) throws IOException, SQLException
+    public void setSqlTimestamp(final Instant v, final Calendar cal) throws IOException, SQLException
     {
         java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
         t.setNanos(v.getNano());

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/BigDecimalColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/BigDecimalColumnSetter.java
@@ -3,8 +3,8 @@
 import java.math.BigDecimal;
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -63,7 +63,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setBigDecimal();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/BooleanColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/BooleanColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -48,7 +48,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setBoolean();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/ByteColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/ByteColumnSetter.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+import java.time.Instant;
 
 import com.google.common.math.DoubleMath;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -71,7 +71,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setByte();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/ColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/ColumnSetter.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.spi.time.Timestamp;
 import org.msgpack.value.Value;
 
 public abstract class ColumnSetter
@@ -42,7 +42,7 @@ public int getSqlType()
 
     public abstract void stringValue(String v) throws IOException, SQLException;
 
-    public abstract void timestampValue(Timestamp v) throws IOException, SQLException;
+    public abstract void timestampValue(final Instant v) throws IOException, SQLException;
 
     public abstract void jsonValue(Value v) throws IOException, SQLException;
 }
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/DoubleColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/DoubleColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -55,7 +55,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setDouble();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/FloatColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/FloatColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -55,7 +55,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setFloat();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/IntColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/IntColumnSetter.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+import java.time.Instant;
 
 import com.google.common.math.DoubleMath;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -71,7 +71,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setInt();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/JsonColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/JsonColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -48,7 +48,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setJson();
     }
@@ -58,4 +58,3 @@ public void jsonValue(Value v) throws IOException, SQLException {
         batch.setString(v.toJson());
     }
 }
-
diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/LongColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/LongColumnSetter.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+import java.time.Instant;
 
 import com.google.common.math.DoubleMath;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -67,7 +67,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setLong();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/NStringColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/NStringColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.util.timestamp.TimestampFormatter;
@@ -53,9 +53,9 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
-        batch.setNString(timestampFormatter.format(v.getInstant()));
+        batch.setNString(timestampFormatter.format(v));
     }
 
     @Override

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/NullColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/NullColumnSetter.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -42,7 +42,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         defaultValue.setNull();
     }

diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/PassThroughColumnSetter.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/setter/PassThroughColumnSetter.java
@@ -3,8 +3,8 @@
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Instant;
 
-import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 import org.msgpack.value.Value;
@@ -53,7 +53,7 @@ public void stringValue(String v) throws IOException, SQLException
     }
 
     @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
+    public void timestampValue(final Instant v) throws IOException, SQLException
     {
         batch.setSqlTimestamp(v, calendar);
     }