embulk-input-sftp 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee50a24af4aefe560e866185b937b75fd55c6de
-  data.tar.gz: 89a75e4a81249fb7b72a94843da40c3f46884dba
+  metadata.gz: 4ecd76a142c68e404815a711cd75fec1008886ac
+  data.tar.gz: 413a21694151b03433eb693fd464c8a0076d3c1e
 SHA512:
-  metadata.gz: 4d6ff3b1f944e43d293c1354b671f0b7e888a67c8b5375ba199ef717a5236cae3f192803f120ce267447fb10b1a11ade82cafee9b7b675f0bb5f440a3619df37
-  data.tar.gz: 33974b8d4d2746a0a731d0afaf72604a36ee6804fccda0ddfaea36bd79b0f1d0a44ca5e0f255b78c0ef693d9cb583d9acc7a9d028cd1f129515e6cd0f722cb8a
+  metadata.gz: a5f6178a67723b6858195893b75e1d225c7672e72349c83cbf3b8c1c0312103cbad37d417fbbdaa320934968617cf34f39b8d15dc6e43630574ff2596d6f143b
+  data.tar.gz: 2d828addac6bdb0b1dd8a3953303729b76b250f6c7de324ff20df4d0378398aa617e07bfd627a223eb2850684639c07ebe9c641cbc31e0566d06e06249ac1b13

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0 - 2018-12-26
+[new feature] Use file name output feature in Embulk core to show file name in cmdout [#37](https://github.com/embulk/embulk-input-sftp/pull/37)
+
 ## 0.2.12 - 2018-10-05
 * [maintenance] Give up processing and throw ConfigException when "Auth fail" first appears [#33](https://github.com/embulk/embulk-input-sftp/pull/33)
 

data/README.md

@@ -3,6 +3,8 @@
 
 Reads files stored on remote server using SFTP
 
+embulk-input-sftp v0.3.0+ requires Embulk v0.9.12+
+
 ## Overview
 
 * **Plugin type**: file input

data/build.gradle

@@ -16,20 +16,20 @@ configurations {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.2.12"
+version = "0.3.0"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.6"
-    provided "org.embulk:embulk-core:0.8.6"
+    compile  "org.embulk:embulk-core:0.9.12"
+    provided "org.embulk:embulk-core:0.9.12"
     compile "org.apache.commons:commons-vfs2:2.2"
     compile "commons-io:commons-io:2.6"
-    compile "com.jcraft:jsch:0.1.54"
+    compile "com.jcraft:jsch:0.1.55"
     testCompile "junit:junit:4.+"
-    testCompile "org.embulk:embulk-core:0.8.6:tests"
-    testCompile "org.embulk:embulk-standards:0.8.6"
+    testCompile "org.embulk:embulk-core:0.9.12:tests"
+    testCompile "org.embulk:embulk-standards:0.9.12"
     testCompile "org.apache.sshd:apache-sshd:1.1.0"
     testCompile "org.littleshoot:littleproxy:1.1.0-beta1"
     testCompile "io.netty:netty-all:4.0.34.Final"

data/src/main/java/org/embulk/input/sftp/FileList.java

@@ -3,7 +3,6 @@ package org.embulk.input.sftp;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -24,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -181,7 +181,7 @@ public class FileList
             catch (IOException ex) {
                 throw Throwables.propagate(ex);
             }
-            return new FileList(binary.toByteArray(), getSplits(entries), Optional.fromNullable(last));
+            return new FileList(binary.toByteArray(), getSplits(entries), Optional.ofNullable(last));
         }
 
         private List<List<Entry>> getSplits(List<Entry> all)

data/src/main/java/org/embulk/input/sftp/PluginTask.java

@@ -1,6 +1,5 @@
 package org.embulk.input.sftp;
 
-import com.google.common.base.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigInject;
@@ -8,6 +7,8 @@ import org.embulk.config.Task;
 import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.unit.LocalFile;
 
+import java.util.Optional;
+
 public interface PluginTask
         extends Task, FileList.Task
 {

data/src/main/java/org/embulk/input/sftp/ProxyTask.java

@@ -2,7 +2,6 @@ package org.embulk.input.sftp;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.google.common.base.Optional;
 import org.apache.commons.vfs2.FileSystemOptions;
 import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
 import org.embulk.config.Config;
@@ -11,6 +10,7 @@ import org.embulk.config.ConfigException;
 import org.embulk.config.Task;
 
 import java.util.Locale;
+import java.util.Optional;
 
 interface ProxyTask
         extends Task

data/src/main/java/org/embulk/input/sftp/SftpFileInput.java

@@ -1,7 +1,5 @@
 package org.embulk.input.sftp;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +27,8 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
@@ -100,11 +100,11 @@ public class SftpFileInput
 
             if (task.getSecretKeyFile().isPresent()) {
                 IdentityInfo identityInfo = new IdentityInfo(
-                        new File((task.getSecretKeyFile().transform(localFileToPathString()).get())),
+                        new File((task.getSecretKeyFile().map(localFileToPathString()).get())),
                         task.getSecretKeyPassphrase().getBytes()
                 );
                 builder.setIdentityInfo(fsOptions, identityInfo);
-                log.info("set identity: {}", task.getSecretKeyFile().get());
+                log.info("set identity: {}", task.getSecretKeyFile().get().getPath());
             }
 
             if (task.getProxy().isPresent()) {

data/src/main/java/org/embulk/input/sftp/SingleFileProvider.java

@@ -7,13 +7,13 @@ import org.apache.commons.vfs2.FileSystemOptions;
 import org.apache.commons.vfs2.impl.StandardFileSystemManager;
 import org.embulk.spi.Exec;
 import org.embulk.spi.util.InputStreamFileInput;
+import org.embulk.spi.util.InputStreamFileInput.InputStreamWithHints;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.slf4j.Logger;
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.util.Iterator;
 
@@ -36,7 +36,7 @@ public class SingleFileProvider
     }
 
     @Override
-    public InputStream openNext() throws IOException
+    public InputStreamWithHints openNextWithHints() throws IOException
     {
         if (opened || !iterator.hasNext()) {
             return null;
@@ -49,12 +49,13 @@ public class SingleFileProvider
                     .withRetryLimit(maxConnectionRetry)
                     .withInitialRetryWait(500)
                     .withMaxRetryWait(30 * 1000)
-                    .runInterruptible(new Retryable<InputStream>() {
+                    .runInterruptible(new Retryable<InputStreamWithHints>() {
                         @Override
-                        public InputStream call() throws FileSystemException
+                        public InputStreamWithHints call() throws FileSystemException
                         {
                             FileObject file = manager.resolveFile(key, fsOptions);
-                            return file.getContent().getInputStream();
+                            return new InputStreamWithHints(
+                                    file.getContent().getInputStream(), key);
                         }
 
                         @Override

data/src/test/java/org/embulk/input/sftp/TestSftpFileInputPlugin.java

@@ -1,6 +1,5 @@
 package org.embulk.input.sftp;
 
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -55,6 +54,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import java.util.Optional;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -70,10 +70,10 @@ files:
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-sftp-0.2.12.jar
+- classpath/embulk-input-sftp-0.3.0.jar
 - classpath/commons-vfs2-2.2.jar
 - classpath/commons-io-2.6.jar
-- classpath/jsch-0.1.54.jar
+- classpath/jsch-0.1.55.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses:
 - Apache-2.0