embulk-output-jdbc 0.4.1 → 0.4.2

data/src/main/java/org/embulk/output/jdbc/ToString.java

@@ -1,54 +1,54 @@
-package org.embulk.output.jdbc;
-
-import com.google.common.base.Optional;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-public class ToString
-{
-    private final String string;
-
-    public ToString(String string)
-    {
-        this.string = string;
-    }
-
-    @JsonCreator
-    ToString(Optional<JsonNode> option) throws JsonMappingException
-    {
-        JsonNode node = option.or(NullNode.getInstance());
-        if (node.isTextual()) {
-            this.string = node.textValue();
-        } else if (node.isValueNode()) {
-            this.string = node.toString();
-        } else {
-            throw new JsonMappingException(String.format("Arrays and objects are invalid: '%s'", node));
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof ToString)) {
-            return false;
-        }
-        ToString o = (ToString) obj;
-        return string.equals(o.string);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return string.hashCode();
-    }
-
-    @JsonValue
-    @Override
-    public String toString()
-    {
-        return string;
-    }
-}
+package org.embulk.output.jdbc;
+
+import com.google.common.base.Optional;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class ToString
+{
+    private final String string;
+
+    public ToString(String string)
+    {
+        this.string = string;
+    }
+
+    @JsonCreator
+    ToString(Optional<JsonNode> option) throws JsonMappingException
+    {
+        JsonNode node = option.or(NullNode.getInstance());
+        if (node.isTextual()) {
+            this.string = node.textValue();
+        } else if (node.isValueNode()) {
+            this.string = node.toString();
+        } else {
+            throw new JsonMappingException(String.format("Arrays and objects are invalid: '%s'", node));
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (!(obj instanceof ToString)) {
+            return false;
+        }
+        ToString o = (ToString) obj;
+        return string.equals(o.string);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return string.hashCode();
+    }
+
+    @JsonValue
+    @Override
+    public String toString()
+    {
+        return string;
+    }
+}

data/src/main/java/org/embulk/output/jdbc/ToStringMap.java

@@ -1,35 +1,34 @@
-package org.embulk.output.jdbc;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import com.google.common.base.Function;
-import com.google.common.collect.Maps;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-public class ToStringMap
-        extends HashMap<String, String>
-{
-    @JsonCreator
-    ToStringMap(Map<String, ToString> map)
-    {
-        super(Maps.transformValues(map, new Function<ToString, String>() {
-            public String apply(ToString value)
-            {
-                if (value == null) {
-                    return "null";
-                } else {
-                    return value.toString();
-                }
-            }
-        }));
-    }
-
-    public Properties toProperties()
-    {
-        Properties props = new Properties();
-        props.putAll(this);
-        return props;
-    }
-}
+package org.embulk.output.jdbc;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+public class ToStringMap
+        extends HashMap<String, String>
+{
+    @JsonCreator
+    ToStringMap(Map<String, ToString> map)
+    {
+        super(Maps.transformValues(map, new Function<ToString, String>() {
+            public String apply(ToString value)
+            {
+                if (value == null) {
+                    return "null";
+                } else {
+                    return value.toString();
+                }
+            }
+        }));
+    }
+
+    public Properties toProperties()
+    {
+        Properties props = new Properties();
+        props.putAll(this);
+        return props;
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/BigDecimalColumnSetter.java

@@ -1,70 +1,68 @@
-package org.embulk.output.jdbc.setter;
-
-import java.math.BigDecimal;
-import java.io.IOException;
-import java.sql.SQLException;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.BatchInsert;
-
-public class BigDecimalColumnSetter
-        extends ColumnSetter
-{
-    private static final BigDecimal ZERO = BigDecimal.valueOf(0L);
-    private static final BigDecimal ONE = BigDecimal.valueOf(1L);
-
-    public BigDecimalColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
-    {
-        super(batch, column, defaultValue);
-    }
-
-    @Override
-    public void nullValue() throws IOException, SQLException
-    {
-        defaultValue.setBigDecimal();
-    }
-
-    @Override
-    public void booleanValue(boolean v) throws IOException, SQLException
-    {
-        batch.setBigDecimal(v ? ONE : ZERO);
-    }
-
-    @Override
-    public void longValue(long v) throws IOException, SQLException
-    {
-        batch.setBigDecimal(BigDecimal.valueOf(v));
-    }
-
-    @Override
-    public void doubleValue(double v) throws IOException, SQLException
-    {
-        if (Double.isNaN(v) || Double.isInfinite(v)) {
-            defaultValue.setBigDecimal();
-        } else {
-            batch.setBigDecimal(BigDecimal.valueOf(v));
-        }
-    }
-
-    @Override
-    public void stringValue(String v) throws IOException, SQLException
-    {
-        BigDecimal dv;
-        try {
-            dv = new BigDecimal(v);
-        } catch (NumberFormatException ex) {
-            defaultValue.setBigDecimal();
-            return;
-        }
-        batch.setBigDecimal(dv);
-    }
-
-    @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        defaultValue.setBigDecimal();
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.math.BigDecimal;
+import java.io.IOException;
+import java.sql.SQLException;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class BigDecimalColumnSetter
+        extends ColumnSetter
+{
+    private static final BigDecimal ZERO = BigDecimal.valueOf(0L);
+    private static final BigDecimal ONE = BigDecimal.valueOf(1L);
+
+    public BigDecimalColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setBigDecimal();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setBigDecimal(v ? ONE : ZERO);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        batch.setBigDecimal(BigDecimal.valueOf(v));
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        if (Double.isNaN(v) || Double.isInfinite(v)) {
+            defaultValue.setBigDecimal();
+        } else {
+            batch.setBigDecimal(BigDecimal.valueOf(v));
+        }
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        BigDecimal dv;
+        try {
+            dv = new BigDecimal(v);
+        } catch (NumberFormatException ex) {
+            defaultValue.setBigDecimal();
+            return;
+        }
+        batch.setBigDecimal(dv);
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setBigDecimal();
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/BooleanColumnSetter.java

@@ -1,54 +1,53 @@
-package org.embulk.output.jdbc.setter;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import com.google.common.collect.ImmutableSet;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.BatchInsert;
-
-public class BooleanColumnSetter
-        extends ColumnSetter
-{
-    public BooleanColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
-    {
-        super(batch, column, defaultValue);
-    }
-
-    @Override
-    public void nullValue() throws IOException, SQLException
-    {
-        defaultValue.setBoolean();
-    }
-
-    @Override
-    public void booleanValue(boolean v) throws IOException, SQLException
-    {
-        batch.setBoolean(v);
-    }
-
-    @Override
-    public void longValue(long v) throws IOException, SQLException
-    {
-        batch.setBoolean(v > 0);
-    }
-
-    @Override
-    public void doubleValue(double v) throws IOException, SQLException
-    {
-        batch.setBoolean(v > 0.0);
-    }
-
-    @Override
-    public void stringValue(String v) throws IOException, SQLException
-    {
-        defaultValue.setBoolean();
-    }
-
-    @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        defaultValue.setBoolean();
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class BooleanColumnSetter
+        extends ColumnSetter
+{
+    public BooleanColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setBoolean(v);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0);
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0.0);
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/ByteColumnSetter.java

@@ -1,76 +1,75 @@
-package org.embulk.output.jdbc.setter;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.math.RoundingMode;
-import com.google.common.math.DoubleMath;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.BatchInsert;
-
-public class ByteColumnSetter
-        extends ColumnSetter
-{
-    public ByteColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
-    {
-        super(batch, column, defaultValue);
-    }
-
-    @Override
-    public void nullValue() throws IOException, SQLException
-    {
-        defaultValue.setByte();
-    }
-
-    @Override
-    public void booleanValue(boolean v) throws IOException, SQLException
-    {
-        batch.setByte(v ? (byte) 1 : (byte) 0);
-    }
-
-    @Override
-    public void longValue(long v) throws IOException, SQLException
-    {
-        if (v > Byte.MAX_VALUE || v < Byte.MIN_VALUE) {
-            defaultValue.setByte();
-        } else {
-            batch.setByte((byte) v);
-        }
-    }
-
-    @Override
-    public void doubleValue(double v) throws IOException, SQLException
-    {
-        long lv;
-        try {
-            // TODO configurable rounding mode
-            lv = DoubleMath.roundToLong(v, RoundingMode.HALF_UP);
-        } catch (ArithmeticException ex) {
-            // NaN / Infinite / -Infinite
-            defaultValue.setByte();
-            return;
-        }
-        longValue(lv);
-    }
-
-    @Override
-    public void stringValue(String v) throws IOException, SQLException
-    {
-        byte sv;
-        try {
-            sv = Byte.parseByte(v);
-        } catch (NumberFormatException e) {
-            defaultValue.setByte();
-            return;
-        }
-        batch.setByte(sv);
-    }
-
-    @Override
-    public void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        defaultValue.setByte();
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.math.RoundingMode;
+import com.google.common.math.DoubleMath;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class ByteColumnSetter
+        extends ColumnSetter
+{
+    public ByteColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setByte();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setByte(v ? (byte) 1 : (byte) 0);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        if (v > Byte.MAX_VALUE || v < Byte.MIN_VALUE) {
+            defaultValue.setByte();
+        } else {
+            batch.setByte((byte) v);
+        }
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        long lv;
+        try {
+            // TODO configurable rounding mode
+            lv = DoubleMath.roundToLong(v, RoundingMode.HALF_UP);
+        } catch (ArithmeticException ex) {
+            // NaN / Infinite / -Infinite
+            defaultValue.setByte();
+            return;
+        }
+        longValue(lv);
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        byte sv;
+        try {
+            sv = Byte.parseByte(v);
+        } catch (NumberFormatException e) {
+            defaultValue.setByte();
+            return;
+        }
+        batch.setByte(sv);
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setByte();
+    }
+}