Remove obsolete callNonInterruptible() method

Author: tvhung83

src/main/java/org/embulk/output/sftp/utils/TimeoutCloser.java

@@ -1,14 +1,17 @@
 package org.embulk.output.sftp.utils;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Throwables;
 
 import java.io.Closeable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 public class TimeoutCloser implements Closeable
 {
     @VisibleForTesting
-    int timeout = 120;
+    int timeout = 300; // 5 minutes
     private Closeable wrapped;
 
     public TimeoutCloser(Closeable wrapped)
@@ -19,16 +22,21 @@ public TimeoutCloser(Closeable wrapped)
     @Override
     public void close()
     {
-        new TimedCallable<Void>()
-        {
-            @Override
-            public Void call() throws Exception
+        try {
+            new TimedCallable<Void>()
             {
-                if (wrapped != null) {
-                    wrapped.close();
+                @Override
+                public Void call() throws Exception
+                {
+                    if (wrapped != null) {
+                        wrapped.close();
+                    }
+                    return null;
                 }
-                return null;
-            }
-        }.callNonInterruptible(timeout, TimeUnit.SECONDS);
+            }.call(timeout, TimeUnit.SECONDS);
+        }
+        catch (InterruptedException | ExecutionException | TimeoutException e) {
+            throw Throwables.propagate(e);
+        }
     }
 }

src/test/java/org/embulk/output/sftp/utils/TestTimedCallable.java

@@ -7,7 +7,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -16,24 +15,6 @@ public class TestTimedCallable
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
 
-    @Test
-    public void testCallNonInterruptible()
-    {
-        try {
-            new TimedCallable<Void>()
-            {
-                @Override
-                public Void call() throws Exception
-                {
-                    throw new Exception("Fake error");
-                }
-            }.callNonInterruptible(1, TimeUnit.SECONDS);
-        }
-        catch (Exception e) {
-            fail("Should not throw exception");
-        }
-    }
-
     @Test
     public void testCallTimeout()
     {