embulk-filter-column 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c666e71247649e05789afed9c460ac1699a459cb
-  data.tar.gz: ab41a4b1b49b5b46f1c50630f460cdf6be4fb1cc
+  metadata.gz: 572e638f806833f390196e60aa5791c0f23aff76
+  data.tar.gz: db719c3a30d31e86bea2f75afaa09849c92ec631
 SHA512:
-  metadata.gz: 4d56b7c8a9cb017c337b2b84649db0184629a176b259d5fec0f0db72ba7eaa5d24284a6146e30c4612a849b137e673c040b1e42769c63da4a951aed09252b749
-  data.tar.gz: 6a4e0c0db4a8462c9ff9612afa2fd51e6a2eab528b2318401b1d4ff15cc459c38bb94dbca501fbbe82002dca9feb74ea1b6bbd71259021a45fb7654f2b707aae
+  metadata.gz: 6a4c06e967fc14763e386326166ae4b0ae9247fca8a158dc41e25a9bb430e26430d70fb2603abd29fedfb54f822a2fac152078628f62eb3fe816bb31a7882d45
+  data.tar.gz: edb08b9d1b7fc6e53a41d86ab82a61a7f848737bf37f6baa0ec6048c5475c5040db4f165fb5306a21f4fef6e69b7afdce4f78855381c1c5b48e5aaec4fa3b303

data/.gitignore

@@ -9,3 +9,4 @@ build/
 *.csv
 .tags
 .ruby-version
+*.iml

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.4.0 (2016-02-01)
+
+Enhancements:
+
+* Support JSON type (thanks to joker1007)
+
+Changes:
+
+* Requires embulk >= 0.8.1
+
 # 0.3.1 (2015-11-09)
 
 Enhancements:

data/README.md

@@ -128,6 +128,12 @@ Run test:
 $ ./gradlew test
 ```
 
+Run checkstyle:
+
+```
+$ ./gradlew check
+```
+
 Release gem:
 
 ```

data/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "com.jfrog.bintray" version "1.1"
     id "com.github.jruby-gradle.base" version "0.1.5"
     id "java"
+    id "checkstyle"
 }
 import com.github.jrubygradle.JRubyExec
 repositories {
@@ -12,17 +13,21 @@ configurations {
     provided
 }
 
-version = "0.3.1"
+version = "0.4.0"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.7.0"
-    provided "org.embulk:embulk-core:0.7.0"
+    compile  "org.embulk:embulk-core:0.8.2"
+    provided "org.embulk:embulk-core:0.8.2"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
 }
 
+checkstyle {
+    toolVersion = '6.7'
+}
+
 task classpath(type: Copy, dependsOn: ["jar"]) {
     doFirst { file("classpath").deleteDir() }
     from (configurations.runtime - configurations.provided + files(jar.archivePath))

data/config/checkstyle/checkstyle.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="FileTabCharacter"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\r"/>
+        <property name="message" value="Line contains carriage return"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value=" \n"/>
+        <property name="message" value="Line has trailing whitespace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\{\n\n"/>
+        <property name="message" value="Blank line after opening brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\s*\}"/>
+        <property name="message" value="Blank line before closing brace"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\n"/>
+        <property name="message" value="Multiple consecutive blank lines"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="\n\n\Z"/>
+        <property name="message" value="Blank line before end of file"/>
+    </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="Preconditions\.checkNotNull"/>
+        <property name="message" value="Use of checkNotNull"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+            <property name="tokens" value="
+                LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
+                LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
+        </module>
+        <module name="EmptyStatement"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="allowLineBreaks" value="true"/>
+            <property name="option" value="nospace"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly">
+            <property name="option" value="nl"/>
+            <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="option" value="eol"/>
+            <property name="tokens" value="
+                 LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
+                 LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="WhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+
+        <module name="UpperEll"/>
+        <module name="DefaultComesLast"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ModifierOrder"/>
+        <module name="OneStatementPerLine"/>
+        <module name="StringLiteralEquality"/>
+        <module name="MutableException"/>
+        <module name="EqualsHashCode"/>
+        <module name="InnerAssignment"/>
+        <module name="InterfaceIsType"/>
+        <module name="HideUtilityClassConstructor"/>
+
+        <module name="MemberName"/>
+        <module name="LocalVariableName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="TypeName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z][0-9]?$"/>
+        </module>
+
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="*,javax,java"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="tokens" value="
+                ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
+                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
+                LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+                LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
+                LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
+                PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
+                STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
+        </module>
+    </module>
+</module>

data/example/add_columns.yml

@@ -13,6 +13,7 @@ in:
       - {name: id, type: long}
       - {name: name, type: string}
       - {name: score, type: double}
+      - {name: json, type: json}
 filters:
   - type: column
     default_timezone: "Asia/Tokyo"

data/example/columns.yml

@@ -20,6 +20,7 @@ in:
       - {name: id, type: long}
       - {name: name, type: string}
       - {name: score, type: double}
+      - {name: json, type: json}
 filters:
   - type: column
     columns:
@@ -28,5 +29,6 @@ filters:
       - {name: foo,  default: 1, type: long}
       - {name: id}
       - {name: copy_score, src: score}
+      - {name: json, default: "{\"foo\": \"FOO\"}"}
 out:
   type: stdout

data/example/drop_columns.yml

@@ -13,6 +13,7 @@ in:
       - {name: id, type: long}
       - {name: name, type: string}
       - {name: score, type: double}
+      - {name: json, type: json}
 filters:
   - type: column
     drop_columns:

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 10 13:48:48 UTC 2015
+#Wed Jan 13 12:41:02 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

data/src/main/java/org/embulk/filter/ColumnFilterPlugin.java

@@ -1,46 +1,44 @@
 package org.embulk.filter;
 
-import java.util.List;
-import java.util.HashMap;
+import com.google.common.base.Optional;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
-import org.slf4j.Logger;
 
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigDiff;
-import org.embulk.config.ConfigSource;
 import org.embulk.config.ConfigException;
+import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
 
-import org.embulk.spi.type.Type;
-import org.embulk.spi.type.BooleanType;
-import org.embulk.spi.type.LongType;
-import org.embulk.spi.type.DoubleType;
-import org.embulk.spi.type.StringType;
-import org.embulk.spi.type.TimestampType;
-
-import org.embulk.spi.FilterPlugin;
+import org.embulk.spi.Column;
+import org.embulk.spi.ColumnVisitor;
 import org.embulk.spi.Exec;
+import org.embulk.spi.FilterPlugin;
 import org.embulk.spi.Page;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.PageOutput;
 import org.embulk.spi.PageReader;
 import org.embulk.spi.Schema;
-import org.embulk.spi.SchemaConfig;
-import org.embulk.spi.Column;
-import org.embulk.spi.ColumnVisitor;
-
-import org.joda.time.DateTimeZone;
+import org.embulk.spi.SchemaConfigException;
+import org.embulk.spi.json.JsonParser;
 import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.time.TimestampParser;
 import org.embulk.spi.time.TimestampParseException;
-import com.google.common.base.Throwables;
+import org.embulk.spi.time.TimestampParser;
+import org.embulk.spi.type.BooleanType;
+import org.embulk.spi.type.DoubleType;
+import org.embulk.spi.type.LongType;
+import org.embulk.spi.type.StringType;
+import org.embulk.spi.type.JsonType;
+import org.embulk.spi.type.TimestampType;
+import org.embulk.spi.type.Type;
 
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import com.google.common.base.Optional;
-import org.embulk.spi.SchemaConfigException;
+import org.joda.time.DateTimeZone;
+import org.msgpack.value.Value;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+import java.util.List;
 
 public class ColumnFilterPlugin implements FilterPlugin
 {
@@ -116,7 +114,7 @@ public class ColumnFilterPlugin implements FilterPlugin
         ImmutableList.Builder<Column> builder = ImmutableList.builder();
         int i = 0;
         if (dropColumns.size() > 0) {
-            for (Column inputColumn: inputSchema.getColumns()) {
+            for (Column inputColumn : inputSchema.getColumns()) {
                 String name = inputColumn.getName();
                 boolean matched = false;
                 for (ColumnConfig dropColumn : dropColumns) {
@@ -130,7 +128,8 @@ public class ColumnFilterPlugin implements FilterPlugin
                     builder.add(outputColumn);
                 }
             }
-        } else if (columns.size() > 0) {
+        }
+        else if (columns.size() > 0) {
             for (ColumnConfig column : columns) {
                 String name                   = column.getName();
                 Optional<Type>   type         = column.getType();
@@ -151,8 +150,9 @@ public class ColumnFilterPlugin implements FilterPlugin
                     throw new SchemaConfigException(String.format("columns: Column src '%s' is not found in inputSchema. Column '%s' does not have \"type\" and \"default\"", srcName, name));
                 }
             }
-        } else {
-            for (Column inputColumn: inputSchema.getColumns()) {
+        }
+        else {
+            for (Column inputColumn : inputSchema.getColumns()) {
                 Column outputColumn = new Column(i++, inputColumn.getName(), inputColumn.getType());
                 builder.add(outputColumn);
             }
@@ -191,9 +191,10 @@ public class ColumnFilterPlugin implements FilterPlugin
         control.run(task.dump(), outputSchema);
     }
 
-    private Column getColumn(String name, Schema schema) {
+    private Column getColumn(String name, Schema schema)
+    {
         // hash should be faster, though
-        for (Column column: schema.getColumns()) {
+        for (Column column : schema.getColumns()) {
             if (column.getName().equals(name)) {
                 return column;
             }
@@ -201,22 +202,24 @@ public class ColumnFilterPlugin implements FilterPlugin
         return null;
     }
 
-    private String getSrc(String name, List<ColumnConfig> columnConfigs) {
+    private String getSrc(String name, List<ColumnConfig> columnConfigs)
+    {
         for (ColumnConfig columnConfig : columnConfigs) {
             if (columnConfig.getName().equals(name) &&
                 columnConfig.getSrc().isPresent()) {
-                return (String)columnConfig.getSrc().get();
+                return (String) columnConfig.getSrc().get();
             }
         }
         return null;
     }
 
-    private Object getDefault(String name, Type type, List<ColumnConfig> columnConfigs, PluginTask task) {
+    private Object getDefault(String name, Type type, List<ColumnConfig> columnConfigs, PluginTask task)
+    {
         for (ColumnConfig columnConfig : columnConfigs) {
             if (columnConfig.getName().equals(name)) {
                 if (type instanceof BooleanType) {
                     if (columnConfig.getDefault().isPresent()) {
-                        return (Boolean)columnConfig.getDefault().get();
+                        return (Boolean) columnConfig.getDefault().get();
                     }
                 }
                 else if (type instanceof LongType) {
@@ -231,29 +234,38 @@ public class ColumnFilterPlugin implements FilterPlugin
                 }
                 else if (type instanceof StringType) {
                     if (columnConfig.getDefault().isPresent()) {
-                        return (String)columnConfig.getDefault().get();
+                        return (String) columnConfig.getDefault().get();
                     }
                 }
+                else if (type instanceof JsonType) {
+                   if (columnConfig.getDefault().isPresent()) {
+                       JsonParser parser = new JsonParser();
+                       return parser.parse((String) columnConfig.getDefault().get());
+                   }
+                }
                 else if (type instanceof TimestampType) {
                     if (columnConfig.getDefault().isPresent()) {
-                        String time   = (String)columnConfig.getDefault().get();
+                        String time   = (String) columnConfig.getDefault().get();
                         String format = null;
                         if (columnConfig.getFormat().isPresent()) {
                             format = columnConfig.getFormat().get();
-                        } else {
+                        }
+                        else {
                             format = task.getDefaultTimestampFormat();
                         }
                         DateTimeZone timezone = null;
                         if (columnConfig.getTimeZone().isPresent()) {
                             timezone = columnConfig.getTimeZone().get();
-                        } else {
+                        }
+                        else {
                             timezone = task.getDefaultTimeZone();
                         }
                         TimestampParser parser = new TimestampParser(task.getJRuby(), format, timezone);
                         try {
-                            Timestamp default_value = parser.parse(time);
-                            return default_value;
-                        } catch(TimestampParseException ex) {
+                            Timestamp defaultValue = parser.parse(time);
+                            return defaultValue;
+                        }
+                        catch (TimestampParseException ex) {
                             throw Throwables.propagate(ex);
                         }
                     }
@@ -272,7 +284,7 @@ public class ColumnFilterPlugin implements FilterPlugin
 
         // Map outputColumn => inputColumn
         final HashMap<Column, Column> outputInputColumnMap = new HashMap<Column, Column>();
-        for (Column outputColumn: outputSchema.getColumns()) {
+        for (Column outputColumn : outputSchema.getColumns()) {
             String name    = outputColumn.getName();
             String srcName = getSrc(name, task.getColumns());
             if (srcName == null) {
@@ -287,16 +299,16 @@ public class ColumnFilterPlugin implements FilterPlugin
 
         // Map outputColumn => default value if present
         final HashMap<Column, Object> outputDefaultMap = new HashMap<Column, Object>();
-        for (Column outputColumn: outputSchema.getColumns()) {
+        for (Column outputColumn : outputSchema.getColumns()) {
             String name = outputColumn.getName();
             Type   type = outputColumn.getType();
 
-            Object default_value = getDefault(name, type, task.getColumns(), task);
-            if (default_value == null) {
-                default_value = getDefault(name, type, task.getAddColumns(), task);
+            Object defaultValue = getDefault(name, type, task.getColumns(), task);
+            if (defaultValue == null) {
+                defaultValue = getDefault(name, type, task.getAddColumns(), task);
             }
-            if (default_value != null) {
-                outputDefaultMap.put(outputColumn, default_value);
+            if (defaultValue != null) {
+                outputDefaultMap.put(outputColumn, defaultValue);
             }
         }
 
@@ -306,17 +318,20 @@ public class ColumnFilterPlugin implements FilterPlugin
             private ColumnVisitorImpl visitor = new ColumnVisitorImpl(pageBuilder);
 
             @Override
-            public void finish() {
+            public void finish()
+            {
                 pageBuilder.finish();
             }
 
             @Override
-            public void close() {
+            public void close()
+            {
                 pageBuilder.close();
             }
 
             @Override
-            public void add(Page page) {
+            public void add(Page page)
+            {
                 pageReader.setPage(page);
 
                 while (pageReader.nextRecord()) {
@@ -325,84 +340,119 @@ public class ColumnFilterPlugin implements FilterPlugin
                 }
             }
 
-            class ColumnVisitorImpl implements ColumnVisitor {
+            class ColumnVisitorImpl implements ColumnVisitor
+            {
                 private final PageBuilder pageBuilder;
 
-                ColumnVisitorImpl(PageBuilder pageBuilder) {
+                ColumnVisitorImpl(PageBuilder pageBuilder)
+                {
                     this.pageBuilder = pageBuilder;
                 }
 
                 @Override
-                public void booleanColumn(Column outputColumn) {
+                public void booleanColumn(Column outputColumn)
+                {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
                     if (inputColumn == null || pageReader.isNull(inputColumn)) {
-                        Boolean default_value = (Boolean)outputDefaultMap.get(outputColumn);
-                        if (default_value != null) {
-                            pageBuilder.setBoolean(outputColumn, default_value.booleanValue());
-                        } else {
+                        Boolean defaultValue = (Boolean) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setBoolean(outputColumn, defaultValue.booleanValue());
+                        }
+                        else {
                             pageBuilder.setNull(outputColumn);
                         }
-                    } else {
+                    }
+                    else {
                         pageBuilder.setBoolean(outputColumn, pageReader.getBoolean(inputColumn));
                     }
                 }
 
                 @Override
-                public void longColumn(Column outputColumn) {
+                public void longColumn(Column outputColumn)
+                {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
                     if (inputColumn == null || pageReader.isNull(inputColumn)) {
-                        Long default_value = (Long)outputDefaultMap.get(outputColumn);
-                        if (default_value != null) {
-                            pageBuilder.setLong(outputColumn, default_value.longValue());
-                        } else {
+                        Long defaultValue = (Long) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setLong(outputColumn, defaultValue.longValue());
+                        }
+                        else {
                             pageBuilder.setNull(outputColumn);
                         }
-                    } else {
+                    }
+                    else {
                         pageBuilder.setLong(outputColumn, pageReader.getLong(inputColumn));
                     }
                 }
 
                 @Override
-                public void doubleColumn(Column outputColumn) {
+                public void doubleColumn(Column outputColumn)
+                {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
                     if (inputColumn == null || pageReader.isNull(inputColumn)) {
-                        Double default_value = (Double)outputDefaultMap.get(outputColumn);
-                        if (default_value != null) {
-                            pageBuilder.setDouble(outputColumn, default_value.doubleValue());
-                        } else {
+                        Double defaultValue = (Double) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setDouble(outputColumn, defaultValue.doubleValue());
+                        }
+                        else {
                             pageBuilder.setNull(outputColumn);
                         }
-                    } else {
+                    }
+                    else {
                         pageBuilder.setDouble(outputColumn, pageReader.getDouble(inputColumn));
                     }
                 }
 
                 @Override
-                public void stringColumn(Column outputColumn) {
+                public void stringColumn(Column outputColumn)
+                {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
                     if (inputColumn == null || pageReader.isNull(inputColumn)) {
-                        String default_value = (String)outputDefaultMap.get(outputColumn);
-                        if (default_value != null) {
-                            pageBuilder.setString(outputColumn, default_value);
-                        } else {
+                        String defaultValue = (String) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setString(outputColumn, defaultValue);
+                        }
+                        else {
                             pageBuilder.setNull(outputColumn);
                         }
-                    } else {
+                    }
+                    else {
                         pageBuilder.setString(outputColumn, pageReader.getString(inputColumn));
                     }
                 }
 
                 @Override
-                public void timestampColumn(Column outputColumn) {
+                public void jsonColumn(Column outputColumn)
+                {
                     Column inputColumn = outputInputColumnMap.get(outputColumn);
                     if (inputColumn == null || pageReader.isNull(inputColumn)) {
-                        Timestamp default_value = (Timestamp)outputDefaultMap.get(outputColumn);
-                        if (default_value != null) {
-                            pageBuilder.setTimestamp(outputColumn, default_value);
-                        } else {
+                        Value defaultValue = (Value) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setJson(outputColumn, defaultValue);
+                        }
+                        else {
                             pageBuilder.setNull(outputColumn);
                         }
-                    } else {
+                    }
+                    else {
+                        pageBuilder.setJson(outputColumn, pageReader.getJson(inputColumn));
+                    }
+                }
+
+                @Override
+                public void timestampColumn(Column outputColumn)
+                {
+                    Column inputColumn = outputInputColumnMap.get(outputColumn);
+                    if (inputColumn == null || pageReader.isNull(inputColumn)) {
+                        Timestamp defaultValue = (Timestamp) outputDefaultMap.get(outputColumn);
+                        if (defaultValue != null) {
+                            pageBuilder.setTimestamp(outputColumn, defaultValue);
+                        }
+                        else {
+                            pageBuilder.setNull(outputColumn);
+                        }
+                    }
+                    else {
                         pageBuilder.setTimestamp(outputColumn, pageReader.getTimestamp(inputColumn));
                     }
                 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-column
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,9 +51,11 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
+- config/checkstyle/checkstyle.xml
 - example/add_columns.yml
 - example/columns.yml
 - example/drop_columns.yml
+- example/example.csv
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
@@ -61,7 +63,7 @@ files:
 - lib/embulk/filter/column.rb
 - src/main/java/org/embulk/filter/ColumnFilterPlugin.java
 - src/test/java/org/embulk/filter/TestColumnFilterPlugin.java
-- classpath/embulk-filter-column-0.3.1.jar
+- classpath/embulk-filter-column-0.4.0.jar
 homepage: https://github.com/sonots/embulk-filter-column
 licenses:
 - MIT