Allow customization of ChannelFsmConfigBuilder (#116)

fixes #115

Author: kevinherron

modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/client/NettyClientTransportConfig.java

@@ -2,6 +2,7 @@
 
 import com.digitalpetri.modbus.Modbus;
 import com.digitalpetri.modbus.tcp.Netty;
+import com.digitalpetri.netty.fsm.ChannelFsmConfigBuilder;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
@@ -26,6 +27,8 @@
  *     Bootstrap}.
  * @param pipelineCustomizer a {@link Consumer} that can be used to customize the Netty {@link
  *     ChannelPipeline}.
+ * @param channelFsmCustomizer a {@link Consumer} that can be used to customize the {@link
+ *     ChannelFsmConfigBuilder}.
  * @param tlsEnabled whether to enable TLS (Modbus/TCP Security).
  * @param keyManagerFactory the {@link KeyManagerFactory} to use if TLS is enabled.
  * @param trustManagerFactory the {@link TrustManagerFactory} to use if TLS is enabled.
@@ -40,6 +43,7 @@ public record NettyClientTransportConfig(
     ExecutorService executor,
     Consumer<Bootstrap> bootstrapCustomizer,
     Consumer<ChannelPipeline> pipelineCustomizer,
+    Consumer<ChannelFsmConfigBuilder> channelFsmCustomizer,
     boolean tlsEnabled,
     Optional<KeyManagerFactory> keyManagerFactory,
     Optional<TrustManagerFactory> trustManagerFactory) {
@@ -94,6 +98,9 @@ public static class Builder {
     /** A {@link Consumer} that can be used to customize the Netty {@link ChannelPipeline}. */
     public Consumer<ChannelPipeline> pipelineCustomizer = p -> {};
 
+    /** A {@link Consumer} that can be used to customize the {@link ChannelFsmConfigBuilder}. */
+    public Consumer<ChannelFsmConfigBuilder> channelFsmCustomizer = c -> {};
+
     /** Whether to enable TLS (Modbus/TCP Security). */
     public boolean tlsEnabled = false;
 
@@ -206,6 +213,18 @@ public Builder setPipelineCustomizer(Consumer<ChannelPipeline> pipelineCustomize
       return this;
     }
 
+    /**
+     * Set the {@link Consumer} that can be used to customize the {@link ChannelFsmConfigBuilder}.
+     *
+     * @param channelFsmCustomizer the {@link Consumer} that can be used to customize the {@link
+     *     ChannelFsmConfigBuilder}.
+     * @return this Builder.
+     */
+    public Builder setChannelFsmCustomizer(Consumer<ChannelFsmConfigBuilder> channelFsmCustomizer) {
+      this.channelFsmCustomizer = channelFsmCustomizer;
+      return this;
+    }
+
     /**
      * Set whether to enable TLS (Modbus/TCP Security).
      *
@@ -271,6 +290,7 @@ public NettyClientTransportConfig build() {
           executor,
           bootstrapCustomizer,
           pipelineCustomizer,
+          channelFsmCustomizer,
           tlsEnabled,
           Optional.ofNullable(keyManagerFactory),
           Optional.ofNullable(trustManagerFactory));

modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/client/NettyRtuClientTransport.java

@@ -9,13 +9,8 @@
 import com.digitalpetri.modbus.client.ModbusRtuClientTransport;
 import com.digitalpetri.modbus.internal.util.ExecutionQueue;
 import com.digitalpetri.modbus.tcp.client.NettyTcpClientTransport.ConnectionListener;
-import com.digitalpetri.netty.fsm.ChannelActions;
-import com.digitalpetri.netty.fsm.ChannelFsm;
+import com.digitalpetri.netty.fsm.*;
 import com.digitalpetri.netty.fsm.ChannelFsm.TransitionListener;
-import com.digitalpetri.netty.fsm.ChannelFsmConfig;
-import com.digitalpetri.netty.fsm.ChannelFsmFactory;
-import com.digitalpetri.netty.fsm.Event;
-import com.digitalpetri.netty.fsm.State;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -61,14 +56,16 @@ public class NettyRtuClientTransport implements ModbusRtuClientTransport {
   public NettyRtuClientTransport(NettyClientTransportConfig config) {
     this.config = config;
 
-    channelFsm =
-        ChannelFsmFactory.newChannelFsm(
-            ChannelFsmConfig.newBuilder()
-                .setExecutor(config.executor())
-                .setLazy(config.reconnectLazy())
-                .setPersistent(config.connectPersistent())
-                .setChannelActions(new ModbusRtuChannelActions())
-                .build());
+    ChannelFsmConfigBuilder channelFsmConfigBuilder =
+        ChannelFsmConfig.newBuilder()
+            .setExecutor(config.executor())
+            .setLazy(config.reconnectLazy())
+            .setPersistent(config.connectPersistent())
+            .setChannelActions(new ModbusRtuChannelActions());
+
+    config.channelFsmCustomizer().accept(channelFsmConfigBuilder);
+
+    channelFsm = ChannelFsmFactory.newChannelFsm(channelFsmConfigBuilder.build());
 
     channelFsm.addTransitionListener(
         (from, to, via) -> {

modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/client/NettyTcpClientTransport.java

@@ -5,13 +5,8 @@
 import com.digitalpetri.modbus.client.ModbusTcpClientTransport;
 import com.digitalpetri.modbus.internal.util.ExecutionQueue;
 import com.digitalpetri.modbus.tcp.ModbusTcpCodec;
-import com.digitalpetri.netty.fsm.ChannelActions;
-import com.digitalpetri.netty.fsm.ChannelFsm;
+import com.digitalpetri.netty.fsm.*;
 import com.digitalpetri.netty.fsm.ChannelFsm.TransitionListener;
-import com.digitalpetri.netty.fsm.ChannelFsmConfig;
-import com.digitalpetri.netty.fsm.ChannelFsmFactory;
-import com.digitalpetri.netty.fsm.Event;
-import com.digitalpetri.netty.fsm.State;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
@@ -55,15 +50,17 @@ public class NettyTcpClientTransport implements ModbusTcpClientTransport {
   public NettyTcpClientTransport(NettyClientTransportConfig config) {
     this.config = config;
 
-    channelFsm =
-        ChannelFsmFactory.newChannelFsm(
-            ChannelFsmConfig.newBuilder()
-                .setExecutor(config.executor())
-                .setLazy(config.reconnectLazy())
-                .setPersistent(config.connectPersistent())
-                .setChannelActions(new ModbusTcpChannelActions())
-                .setLoggerName("com.digitalpetri.modbus.client.ChannelFsm")
-                .build());
+    ChannelFsmConfigBuilder channelFsmConfigBuilder =
+        ChannelFsmConfig.newBuilder()
+            .setExecutor(config.executor())
+            .setLazy(config.reconnectLazy())
+            .setPersistent(config.connectPersistent())
+            .setChannelActions(new ModbusTcpChannelActions())
+            .setLoggerName("com.digitalpetri.modbus.client.ChannelFsm");
+
+    config.channelFsmCustomizer().accept(channelFsmConfigBuilder);
+
+    channelFsm = ChannelFsmFactory.newChannelFsm(channelFsmConfigBuilder.build());
 
     executionQueue = new ExecutionQueue(config.executor());