Merge pull request #12 from franden/generic_war_name

thanks for your contribution!

Author: AdamBien

src/main/java/com/airhacks/wad/boundary/WADFlow.java

@@ -15,6 +15,7 @@
 import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
 import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.LongSummaryStatistics;
 import java.util.concurrent.atomic.AtomicLong;
@@ -26,15 +27,15 @@
  * @author airhacks.com
  */
 public class WADFlow {
-    private final List<Long> buildTimes;
+    private final Collection<Long> buildTimes;
 
     private final AtomicLong successCounter = new AtomicLong();
     private final AtomicLong buildErrorCounter = new AtomicLong();
 
     private final Copier copier;
     private final Builder builder;
 
-    public WADFlow(Path dir, Path war, List<Path> deploymentTargets) throws IOException {
+    public WADFlow(Path dir, Path war, Collection<Path> deploymentTargets) throws IOException {
         this.builder = new Builder();
         this.buildTimes = new ArrayList<>();
         this.copier = new Copier(war, deploymentTargets);

src/main/java/com/airhacks/wad/control/Copier.java

@@ -6,8 +6,12 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.LongSummaryStatistics;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  *
@@ -16,17 +20,15 @@
 public class Copier {
 
     private List<Long> warSizes;
-    private final List<Path> deploymentTargets;
-    private final Path from;
+    private final Collection<Path> deploymentTargetDirectories;
+    private final Path fromDirectory;
 
-    public Copier(Path from, List<Path> deploymentTargets) {
+    public Copier(Path from, Collection<Path> deploymentTargetDirectories) {
         this.warSizes = new ArrayList<>();
-        this.from = from;
-        this.deploymentTargets = deploymentTargets;
+        this.fromDirectory = from;
+        this.deploymentTargetDirectories = deploymentTargetDirectories;
     }
 
-
-
     String shortenForDisplay(Path path, int maxLength) {
         String message = path.toString();
         int length = message.length();
@@ -38,15 +40,36 @@ String shortenForDisplay(Path path, int maxLength) {
     }
 
     public void copy() {
-        deploymentTargets.forEach(target -> copySingle(this.from, target));
+        Path warPath = findWarInPath(this.fromDirectory).orElseThrow(() -> new IllegalStateException("war file was not found in the path"));
+        List<Path> copyTargets = addWarName(deploymentTargetDirectories, warPath.getFileName().toString());
+        copyTargets.forEach(target -> copySingle(warPath, target));
+    }
+
+    Optional<Path> findWarInPath(Path fromDirectory) {
+        try (Stream<Path> stream = Files.walk(fromDirectory, 1)) {
+            return stream
+                .filter(file -> !Files.isDirectory(file) && file.getFileName().toString().endsWith(".war"))
+                .findFirst();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    List<Path> addWarName(Collection<Path> deploymentDirectories, String warName) {
+        return deploymentDirectories.
+            stream().
+            map(path -> path.resolve(warName)).
+            collect(Collectors.toList());
     }
 
     Path copySingle(Path from, Path to) {
         long kb;
         try {
             kb = Files.size(from) / 1024;
             warSizes.add(kb);
-            System.out.printf("Copying %dkB ThinWAR to %s %s %s \n", kb, TerminalColors.FILE.value(), shortenForDisplay(to, 40), TerminalColors.RESET.value());
+            System.out.printf("Copying %dkB ThinWAR %s to %s %s %s \n", kb,  from.toString(), TerminalColors.FILE.value(), shortenForDisplay(to, 40), TerminalColors.RESET.value());
             return Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
 
         } catch (IOException ex) {

src/main/java/wad/App.java

@@ -1,10 +1,11 @@
 
 package wad;
 
-import com.airhacks.wad.boundary.WADFlow;
-import com.airhacks.wad.control.Configurator;
 import static com.airhacks.wad.control.PreBuildChecks.pomExists;
 import static com.airhacks.wad.control.PreBuildChecks.validateDeploymentDirectories;
+
+import com.airhacks.wad.boundary.WADFlow;
+import com.airhacks.wad.control.Configurator;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,12 +46,6 @@ static List<Path> convert(String[] args) {
         return Arrays.stream(args).map(App::addTrailingSlash).collect(Collectors.toList());
     }
 
-    static List<Path> addWarName(Set<Path> deploymentDirectories, String warName) {
-        return deploymentDirectories.
-                stream().
-                map(path -> path.resolve(warName)).
-                collect(Collectors.toList());
-    }
 
 
     public static void main(String[] args) throws IOException {
@@ -60,19 +55,15 @@ public static void main(String[] args) throws IOException {
             System.exit(-1);
         }
         pomExists();
-        Path currentPath = Paths.get("").toAbsolutePath();
-        Path currentDirectory = currentPath.getFileName();
-        String thinWARName = currentDirectory + ".war";
 
-        Path thinWARPath = Paths.get("target", thinWARName);
+        Path thinWARPath = Paths.get("target");
 
         Set<Path> deploymentDirs = Configurator.getConfiguredFolders(convert(args));
         validateDeploymentDirectories(deploymentDirs);
 
-        List<Path> deploymentTargets = addWarName(deploymentDirs, thinWARName);
         Path sourceCodeDir = Paths.get("./src/main/");
-        System.out.printf("WAD is watching %s, deploying %s to %s \n", sourceCodeDir, thinWARPath, deploymentTargets);
-        WADFlow wadFlow = new WADFlow(sourceCodeDir, thinWARPath, deploymentTargets);
+        System.out.printf("WAD is watching %s, deploying from dir '%s' to %s \n", sourceCodeDir, thinWARPath, deploymentDirs);
+        WADFlow wadFlow = new WADFlow(sourceCodeDir, thinWARPath, deploymentDirs);
     }
 
 }

src/test/java/com/airhacks/wad/control/CopierTest.java

@@ -0,0 +1,20 @@
+package com.airhacks.wad.control;
+
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+import org.junit.Test;
+
+public class CopierTest {
+
+    @Test
+    public void testFindWarInPath() {
+
+        Path path = Paths.get("src/test/resources/result");
+        Optional<Path> warInPath = new Copier(null, null).findWarInPath(path);
+        assertTrue(warInPath.isPresent());
+        assertTrue(warInPath.get().getFileName().endsWith("myApp_1.0.0-SNAPSHOT.war"));
+    }
+}

src/test/java/wad/AppTest.java

@@ -1,9 +1,11 @@
 package wad;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.junit.Test;
 
 /**
@@ -21,14 +23,13 @@ public void currentFolderFolderName() {
 
     @Test
     public void addTrailingSlash() {
-        String expected = "/";
+        String expected = File.separator;
 
         String actual = App.addTrailingSlash("").toString();
         assertThat(actual, is(expected));
 
-        actual = App.addTrailingSlash("/").toString();
+        actual = App.addTrailingSlash(File.separator).toString();
         assertThat(actual, is(expected));
     }
 
-
 }