embulk-filter-column 0.7.0 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/build.gradle +4 -4
  4. data/gradle/wrapper/gradle-wrapper.properties +2 -2
  5. data/src/main/java/org/embulk/filter/column/ColumnFilterPlugin.java +1 -9
  6. data/src/main/java/org/embulk/filter/column/ColumnVisitorImpl.java +2 -4
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 61fa7dfcda11e9f632f50c741bf581ee784d5551
4
- data.tar.gz: cb86bfb359565c42513abd5af4830d9894846a18
3
+ metadata.gz: f146b54b8f68e72c75d1ad1fc9798a7a5fb6e1e6
4
+ data.tar.gz: 2ddfe951b377114d85aa49e25655f6d83263f10c
5
5
  SHA512:
6
- metadata.gz: ece076922941fd87c2030b4df3bb14f88cdd689f0f6fdca2923e657395053d4def57e0f9f1151f8b88a43ebb45a49f5461255f3178f5df6671f15af41ab2c67e
7
- data.tar.gz: c5bb54d7aeae2e7fe790ac0be822d0f301994f0f412b501987004d7302a38ca5038e50fa9594af847f280e9d7f756da778dd197449c149ed89918e37e1dee361
6
+ metadata.gz: eb7c42089ee089e38e0a486e7553be52127cb7c25d855344fd28ae2436b19d9140a03db1791e15f13fc57775fd16b3c2efbc1a9c60476e183e09cbe6440f724f
7
+ data.tar.gz: 71faa93054b8dd840c490514170a3715bd76583587cc8bbeb5cf694a323f1256688d7c995308ca6b847c4e973a688b7b7ca390eb492bdf90f2120d386df9ffb6
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 0.7.1 (2017-08-24)
2
+
3
+ Enhancements:
4
+
5
+ * Support embulk < 0.8.29
6
+
1
7
  # 0.7.0 (2017-08-24)
2
8
 
3
9
  Changes:
data/build.gradle CHANGED
@@ -15,14 +15,14 @@ configurations {
15
15
  provided
16
16
  }
17
17
 
18
- version = "0.7.0"
18
+ version = "0.7.1"
19
19
  sourceCompatibility = 1.7
20
20
  targetCompatibility = 1.7
21
21
 
22
22
  dependencies {
23
- compile "org.embulk:embulk-core:0.8.29+"
24
- provided "org.embulk:embulk-core:0.8.29+"
25
- compile "io.github.medjed:JsonPathCompiler:0.0.12"
23
+ compile "org.embulk:embulk-core:0.8.+"
24
+ provided "org.embulk:embulk-core:0.8.+"
25
+ compile "io.github.medjed:JsonPathCompiler:0.0.12+"
26
26
 
27
27
  testCompile "junit:junit:4.+"
28
28
  testCompile "org.embulk:embulk-core:0.8.+:tests"
data/gradle/wrapper/gradle-wrapper.properties CHANGED
@@ -1,6 +1,6 @@
1
- #Wed Jan 13 12:41:02 JST 2016
1
+ #Wed Aug 09 13:08:20 JST 2017
2
2
  distributionBase=GRADLE_USER_HOME
3
3
  distributionPath=wrapper/dists
4
4
  zipStoreBase=GRADLE_USER_HOME
5
5
  zipStorePath=wrapper/dists
6
- distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
6
+ distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
data/src/main/java/org/embulk/filter/column/ColumnFilterPlugin.java CHANGED
@@ -34,7 +34,7 @@ public class ColumnFilterPlugin implements FilterPlugin
34
34
  }
35
35
 
36
36
  // NOTE: This is not spi.ColumnConfig
37
- interface ColumnConfig extends Task
37
+ interface ColumnConfig extends Task, TimestampParser.TimestampColumnOption
38
38
  {
39
39
  @Config("name")
40
40
  public String getName();
@@ -47,14 +47,6 @@ public class ColumnFilterPlugin implements FilterPlugin
47
47
  @ConfigDefault("null")
48
48
  public Optional<Object> getDefault();
49
49
 
50
- @Config("format")
51
- @ConfigDefault("null")
52
- public Optional<String> getFormat();
53
-
54
- @Config("timezone")
55
- @ConfigDefault("null")
56
- public Optional<DateTimeZone> getTimeZone();
57
-
58
50
  @Config("src")
59
51
  @ConfigDefault("null")
60
52
  public Optional<String> getSrc();
data/src/main/java/org/embulk/filter/column/ColumnVisitorImpl.java CHANGED
@@ -148,10 +148,8 @@ public class ColumnVisitorImpl implements ColumnVisitor
148
148
  }
149
149
  else if (type instanceof TimestampType) {
150
150
  if (columnConfig.getDefault().isPresent()) {
151
- String time = (String) columnConfig.getDefault().get();
152
- String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
153
- DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
154
- TimestampParser parser = new TimestampParser(format, timezone);
151
+ String time = (String) columnConfig.getDefault().get();
152
+ TimestampParser parser = new TimestampParser(task, columnConfig);
155
153
  try {
156
154
  Timestamp defaultValue = parser.parse(time);
157
155
  return defaultValue;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: embulk-filter-column
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Naotoshi Seo
@@ -81,7 +81,7 @@ files:
81
81
  - src/test/java/org/embulk/filter/column/TestJsonVisitor.java
82
82
  - classpath/accessors-smart-1.1.jar
83
83
  - classpath/asm-5.0.3.jar
84
- - classpath/embulk-filter-column-0.7.0.jar
84
+ - classpath/embulk-filter-column-0.7.1.jar
85
85
  - classpath/json-smart-2.2.1.jar
86
86
  - classpath/JsonPathCompiler-0.0.12.jar
87
87
  - classpath/slf4j-api-1.7.21.jar