Specify CommandDispatcher timeout as a Duration.

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcher.java

@@ -22,6 +22,7 @@
 package org.wildfly.clustering.server.dispatcher;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -68,12 +69,12 @@ public boolean needMoreResponses() {
     private final MessageDispatcher dispatcher;
     private final CommandMarshaller<C> marshaller;
     private final Group<Address> group;
-    private final long timeout;
+    private final Duration timeout;
     private final CommandDispatcher<C> localDispatcher;
     private final Runnable closeTask;
     private final Address localAddress;
 
-    public ChannelCommandDispatcher(MessageDispatcher dispatcher, CommandMarshaller<C> marshaller, Group<Address> group, long timeout, CommandDispatcher<C> localDispatcher, Runnable closeTask) {
+    public ChannelCommandDispatcher(MessageDispatcher dispatcher, CommandMarshaller<C> marshaller, Group<Address> group, Duration timeout, CommandDispatcher<C> localDispatcher, Runnable closeTask) {
         this.dispatcher = dispatcher;
         this.marshaller = marshaller;
         this.group = group;
@@ -145,7 +146,7 @@ private <R> Buffer createBuffer(Command<R, ? super C> command) {
     }
 
     private RequestOptions createRequestOptions() {
-        return new RequestOptions(ResponseMode.GET_ALL, this.timeout, false, FILTER, Message.Flag.DONT_BUNDLE, Message.Flag.OOB);
+        return new RequestOptions(ResponseMode.GET_ALL, this.timeout.toMillis(), false, FILTER, Message.Flag.DONT_BUNDLE, Message.Flag.OOB);
     }
 
     private static class PruneCancellationTask<T> implements BiConsumer<T, Throwable> {

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactory.java

@@ -25,6 +25,7 @@
 import java.io.DataInputStream;
 import java.net.InetSocketAddress;
 import java.security.PrivilegedAction;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -95,7 +96,7 @@ private static ThreadFactory createThreadFactory(Class<?> targetClass) {
     private final AtomicReference<View> view = new AtomicReference<>();
     private final MarshallingContext marshallingContext;
     private final MessageDispatcher dispatcher;
-    private final long timeout;
+    private final Duration timeout;
 
     @SuppressWarnings("resource")
     public ChannelCommandDispatcherFactory(ChannelCommandDispatcherFactoryConfiguration config) {
@@ -118,7 +119,7 @@ public ChannelCommandDispatcherFactory(ChannelCommandDispatcherFactoryConfigurat
     public void run() {
         this.executorService.shutdownNow();
         try {
-            this.executorService.awaitTermination(this.timeout, TimeUnit.MILLISECONDS);
+            this.executorService.awaitTermination(this.timeout.toMillis(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
         }
@@ -204,7 +205,7 @@ private void unregister(GroupListener listener) {
         if (executor != null) {
             executor.shutdownNow();
             try {
-                executor.awaitTermination(this.timeout, TimeUnit.MILLISECONDS);
+                executor.awaitTermination(this.timeout.toMillis(), TimeUnit.MILLISECONDS);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
             }

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactoryConfiguration.java

@@ -21,6 +21,8 @@
  */
 package org.wildfly.clustering.server.dispatcher;
 
+import java.time.Duration;
+
 import org.jgroups.JChannel;
 import org.wildfly.clustering.jgroups.spi.ChannelFactory;
 import org.wildfly.clustering.marshalling.jboss.MarshallingContext;
@@ -33,5 +35,5 @@ public interface ChannelCommandDispatcherFactoryConfiguration {
     ChannelFactory getChannelFactory();
     JChannel getChannel();
     MarshallingContext getMarshallingContext();
-    long getTimeout();
+    Duration getTimeout();
 }

clustering/server/src/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactoryServiceConfigurator.java

@@ -21,7 +21,7 @@
  */
 package org.wildfly.clustering.server.dispatcher;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -93,7 +93,7 @@ public MarshallingConfiguration apply(MarshallingConfigurationContext context) {
     private volatile SupplierDependency<JChannel> channel;
     private volatile SupplierDependency<Module> module;
     private volatile Supplier<ModuleLoader> loader;
-    private volatile long timeout = TimeUnit.MINUTES.toMillis(1);
+    private volatile Duration timeout = Duration.ofMinutes(1);
 
     public ChannelCommandDispatcherFactoryServiceConfigurator(ServiceName name, String group) {
         super(name);
@@ -122,8 +122,8 @@ public ServiceBuilder<?> build(ServiceTarget target) {
         return builder.setInstance(service).setInitialMode(ServiceController.Mode.PASSIVE);
     }
 
-    public ChannelCommandDispatcherFactoryServiceConfigurator timeout(long value, TimeUnit unit) {
-        this.timeout = unit.toMillis(value);
+    public ChannelCommandDispatcherFactoryServiceConfigurator timeout(Duration timeout) {
+        this.timeout = timeout;
         return this;
     }
 
@@ -148,7 +148,7 @@ public MarshallingContext getMarshallingContext() {
     }
 
     @Override
-    public long getTimeout() {
+    public Duration getTimeout() {
         return this.timeout;
     }