aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
diff options
context:
space:
mode:
Diffstat (limited to 'vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java')
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java19
1 files changed, 3 insertions, 16 deletions
diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
index d57e13b6543..185a5b8cc0f 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
@@ -5,8 +5,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -40,29 +38,18 @@ public class Compression {
ZipEntry entry = new ZipEntry(composePath(zipTopLevelDir, composePath(relativePath, child.getName())));
zipOutputStream.putNextEntry(entry);
try {
- FileInputStream fileInput = new FileInputStream(child);
- try {
- copyBytes(fileInput, zipOutputStream);
- } finally {
- fileInput.close();
+ try (FileInputStream fileInput = new FileInputStream(child)) {
+ fileInput.transferTo(zipOutputStream);
}
} finally {
zipOutputStream.closeEntry();
}
}
- public static void copyBytes(InputStream input, OutputStream output) throws IOException {
- byte[] b = new byte[1024];
- int numRead = 0;
-
- while((numRead = input.read(b)) != -1) {
- output.write(b, 0, numRead);
- }
- }
-
private static String composePath(String relativePath, String subDir) {
return relativePath.isEmpty() ?
subDir :
relativePath + File.separator + subDir;
}
+
}