Use java 7 to close stream

vuminhkh · vuminhkh · commit 90f4aba1d107 · 2015-10-30T18:12:32.000+01:00
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.core.CompressArchiveUtil;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.command.CopyFileToContainerCmd;
-import com.google.common.io.Closeables;
 
 public class CopyFileToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd.Exec {
 
@@ -27,17 +26,19 @@ public CopyFileToContainerCmdExec(WebTarget baseResource, DockerClientConfig doc
         super(baseResource, dockerClientConfig);
     }
 
+    private InputStream buildUploadStream(CopyFileToContainerCmd command) throws IOException {
+        Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
+        CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
+        return Files.newInputStream(toUpload);
+    }
+
     @Override
     protected Void execute(CopyFileToContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("PUT: " + webResource.toString());
-        InputStream streamToUpload = null;
-        try {
-            Path toUpload = Files.createTempFile("docker-java", "tar.gz");
-            CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
-            streamToUpload = Files.newInputStream(toUpload);
+        try (InputStream streamToUpload = buildUploadStream(command)) {
             webResource
                     .queryParam("path", command.getRemotePath())
                     .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
@@ -47,11 +48,6 @@ protected Void execute(CopyFileToContainerCmd command) {
             return null;
         } catch (IOException e) {
             throw new DockerClientException("Error occurred while preparing uploading host resource <" + command.getHostResource() + ">", e);
-        } finally {
-            if (streamToUpload != null) {
-                Closeables.closeQuietly(streamToUpload);
-            }
         }
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.google.common.io.Closeables;
 
 public class CopyFileToContainerCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
@@ -52,10 +51,10 @@ public void copyToContainer() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         dockerClient.copyFileToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec();
-        boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied to the container.");
-        Closeables.closeQuietly(response);
+        try (InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec()) {
+            boolean bytesAvailable = response.available() > 0;
+            assertTrue(bytesAvailable, "The file was not copied to the container.");
+        }
     }
 
     @Test
