embulk-filter-typecast 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d936b48df269ca51c971f2f258c2ae54abd492b5
-  data.tar.gz: 7611a81214e865fb9f63ab3d346f45b4e2d68063
+  metadata.gz: a1c1a4e112a53e015c9c9a42d0c1c696fbc5171a
+  data.tar.gz: 625666a86b20a2d45e120eabd5eda2a2d6256e2e
 SHA512:
-  metadata.gz: 588142a7396f9a03ac3820276e5cf213345bb0674e72364faba6f0de26157d3184c16edee9d7b874fc2b0a7e73305661a74cc5f81819568c12d3c7b0d127032b
-  data.tar.gz: 6806eff6b7f631388ca2946b2a8732b824f40418b9e347fc674c9616e4cff1741278da825a3a8f2b8e987626d27dc6bc0c154bf86f71d8d459d0ea956e11ba54
+  metadata.gz: 6c462c39a5444702970b6373f6935f665cce915fd57cb0b104013f1f4f407a777e071ad5a7a1cde7ca47e13ee94770be9a1fa497d1c67378ad4071e50bc74b07
+  data.tar.gz: 0a12fe293a6205cc90028c5c9efd87222d2a0cd3b1a037c9630f287d1b398b5473df0c7649596ab334e1ee65d6e70ab06703151af02ef23e1454394c7467c9be

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.1 (2017-08-26)
+
+Enhancements:
+
+* Use old, but non-deprecated TimestampParser and TimestampFormatter API to support embulk < 0.8.29
+
 # 0.2.0 (2017-08-23)
 
 Changes:

data/build.gradle

@@ -13,13 +13,13 @@ configurations {
     provided
 }
 
-version = "0.2.0"
+version = "0.2.1"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.29+"
-    provided "org.embulk:embulk-core:0.8.29+"
+    compile  "org.embulk:embulk-core:0.8.+"
+    provided "org.embulk:embulk-core:0.8.+"
     compile  "io.github.medjed:JsonPathCompiler:0.1.1"
 
     testCompile "junit:junit:4.+"

data/src/main/java/org/embulk/filter/typecast/ColumnCaster.java

@@ -1,7 +1,7 @@
 package org.embulk.filter.typecast;
 
-import io.github.medjed.jsonpathcompiler.expressions.Path;
-import io.github.medjed.jsonpathcompiler.expressions.Utils;
+import com.google.common.base.Optional;
+
 import io.github.medjed.jsonpathcompiler.expressions.path.PathCompiler;
 import io.github.medjed.jsonpathcompiler.expressions.path.PropertyPathToken;
 import org.embulk.filter.typecast.TypecastFilterPlugin.ColumnConfig;
@@ -29,6 +29,7 @@ import org.embulk.spi.type.StringType;
 import org.embulk.spi.type.TimestampType;
 import org.embulk.spi.type.Type;
 import org.joda.time.DateTimeZone;
+import org.jruby.embed.ScriptingContainer;
 import org.msgpack.value.Value;
 
 import org.slf4j.Logger;
@@ -70,7 +71,7 @@ class ColumnCaster
             }
             Column inputColumn = inputSchema.lookupColumn(columnConfig.getName());
             if (inputColumn.getType() instanceof StringType && columnConfig.getType() instanceof TimestampType) {
-                TimestampParser parser = getTimestampParser(columnConfig, task);
+                TimestampParser parser = getTimestampParser(task, columnConfig);
                 this.timestampParserMap.put(columnConfig.getName(), parser);
             }
         }
@@ -85,24 +86,157 @@ class ColumnCaster
             }
             Column inputColumn = inputSchema.lookupColumn(columnConfig.getName());
             if (inputColumn.getType() instanceof TimestampType && columnConfig.getType() instanceof StringType) {
-                TimestampFormatter parser = getTimestampFormatter(columnConfig, task);
+                TimestampFormatter parser = getTimestampFormatter(task, columnConfig);
                 this.timestampFormatterMap.put(columnConfig.getName(), parser);
             }
         }
     }
 
-    private TimestampParser getTimestampParser(ColumnConfig columnConfig, PluginTask task)
+    private class TimestampParserTaskImpl implements TimestampParser.Task
+    {
+        private final DateTimeZone defaultTimeZone;
+        private final String defaultTimestampFormat;
+        private final String defaultDate;
+        public TimestampParserTaskImpl(
+                DateTimeZone defaultTimeZone,
+                String defaultTimestampFormat,
+                String defaultDate)
+        {
+            this.defaultTimeZone = defaultTimeZone;
+            this.defaultTimestampFormat = defaultTimestampFormat;
+            this.defaultDate = defaultDate;
+        }
+        @Override
+        public DateTimeZone getDefaultTimeZone()
+        {
+            return this.defaultTimeZone;
+        }
+        @Override
+        public String getDefaultTimestampFormat()
+        {
+            return this.defaultTimestampFormat;
+        }
+        @Override
+        public String getDefaultDate()
+        {
+            return this.defaultDate;
+        }
+        @Override
+        public ScriptingContainer getJRuby()
+        {
+            return null;
+        }
+    }
+
+    private class TimestampParserColumnOptionImpl implements TimestampParser.TimestampColumnOption
+    {
+        private final Optional<DateTimeZone> timeZone;
+        private final Optional<String> format;
+        private final Optional<String> date;
+        public TimestampParserColumnOptionImpl(
+                Optional<DateTimeZone> timeZone,
+                Optional<String> format,
+                Optional<String> date)
+        {
+            this.timeZone = timeZone;
+            this.format = format;
+            this.date = date;
+        }
+        @Override
+        public Optional<DateTimeZone> getTimeZone()
+        {
+            return this.timeZone;
+        }
+        @Override
+        public Optional<String> getFormat()
+        {
+            return this.format;
+        }
+        @Override
+        public Optional<String> getDate()
+        {
+            return this.date;
+        }
+    }
+
+    private class TimestampFormatterTaskImpl implements TimestampFormatter.Task
+    {
+        private final DateTimeZone defaultTimeZone;
+        private final String defaultTimestampFormat;
+        public TimestampFormatterTaskImpl(
+                DateTimeZone defaultTimeZone,
+                String defaultTimestampFormat)
+        {
+            this.defaultTimeZone = defaultTimeZone;
+            this.defaultTimestampFormat = defaultTimestampFormat;
+        }
+        @Override
+        public DateTimeZone getDefaultTimeZone()
+        {
+            return this.defaultTimeZone;
+        }
+        @Override
+        public String getDefaultTimestampFormat()
+        {
+            return this.defaultTimestampFormat;
+        }
+        @Override
+        public ScriptingContainer getJRuby()
+        {
+            return null;
+        }
+    }
+
+    private class TimestampFormatterColumnOptionImpl implements TimestampFormatter.TimestampColumnOption
+    {
+        private final Optional<DateTimeZone> timeZone;
+        private final Optional<String> format;
+        public TimestampFormatterColumnOptionImpl(
+                Optional<DateTimeZone> timeZone,
+                Optional<String> format)
+        {
+            this.timeZone = timeZone;
+            this.format = format;
+        }
+        @Override
+        public Optional<DateTimeZone> getTimeZone()
+        {
+            return this.timeZone;
+        }
+        @Override
+        public Optional<String> getFormat()
+        {
+            return this.format;
+        }
+    }
+
+    private TimestampParser getTimestampParser(PluginTask task, ColumnConfig columnConfig)
     {
-        DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
-        String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
-        return new TimestampParser(format, timezone);
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
+        //     String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
+        //     String date = columnConfig.getDate().or(task.getDefaultDate());
+        //     return new TimestampParser(format, timezone, date);
+        TimestampParserTaskImpl t = new TimestampParserTaskImpl(
+                task.getDefaultTimeZone(), task.getDefaultTimestampFormat(), task.getDefaultDate());
+        TimestampParserColumnOptionImpl columnOption = new TimestampParserColumnOptionImpl(
+                columnConfig.getTimeZone(), columnConfig.getFormat(), columnConfig.getDate());
+        return new TimestampParser(t, columnOption);
     }
 
-    private TimestampFormatter getTimestampFormatter(ColumnConfig columnConfig, PluginTask task)
+    private TimestampFormatter getTimestampFormatter(PluginTask task, ColumnConfig columnConfig)
     {
-        String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
-        DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
-        return new TimestampFormatter(format, timezone);
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
+        //     DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
+        //     return new TimestampFormatter(format, timezone);
+        TimestampFormatterTaskImpl t = new TimestampFormatterTaskImpl(
+                task.getDefaultTimeZone(), task.getDefaultTimestampFormat());
+        TimestampFormatterColumnOptionImpl columnOption = new TimestampFormatterColumnOptionImpl(
+                columnConfig.getTimeZone(), columnConfig.getFormat());
+        return new TimestampFormatter(t, Optional.of(columnOption));
     }
 
     public void setFromBoolean(Column outputColumn, boolean value)

data/src/main/java/org/embulk/filter/typecast/TypecastFilterPlugin.java

@@ -6,7 +6,6 @@ import io.github.medjed.jsonpathcompiler.expressions.path.PathCompiler;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
-import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
@@ -50,6 +49,10 @@ public class TypecastFilterPlugin implements FilterPlugin
         @Config("format")
         @ConfigDefault("null")
         public Optional<String> getFormat();
+
+        @Config("date")
+        @ConfigDefault("null")
+        public Optional<String> getDate();
     }
 
     public interface PluginTask extends Task
@@ -69,6 +72,10 @@ public class TypecastFilterPlugin implements FilterPlugin
         @Config("default_timestamp_format")
         @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
         public String getDefaultTimestampFormat();
+
+        @Config("default_date")
+        @ConfigDefault("\"1970-01-01\"")
+        public String getDefaultDate();
     }
 
     @Override

data/src/test/java/org/embulk/filter/typecast/cast/TestTimestampCast.java

@@ -4,17 +4,12 @@ import org.embulk.EmbulkTestRuntime;
 import org.embulk.spi.DataException;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueFactory;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public class TestTimestampCast
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-typecast
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ files:
 - src/test/java/org/embulk/filter/typecast/cast/TestTimestampCast.java
 - classpath/accessors-smart-1.1.jar
 - classpath/asm-5.0.3.jar
-- classpath/embulk-filter-typecast-0.2.0.jar
+- classpath/embulk-filter-typecast-0.2.1.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/JsonPathCompiler-0.1.1.jar
 - classpath/slf4j-api-1.7.21.jar