Timeout in RuntimeExecutor is now set from Application configuration

Instead of just hardcoding a default wait time to get the process return code,
we now use the Application#timeout configuration.

Related to jcgay/gradle-notifier#7

Author: jcgay

send-notification/pom.xml

@@ -118,6 +118,12 @@
             <version>1.58</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.objenesis</groupId>
+            <artifactId>objenesis</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

send-notification/src/main/java/fr/jcgay/notification/NotifierProvider.java

@@ -85,10 +85,10 @@ public DiscoverableNotifier byName(ChosenNotifiers notifier, Properties properti
             return new GrowlNotifier(application, GrowlConfiguration.create(properties), ERROR);
         }
         if (NOTIFICATION_CENTER.equals(notifier)) {
-            return new TerminalNotifier(application, TerminalNotifierConfiguration.create(properties), new RuntimeExecutor());
+            return new TerminalNotifier(application, TerminalNotifierConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (NOTIFY_SEND.equals(notifier)) {
-            return new NotifySendNotifier(application, NotifySendConfiguration.create(properties), new RuntimeExecutor());
+            return new NotifySendNotifier(application, NotifySendConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (PUSHBULLET.equals(notifier)) {
             return new PushbulletNotifier(application, PushbulletConfiguration.create(properties));
@@ -100,19 +100,19 @@ public DiscoverableNotifier byName(ChosenNotifiers notifier, Properties properti
             return new SystemTrayNotifier(application);
         }
         if (NOTIFU.equals(notifier)) {
-            return new NotifuNotifier(application, NotifuConfiguration.create(properties), new RuntimeExecutor());
+            return new NotifuNotifier(application, NotifuConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (KDIALOG.equals(notifier)) {
-            return new KdialogNotifier(application, KdialogConfiguration.create(properties), new RuntimeExecutor());
+            return new KdialogNotifier(application, KdialogConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (ANYBAR.equals(notifier)) {
             return AnyBarNotifier.create(application, AnyBarConfiguration.create(properties));
         }
         if (SIMPLE_NOTIFICATION_CENTER.equals(notifier)) {
-            return new SimpleNotificationCenterNotifier(TerminalNotifierConfiguration.create(properties), new RuntimeExecutor());
+            return new SimpleNotificationCenterNotifier(TerminalNotifierConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (TOASTER.equals(notifier)) {
-            return new ToasterNotifier(ToasterConfiguration.create(properties), new RuntimeExecutor());
+            return new ToasterNotifier(ToasterConfiguration.create(properties), new RuntimeExecutor(application.timeout()));
         }
         if (NOTIFY.equals(notifier)) {
             return new NotifyNotifier(application, NotifyConfiguration.create(properties));

send-notification/src/main/java/fr/jcgay/notification/notifier/executor/RuntimeExecutor.java

@@ -23,14 +23,20 @@
 public class RuntimeExecutor implements Executor {
 
     private static final Logger LOGGER = getLogger(RuntimeExecutor.class);
+    private static final int DEFAULT_WAIT_PROCESS_TIMEOUT = 200;
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private final long timeout;
+
+    public RuntimeExecutor(long timeout) {
+        this.timeout = timeout == -1 ? DEFAULT_WAIT_PROCESS_TIMEOUT : timeout;
+    }
 
     @Override
     public void exec(final String[] command) {
 
         if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Will execute command line: {}", logCommand(command));
+            LOGGER.debug("Will execute command line: {} (waiting at most: {} milliseconds)", logCommand(command), timeout);
         }
 
         Future<Integer> task = executor.submit(new Callable<Integer>() {
@@ -62,7 +68,7 @@ public Integer call() {
         });
 
         try {
-            task.get(200, MILLISECONDS);
+            task.get(timeout, MILLISECONDS);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw Throwables.propagate(e);

send-notification/src/test/groovy/fr/jcgay/notification/NotifierProviderSpec.groovy

@@ -38,7 +38,7 @@ class NotifierProviderSpec extends Specification {
         then:
         assertThat(result).containsExactly(
             new GrowlNotifier(application, GrowlConfiguration.byDefault(), DEBUG),
-            new TerminalNotifier(application, TerminalNotifierConfiguration.byDefault(), new RuntimeExecutor()),
+            new TerminalNotifier(application, TerminalNotifierConfiguration.byDefault(), new RuntimeExecutor(application.timeout())),
             new SystemTrayNotifier(application)
         )
     }
@@ -54,7 +54,7 @@ class NotifierProviderSpec extends Specification {
         assertThat(result).containsExactly(
             new SnarlNotifier(application, SnarlConfiguration.byDefault()),
             new GrowlNotifier(application, GrowlConfiguration.byDefault(), DEBUG),
-            new ToasterNotifier(ToasterConfiguration.byDefault(), new RuntimeExecutor()),
+            new ToasterNotifier(ToasterConfiguration.byDefault(), new RuntimeExecutor(application.timeout())),
             new BurntToastNotifier(application, BurntToastNotifierConfiguration.byDefault()),
             new SystemTrayNotifier(application)
         )
@@ -69,8 +69,8 @@ class NotifierProviderSpec extends Specification {
 
         then:
         assertThat(result).containsExactly(
-            new KdialogNotifier(application, KdialogConfiguration.byDefault(), new RuntimeExecutor()),
-            new NotifySendNotifier(application, NotifySendConfiguration.byDefault(), new RuntimeExecutor()),
+            new KdialogNotifier(application, KdialogConfiguration.byDefault(), new RuntimeExecutor(application.timeout())),
+            new NotifySendNotifier(application, NotifySendConfiguration.byDefault(), new RuntimeExecutor(application.timeout())),
             new SystemTrayNotifier(application)
         )
     }