From d7c3271def2cae00d287726675055e8d0a70ff7f Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Wed, 17 Apr 2019 09:58:52 +0200
Subject: Simplify

---
 .../container/plugin/mojo/ApplicationMojo.java     | 22 ++++++++--------------
 .../yahoo/container/plugin/mojo/Compression.java   | 19 +++----------------
 2 files changed, 11 insertions(+), 30 deletions(-)

(limited to 'vespa-application-maven-plugin')

diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
index bd149e5a41e..e499e8ad47b 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
@@ -36,7 +36,7 @@ public class ApplicationMojo extends AbstractMojo {
     private String destinationDir;
 
     @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoExecutionException {
         File applicationPackage = new File(project.getBasedir(), sourceDir);
         File applicationDestination = new File(project.getBasedir(), destinationDir);
         copyApplicationPackage(applicationPackage, applicationDestination);
@@ -103,13 +103,9 @@ public class ApplicationMojo extends AbstractMojo {
     private void copyModuleBundles(File moduleDir, File componentsDir) throws MojoExecutionException {
         File moduleTargetDir = new File(moduleDir, "target");
         if (moduleTargetDir.exists()) {
-            File[] bundles = moduleTargetDir.listFiles(new FilenameFilter() {
-                @Override
-                public boolean accept(File dir, String name) {
-                    return name.endsWith("-deploy.jar") || name.endsWith("-jar-with-dependencies.jar");
-                }
-            });
-
+            File[] bundles = moduleTargetDir.listFiles((dir, name) -> name.endsWith("-deploy.jar") ||
+                                                                      name.endsWith("-jar-with-dependencies.jar"));
+            if (bundles == null) return;
             for (File bundle : bundles) {
                 try {
                     copyFile(bundle, new File(componentsDir, bundle.getName()));
@@ -123,14 +119,12 @@ public class ApplicationMojo extends AbstractMojo {
     private void copyFile(File source, File destination) throws IOException {
         try (FileInputStream sourceStream = new FileInputStream(source);
              FileOutputStream destinationStream = new FileOutputStream(destination)) {
-            Compression.copyBytes(sourceStream, destinationStream);
+            sourceStream.transferTo(destinationStream);
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private <T> List<T> emptyListIfNull(List<T> modules) {
-        return modules == null ?
-                Collections.emptyList():
-                modules;
+    private static <T> List<T> emptyListIfNull(List<T> modules) {
+        return modules == null ? Collections.emptyList(): modules;
     }
+
 }
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;
     }
+
 }
-- 
cgit v1.2.3