remove RetryableInputStream and use org.embulk.spi.util.ResumableInputStream

Author: frsyuki

build.gradle

@@ -16,8 +16,8 @@ configurations {
 version = "0.1.7"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.5.3"
-    provided "org.embulk:embulk-core:0.5.3"
+    compile  "org.embulk:embulk-core:0.6.13"
+    provided "org.embulk:embulk-core:0.6.13"
     compile "com.amazonaws:aws-java-sdk-s3:1.9.22"
     testCompile "junit:junit:4.+"
     testCompile "org.mockito:mockito-core:1.+"

src/main/java/org/embulk/input/s3/RetryableInputStream.java

@@ -34,6 +34,7 @@
 import org.embulk.spi.FileInputPlugin;
 import org.embulk.spi.TransactionalFileInput;
 import org.embulk.spi.util.InputStreamFileInput;
+import org.embulk.spi.util.ResumableInputStream;
 import org.embulk.input.s3.RetryExecutor.Retryable;
 import org.embulk.input.s3.RetryExecutor.RetryGiveupException;
 import static org.embulk.input.s3.RetryExecutor.retryExecutor;
@@ -207,7 +208,7 @@ public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
     }
 
     private static class S3InputStreamReopener
-            implements RetryableInputStream.Reopener
+            implements ResumableInputStream.Reopener
     {
         private final Logger log = Exec.getLogger(S3FileInputPlugin.class);
 
@@ -302,7 +303,7 @@ public InputStream openNext() throws IOException
                 opened = true;
                 GetObjectRequest request = new GetObjectRequest(bucket, key);
                 S3Object obj = client.getObject(request);
-                return new RetryableInputStream(obj.getObjectContent(), new S3InputStreamReopener(client, request, obj.getObjectMetadata().getContentLength()));
+                return new ResumableInputStream(obj.getObjectContent(), new S3InputStreamReopener(client, request, obj.getObjectMetadata().getContentLength()));
             }
 
             @Override