embulk-input-http 0.0.20 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d106f68b837bc832cfdc9761b71f7489f89d0adf
-  data.tar.gz: 7a69f451397cd623cf2a813b82180aab8f251f12
+  metadata.gz: f4e401d8cc7ca747a5b6c54a66b2729ae9aab821
+  data.tar.gz: aa33a85c06989405527ce926c79f8ceb22bc2eba
 SHA512:
-  metadata.gz: 7bbe32a099103303e3dec079292cd268e33478d08f4099ba665df167f38776b7aa0a87083367f1b19979af6df37b5c85c4cc42567d400eb4d3292b4079b388ae
-  data.tar.gz: be742d9cbf99f5ac7530bbafd034e551aa4db83aacd50600f124fd3f0a3ba90145bce7ba8f029c9f48380526b0e295588290cd387ba21429b4f6213c0c23c539
+  metadata.gz: 779faf323699e45d19dc490dbb48840fbc0354e73b83a37c6b4dcbbb54b890ab39cf1da4b4089f44a47418fd0686c169c974bbdb4534906e5de34ae3b1862837
+  data.tar.gz: 0d20d2060aff2cfddccf3394c5ce0817e4b389146fb468812e86962f75e750b3c3d8d176b0ae025e922739709caca0fd69d78a23c0ccb1c75307a323c6ac4b5d

data/build.gradle

@@ -13,14 +13,14 @@ configurations {
     provided
 }
 
-version = "0.0.20"
+version = "0.21.0"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.9.7"
-    provided "org.embulk:embulk-core:0.9.7"
+    compile  "org.embulk:embulk-core:0.9.14"
+    provided "org.embulk:embulk-core:0.9.14"
     compile  "org.apache.httpcomponents:httpclient:4.5.5"
     compile  "commons-io:commons-io:2.6"
     testCompile "junit:junit:4.+"

data/src/main/java/org/embulk/input/http/BasicAuthOption.java

@@ -4,40 +4,34 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
 
-public class BasicAuthOption
-{
-    private final String user;
-    private final String password;
+public class BasicAuthOption {
+  private final String user;
+  private final String password;
 
-    @JsonCreator
-    public BasicAuthOption(@JsonProperty("user") String user,
-            @JsonProperty("password") String password)
-    {
-        this.user = user;
-        this.password = password;
-    }
+  @JsonCreator
+  public BasicAuthOption(
+      @JsonProperty("user") String user, @JsonProperty("password") String password) {
+    this.user = user;
+    this.password = password;
+  }
 
-    @JsonProperty("user")
-    public String getUser()
-    {
-        return user;
-    }
+  @JsonProperty("user")
+  public String getUser() {
+    return user;
+  }
 
-    @JsonProperty("password")
-    public String getPassword()
-    {
-        return password;
-    }
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
 
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(user, password);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(user, password);
+  }
 
-    @Override
-    public String toString()
-    {
-        return String.format("BasicAuthOption[%s, %s]", getUser(), getPassword());
-    }
+  @Override
+  public String toString() {
+    return String.format("BasicAuthOption[%s, %s]", getUser(), getPassword());
+  }
 }

data/src/main/java/org/embulk/input/http/HttpFileInputPlugin.java

@@ -52,352 +52,330 @@ import java.util.Map;
 
 import static java.lang.String.format;
 
-public class HttpFileInputPlugin implements FileInputPlugin
-{
-    private final Logger logger = Exec.getLogger(getClass());
+public class HttpFileInputPlugin implements FileInputPlugin {
+  private final Logger logger = Exec.getLogger(getClass());
+
+  @Override
+  public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control) {
+    PluginTask task = config.loadConfig(PluginTask.class);
+
+    final int tasks;
+    if (task.getParams().isPresent()) {
+      List<List<QueryOption.Query>> queries =
+          task.getParams().get().generateQueries(task.getPager());
+      task.setQueries(queries);
+      tasks = queries.size();
+    } else if (task.getPager().isPresent()) {
+      List<List<QueryOption.Query>> queries = task.getPager().get().expand();
+      task.setQueries(queries);
+      tasks = queries.size();
+    } else {
+      task.setQueries(Lists.<List<QueryOption.Query>>newArrayList());
+      task.setRequestInterval(0);
+      tasks = 1;
+    }
 
-    public interface PluginTask extends Task
-    {
-        @Config("url")
-        String getUrl();
+    task.setHttpMethod(HttpMethod.valueOf(task.getMethod().toUpperCase()));
 
-        @Config("charset")
-        @ConfigDefault("\"utf-8\"")
-        String getCharset();
+    return resume(task.dump(), tasks, control);
+  }
 
-        @Config("method")
-        @ConfigDefault("\"get\"")
-        String getMethod();
+  @Override
+  public ConfigDiff resume(TaskSource taskSource, int taskCount, FileInputPlugin.Control control) {
+    control.run(taskSource, taskCount);
+    return Exec.newConfigDiff();
+  }
 
-        @Config("user_agent")
-        @ConfigDefault("\"Embulk::Input::HttpFileInputPlugin\"")
-        String getUserAgent();
+  @Override
+  public void cleanup(TaskSource taskSource, int taskCount, List<TaskReport> successTaskReports) {}
 
-        @Config("open_timeout")
-        @ConfigDefault("2000")
-        int getOpenTimeout();
+  @Override
+  public TransactionalFileInput open(TaskSource taskSource, int taskIndex) {
+    PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        @Config("read_timeout")
-        @ConfigDefault("10000")
-        int getReadTimeout();
+    HttpRequestBase request;
+    try {
+      request = makeRequest(task, taskIndex);
+    } catch (URISyntaxException | UnsupportedEncodingException e) {
+      throw Throwables.propagate(e);
+    }
 
-        @Config("max_retries")
-        @ConfigDefault("5")
-        int getMaxRetries();
+    HttpClientBuilder builder =
+        HttpClientBuilder.create()
+            .disableAutomaticRetries()
+            .setDefaultRequestConfig(makeRequestConfig(task))
+            .setDefaultHeaders(makeHeaders(task));
 
-        @Config("retry_interval")
-        @ConfigDefault("10000")
-        int getRetryInterval();
+    if (task.getBasicAuth().isPresent()) {
+      builder.setDefaultCredentialsProvider(
+          makeCredentialsProvider(task.getBasicAuth().get(), request));
+    }
 
-        @Config("request_interval")
-        @ConfigDefault("0")
-        int getRequestInterval();
+    HttpClient client = builder.build();
+
+    logger.info(
+        format(
+            Locale.ENGLISH,
+            "%s \"%s\"",
+            task.getMethod().toUpperCase(),
+            request.getURI().toString()));
+
+    RetryableHandler retryable = new RetryableHandler(client, request);
+    long startTimeMills = System.currentTimeMillis();
+    try {
+      RetryExecutor.retryExecutor()
+          .withRetryLimit(task.getMaxRetries())
+          .withInitialRetryWait(task.getRetryInterval())
+          .withMaxRetryWait(30 * 60 * 1000)
+          .runInterruptible(retryable);
+
+      InputStream stream = retryable.getResponse().getEntity().getContent();
+      if (!task.getInputDirect()) {
+        stream = copyToFile(stream);
+      }
+
+      PluginFileInput input = new PluginFileInput(task, stream, startTimeMills);
+      stream = null;
+      return input;
+    } catch (Exception e) {
+      throw Throwables.propagate(e);
+    }
+  }
 
-        void setRequestInterval(int requestInterval);
+  private InputStream copyToFile(InputStream input) throws IOException {
+    File tmpfile = Files.createTempFile("embulk-input-http.", ".tmp").toFile();
+    tmpfile.deleteOnExit();
 
-        @Config("interval_includes_response_time")
-        @ConfigDefault("null")
-        boolean getIntervalIncludesResponseTime();
+    try (FileOutputStream output = new FileOutputStream(tmpfile)) {
+      logger.info(format(Locale.ENGLISH, "Writing response to %s", tmpfile));
+      IOUtils.copy(input, output);
+    } finally {
+      input.close();
+    }
 
-        @Config("input_direct")
-        @ConfigDefault("true")
-        boolean getInputDirect();
+    return new FileInputStream(tmpfile);
+  }
+
+  private CredentialsProvider makeCredentialsProvider(
+      BasicAuthOption basicAuth, HttpRequestBase request) {
+    final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+    final AuthScope authScope =
+        new AuthScope(request.getURI().getHost(), request.getURI().getPort());
+    credentialsProvider.setCredentials(
+        authScope, new UsernamePasswordCredentials(basicAuth.getUser(), basicAuth.getPassword()));
+    return credentialsProvider;
+  }
+
+  private HttpRequestBase makeRequest(PluginTask task, int taskIndex)
+      throws URISyntaxException, UnsupportedEncodingException {
+    final List<QueryOption.Query> queries =
+        (task.getQueries().isEmpty()) ? null : task.getQueries().get(taskIndex);
+    if (task.getHttpMethod() == HttpMethod.GET) {
+      HttpGet request = new HttpGet(task.getUrl());
+      if (queries != null) {
+        URIBuilder builder = new URIBuilder(request.getURI());
+        for (QueryOption.Query q : queries) {
+          for (String v : q.getValues()) {
+            builder.addParameter(q.getName(), v);
+          }
+        }
+        request.setURI(builder.build());
+      }
+      return request;
+    }
+    if (task.getHttpMethod() == HttpMethod.POST) {
+      HttpPost request = new HttpPost(task.getUrl());
+      if (queries != null) {
+        List<NameValuePair> pairs = new ArrayList<>();
+        for (QueryOption.Query q : queries) {
+          for (String v : q.getValues()) {
+            pairs.add(new BasicNameValuePair(q.getName(), v));
+          }
+        }
+        request.setEntity(new UrlEncodedFormEntity(pairs));
+      } else if (task.getRequestBody().isPresent()) {
+        logger.info(new StringEntity(task.getRequestBody().get()).toString());
+        request.setEntity(new StringEntity(task.getRequestBody().get()));
+      }
+      return request;
+    }
+    throw new IllegalArgumentException(
+        String.format("Unsupported http method %s", task.getMethod()));
+  }
+
+  private List<Header> makeHeaders(PluginTask task) {
+    List<Header> headers = new ArrayList<>();
+    headers.add(new BasicHeader("Accept", "*/*"));
+    headers.add(new BasicHeader("Accept-Charset", task.getCharset()));
+    headers.add(new BasicHeader("Accept-Encoding", "gzip, deflate"));
+    headers.add(new BasicHeader("Accept-Language", "en-us,en;q=0.5"));
+    headers.add(new BasicHeader("User-Agent", task.getUserAgent()));
+    for (Map.Entry<String, String> entry : task.getRequestHeaders().entrySet()) {
+      headers.add(new BasicHeader(entry.getKey(), entry.getValue()));
+    }
+    return headers;
+  }
 
-        @Config("params")
-        @ConfigDefault("null")
-        Optional<ParamsOption> getParams();
+  private RequestConfig makeRequestConfig(PluginTask task) {
+    return RequestConfig.custom()
+        .setCircularRedirectsAllowed(true)
+        .setMaxRedirects(10)
+        .setRedirectsEnabled(true)
+        .setConnectTimeout(task.getOpenTimeout())
+        .setSocketTimeout(task.getReadTimeout())
+        .build();
+  }
 
-        @Config("request_body")
-        @ConfigDefault("null")
-        Optional<String> getRequestBody();
+  public enum HttpMethod {
+    POST,
+    GET
+  }
 
-        @Config("basic_auth")
-        @ConfigDefault("null")
-        Optional<BasicAuthOption> getBasicAuth();
+  public interface PluginTask extends Task {
+    @Config("url")
+    String getUrl();
 
-        @Config("pager")
-        @ConfigDefault("null")
-        Optional<PagerOption> getPager();
+    @Config("charset")
+    @ConfigDefault("\"utf-8\"")
+    String getCharset();
 
-        @Config("request_headers")
-        @ConfigDefault("{}")
-        Map<String, String> getRequestHeaders();
+    @Config("method")
+    @ConfigDefault("\"get\"")
+    String getMethod();
 
-        @ConfigInject
-        BufferAllocator getBufferAllocator();
+    @Config("user_agent")
+    @ConfigDefault("\"Embulk::Input::HttpFileInputPlugin\"")
+    String getUserAgent();
 
-        List<List<QueryOption.Query>> getQueries();
+    @Config("open_timeout")
+    @ConfigDefault("2000")
+    int getOpenTimeout();
 
-        void setQueries(List<List<QueryOption.Query>> queries);
+    @Config("read_timeout")
+    @ConfigDefault("10000")
+    int getReadTimeout();
 
-        HttpMethod getHttpMethod();
+    @Config("max_retries")
+    @ConfigDefault("5")
+    int getMaxRetries();
 
-        void setHttpMethod(HttpMethod httpMethod);
-    }
+    @Config("retry_interval")
+    @ConfigDefault("10000")
+    int getRetryInterval();
 
-    public enum HttpMethod
-    {
-        POST,
-        GET
-    }
+    @Config("request_interval")
+    @ConfigDefault("0")
+    int getRequestInterval();
 
-    @Override
-    public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control)
-    {
-        PluginTask task = config.loadConfig(PluginTask.class);
-
-        final int tasks;
-        if (task.getParams().isPresent()) {
-            List<List<QueryOption.Query>> queries = task.getParams().get().generateQueries(task.getPager());
-            task.setQueries(queries);
-            tasks = queries.size();
-        }
-        else if (task.getPager().isPresent()) {
-            List<List<QueryOption.Query>> queries = task.getPager().get().expand();
-            task.setQueries(queries);
-            tasks = queries.size();
-        }
-        else {
-            task.setQueries(Lists.<List<QueryOption.Query>>newArrayList());
-            task.setRequestInterval(0);
-            tasks = 1;
-        }
+    void setRequestInterval(int requestInterval);
 
-        task.setHttpMethod(HttpMethod.valueOf(task.getMethod().toUpperCase()));
+    @Config("interval_includes_response_time")
+    @ConfigDefault("null")
+    boolean getIntervalIncludesResponseTime();
 
-        return resume(task.dump(), tasks, control);
-    }
+    @Config("input_direct")
+    @ConfigDefault("true")
+    boolean getInputDirect();
 
-    @Override
-    public ConfigDiff resume(TaskSource taskSource, int taskCount, FileInputPlugin.Control control)
-    {
-        control.run(taskSource, taskCount);
-        return Exec.newConfigDiff();
-    }
+    @Config("params")
+    @ConfigDefault("null")
+    Optional<ParamsOption> getParams();
 
-    @Override
-    public void cleanup(TaskSource taskSource, int taskCount, List<TaskReport> successTaskReports)
-    {
-    }
+    @Config("request_body")
+    @ConfigDefault("null")
+    Optional<String> getRequestBody();
 
-    @Override
-    public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
-    {
-        PluginTask task = taskSource.loadTask(PluginTask.class);
+    @Config("basic_auth")
+    @ConfigDefault("null")
+    Optional<BasicAuthOption> getBasicAuth();
 
-        HttpRequestBase request;
-        try {
-            request = makeRequest(task, taskIndex);
-        }
-        catch (URISyntaxException | UnsupportedEncodingException e) {
-            throw Throwables.propagate(e);
-        }
+    @Config("pager")
+    @ConfigDefault("null")
+    Optional<PagerOption> getPager();
 
-        HttpClientBuilder builder = HttpClientBuilder.create()
-                .disableAutomaticRetries()
-                .setDefaultRequestConfig(makeRequestConfig(task))
-                .setDefaultHeaders(makeHeaders(task));
+    @Config("request_headers")
+    @ConfigDefault("{}")
+    Map<String, String> getRequestHeaders();
 
-        if (task.getBasicAuth().isPresent()) {
-            builder.setDefaultCredentialsProvider(makeCredentialsProvider(task.getBasicAuth().get(), request));
-        }
+    @ConfigInject
+    BufferAllocator getBufferAllocator();
 
-        HttpClient client = builder.build();
+    List<List<QueryOption.Query>> getQueries();
 
-        logger.info(format(Locale.ENGLISH, "%s \"%s\"", task.getMethod().toUpperCase(), request.getURI().toString()));
+    void setQueries(List<List<QueryOption.Query>> queries);
 
-        RetryableHandler retryable = new RetryableHandler(client, request);
-        long startTimeMills = System.currentTimeMillis();
-        try {
-            RetryExecutor.retryExecutor().
-                    withRetryLimit(task.getMaxRetries()).
-                    withInitialRetryWait(task.getRetryInterval()).
-                    withMaxRetryWait(30 * 60 * 1000).
-                    runInterruptible(retryable);
-
-            InputStream stream = retryable.getResponse().getEntity().getContent();
-            if (!task.getInputDirect()) {
-                stream = copyToFile(stream);
-            }
-
-            PluginFileInput input = new PluginFileInput(task, stream, startTimeMills);
-            stream = null;
-            return input;
-        }
-        catch (Exception e) {
-            throw Throwables.propagate(e);
-        }
-    }
+    HttpMethod getHttpMethod();
 
-    private InputStream copyToFile(InputStream input)
-            throws IOException
-    {
-        File tmpfile = Files.createTempFile("embulk-input-http.", ".tmp").toFile();
-        tmpfile.deleteOnExit();
-
-        try (FileOutputStream output = new FileOutputStream(tmpfile)) {
-            logger.info(format(Locale.ENGLISH, "Writing response to %s", tmpfile));
-            IOUtils.copy(input, output);
-        } finally {
-            input.close();
-        }
+    void setHttpMethod(HttpMethod httpMethod);
+  }
 
-        return new FileInputStream(tmpfile);
-    }
+  public static class PluginFileInput extends InputStreamFileInput
+      implements TransactionalFileInput {
+    private final Logger logger = Exec.getLogger(getClass());
 
-    private CredentialsProvider makeCredentialsProvider(BasicAuthOption basicAuth, HttpRequestBase request)
-    {
-        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-        final AuthScope authScope = new AuthScope(request.getURI().getHost(),
-                request.getURI().getPort());
-        credentialsProvider.setCredentials(authScope,
-                new UsernamePasswordCredentials(basicAuth.getUser(), basicAuth.getPassword()));
-        return credentialsProvider;
-    }
+    private final long startTimeMills;
+    private final PluginTask task;
 
-    private HttpRequestBase makeRequest(PluginTask task, int taskIndex)
-            throws URISyntaxException, UnsupportedEncodingException
-    {
-        final List<QueryOption.Query> queries = (task.getQueries().isEmpty()) ?
-                null : task.getQueries().get(taskIndex);
-        if (task.getHttpMethod() == HttpMethod.GET) {
-            HttpGet request = new HttpGet(task.getUrl());
-            if (queries != null) {
-                URIBuilder builder = new URIBuilder(request.getURI());
-                for (QueryOption.Query q : queries) {
-                    for (String v : q.getValues()) {
-                        builder.addParameter(q.getName(), v);
-                    }
-                }
-                request.setURI(builder.build());
-            }
-            return request;
-        }
-        if (task.getHttpMethod() == HttpMethod.POST) {
-            HttpPost request = new HttpPost(task.getUrl());
-            if (queries != null) {
-                List<NameValuePair> pairs = new ArrayList<>();
-                for (QueryOption.Query q : queries) {
-                    for (String v : q.getValues()) {
-                        pairs.add(new BasicNameValuePair(q.getName(), v));
-                    }
-                }
-                request.setEntity(new UrlEncodedFormEntity(pairs));
-            }
-            else if (task.getRequestBody().isPresent()) {
-                logger.info(new StringEntity(task.getRequestBody().get()).toString());
-                request.setEntity(new StringEntity(task.getRequestBody().get()));
-            }
-            return request;
-        }
-        throw new IllegalArgumentException(String.format("Unsupported http method %s", task.getMethod()));
+    public PluginFileInput(PluginTask task, InputStream stream, long startTimeMills) {
+      super(task.getBufferAllocator(), new SingleFileProvider(stream));
+      this.startTimeMills = startTimeMills;
+      this.task = task;
     }
 
-    private List<Header> makeHeaders(PluginTask task)
-    {
-        List<Header> headers = new ArrayList<>();
-        headers.add(new BasicHeader("Accept", "*/*"));
-        headers.add(new BasicHeader("Accept-Charset", task.getCharset()));
-        headers.add(new BasicHeader("Accept-Encoding", "gzip, deflate"));
-        headers.add(new BasicHeader("Accept-Language", "en-us,en;q=0.5"));
-        headers.add(new BasicHeader("User-Agent", task.getUserAgent()));
-        for (Map.Entry<String, String> entry : task.getRequestHeaders().entrySet()) {
-            headers.add(new BasicHeader(entry.getKey(), entry.getValue()));
-        }
-        return headers;
+    public TaskReport commit() {
+      return Exec.newTaskReport();
     }
 
-    private RequestConfig makeRequestConfig(PluginTask task)
-    {
-        return RequestConfig.custom()
-                .setCircularRedirectsAllowed(true)
-                .setMaxRedirects(10)
-                .setRedirectsEnabled(true)
-                .setConnectTimeout(task.getOpenTimeout())
-                .setSocketTimeout(task.getReadTimeout())
-                .build();
+    @Override
+    public void close() {
+      super.close();
+      handleInterval();
     }
 
-    public static class PluginFileInput extends InputStreamFileInput
-            implements TransactionalFileInput
-    {
-        private final Logger logger = Exec.getLogger(getClass());
-
-        private final long startTimeMills;
-        private final PluginTask task;
-
-        public PluginFileInput(PluginTask task, InputStream stream, long startTimeMills)
-        {
-            super(task.getBufferAllocator(), new SingleFileProvider(stream));
-            this.startTimeMills = startTimeMills;
-            this.task = task;
-        }
-
-        public TaskReport commit()
-        {
-            return Exec.newTaskReport();
+    @Override
+    public void abort() {}
+
+    protected void handleInterval() {
+      if (task.getRequestInterval() <= 0) {
+        return;
+      }
+      long interval = task.getRequestInterval();
+      if (task.getIntervalIncludesResponseTime()) {
+        interval = interval - (System.currentTimeMillis() - startTimeMills);
+      }
+      if (interval > 0) {
+        logger.info(String.format("waiting %d msec ...", interval));
+        try {
+          Thread.sleep(interval);
+        } catch (InterruptedException e) {
+          throw Throwables.propagate(e);
         }
+      }
+    }
 
-        @Override
-        public void close()
-        {
-            super.close();
-            handleInterval();
-        }
+    private static class SingleFileProvider implements InputStreamFileInput.Provider {
+      private final InputStream stream;
+      private boolean opened = false;
 
-        @Override
-        public void abort()
-        {
-        }
+      public SingleFileProvider(InputStream stream) {
+        this.stream = stream;
+      }
 
-        protected void handleInterval()
-        {
-            if (task.getRequestInterval() <= 0) {
-                return;
-            }
-            long interval = task.getRequestInterval();
-            if (task.getIntervalIncludesResponseTime()) {
-                interval = interval - (System.currentTimeMillis() - startTimeMills);
-            }
-            if (interval > 0) {
-                logger.info(String.format("waiting %d msec ...", interval));
-                try {
-                    Thread.sleep(interval);
-                }
-                catch (InterruptedException e) {
-                    throw Throwables.propagate(e);
-                }
-            }
+      @Override
+      public InputStream openNext() throws IOException {
+        if (opened) {
+          return null;
         }
-
-        private static class SingleFileProvider
-                implements InputStreamFileInput.Provider
-        {
-            private final InputStream stream;
-            private boolean opened = false;
-
-            public SingleFileProvider(InputStream stream)
-            {
-                this.stream = stream;
-            }
-
-            @Override
-            public InputStream openNext() throws IOException
-            {
-                if (opened) {
-                    return null;
-                }
-                opened = true;
-                return stream;
-            }
-
-            @Override
-            public void close() throws IOException
-            {
-                if (!opened) {
-                    stream.close();
-                }
-            }
+        opened = true;
+        return stream;
+      }
+
+      @Override
+      public void close() throws IOException {
+        if (!opened) {
+          stream.close();
         }
+      }
     }
+  }
 }