Merge pull request #46 from embulk/revert-44-update-commons-vfs2-latest

Revert "Update commons vfs2 latest version to fix timeout setting not working"

Author: vietnguyen-td

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "java"
     id "checkstyle"
     id "jacoco"
-    id "org.embulk.embulk-plugins" version "0.4.2"
+    id "org.embulk.embulk-plugins" version "0.3.0"
 }
 
 repositories {
@@ -13,7 +13,7 @@ repositories {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.3.4"
+version = "0.3.3"
 description = "Reads files stored on remote server using SFTP."
 
 sourceCompatibility = 1.8
@@ -25,10 +25,7 @@ tasks.withType(JavaCompile) {
 
 dependencies {
     compileOnly "org.embulk:embulk-core:0.9.23"
-    compile("org.apache.commons:commons-vfs2:2.6.0") {
-        exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
-        exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
-    }
+    compile "org.apache.commons:commons-vfs2:2.2"
     compile "commons-io:commons-io:2.6"
     compile "com.jcraft:jsch:0.1.55"
 

gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -2,9 +2,6 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.jcraft:jsch:0.1.55
-com.squareup.okhttp:okhttp:2.7.5
-com.squareup.okio:okio:1.6.0
 commons-io:commons-io:2.6
 commons-logging:commons-logging:1.2
-org.apache.commons:commons-vfs2:2.6.0
-org.apache.hadoop:hadoop-hdfs-client:3.2.1
+org.apache.commons:commons-vfs2:2.2

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

@@ -21,7 +21,6 @@
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +37,7 @@ public class SftpFileInput
         extends InputStreamFileInput
         implements TransactionalFileInput
 {
-    private static final Logger log = LoggerFactory.getLogger(SftpFileInput.class);
+    private static final Logger log = Exec.getLogger(SftpFileInput.class);
     private static boolean isMatchLastKey = false;
 
     public SftpFileInput(PluginTask task, int taskIndex)
@@ -96,17 +95,15 @@ public static FileSystemOptions initializeFsOptions(PluginTask task)
         try {
             SftpFileSystemConfigBuilder builder = SftpFileSystemConfigBuilder.getInstance();
             builder.setUserDirIsRoot(fsOptions, task.getUserDirIsRoot());
-            final int timeoutMillis = task.getSftpConnectionTimeout() * 1000;
-            builder.setSessionTimeoutMillis(fsOptions, timeoutMillis);
-            builder.setConnectTimeoutMillis(fsOptions, timeoutMillis);
+            builder.setTimeout(fsOptions, task.getSftpConnectionTimeout() * 1000);
             builder.setStrictHostKeyChecking(fsOptions, "no");
 
             if (task.getSecretKeyFile().isPresent()) {
                 IdentityInfo identityInfo = new IdentityInfo(
                         new File((task.getSecretKeyFile().map(localFileToPathString()).get())),
                         task.getSecretKeyPassphrase().getBytes()
                 );
-                builder.setIdentityProvider(fsOptions, identityInfo);
+                builder.setIdentityInfo(fsOptions, identityInfo);
                 log.info("set identity: {}", task.getSecretKeyFile().get().getPath());
             }
 

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

@@ -5,13 +5,12 @@
 import org.apache.commons.vfs2.FileSystemException;
 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 org.slf4j.LoggerFactory;
-
 import static org.embulk.spi.util.RetryExecutor.retryExecutor;
 
 import java.io.IOException;
@@ -26,7 +25,7 @@ public class SingleFileProvider
     private final Iterator<String> iterator;
     private final int maxConnectionRetry;
     private boolean opened = false;
-    private final Logger log = LoggerFactory.getLogger(SingleFileProvider.class);
+    private final Logger log = Exec.getLogger(SingleFileProvider.class);
 
     public SingleFileProvider(PluginTask task, int taskIndex, StandardFileSystemManager manager, FileSystemOptions fsOptions)
     {

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

@@ -470,7 +470,7 @@ public void testGetRelativePathWithPassword()
     public void testGetRelativePath()
     {
         String expected = "/path/to/sample !@#.csv";
-        String path = "/path/to/sample%20!@#.csv";
+        String path = "/path/to/sample !@#.csv";
         config.loadConfig(PluginTask.class);
         assertEquals(expected, SftpFileInput.getRelativePath(null, Optional.of(path)));
     }