Apply google-java-format

Author: kevinherron

config/checkstyle/checkstyle.xml

@@ -25,8 +25,7 @@ public record SerialPortTransportConfig(
     int stopBits,
     int parity,
     boolean rs485Mode,
-    ExecutorService executor
-) {
+    ExecutorService executor) {
 
   /**
    * Create a new {@link SerialPortTransportConfig}, using the callback to configure the builder as
@@ -51,14 +50,10 @@ public static class Builder {
      */
     public String serialPort;
 
-    /**
-     * The desired baud rate to operate at.
-     */
+    /** The desired baud rate to operate at. */
     public int baudRate = 9600;
 
-    /**
-     * The number of data bits per word to use.
-     */
+    /** The number of data bits per word to use. */
     public int dataBits = 8;
 
     /**
@@ -84,8 +79,7 @@ public static class Builder {
     /**
      * Enable RS-485 mode, i.e. transmit/receive mode signaling using the RTS pin.
      *
-     * <p>This requires support from the underlying driver and may not work with all RS-485
-     * devices.
+     * <p>This requires support from the underlying driver and may not work with all RS-485 devices.
      */
     public boolean rs485Mode = false;
 
@@ -110,16 +104,7 @@ public SerialPortTransportConfig build() {
       }
 
       return new SerialPortTransportConfig(
-          serialPort,
-          baudRate,
-          dataBits,
-          stopBits,
-          parity,
-          rs485Mode,
-          executor
-      );
+          serialPort, baudRate, dataBits, stopBits, parity, rs485Mode, executor);
     }
-
   }
-
 }

config/ide/intellij-code-style.xml

@@ -41,8 +41,7 @@ public SerialPortClientTransport(SerialPortTransportConfig config) {
         config.dataBits(),
         config.stopBits(),
         config.parity(),
-        config.rs485Mode()
-    );
+        config.rs485Mode());
 
     executionQueue = new ExecutionQueue(config.executor());
   }
@@ -63,8 +62,7 @@ public synchronized CompletableFuture<Void> connect() {
         return CompletableFuture.failedFuture(
             new Exception(
                 "failed to open port '%s', lastErrorCode=%d"
-                    .formatted(config.serialPort(), serialPort.getLastErrorCode()))
-        );
+                    .formatted(config.serialPort(), serialPort.getLastErrorCode())));
       }
     }
   }
@@ -80,8 +78,7 @@ public synchronized CompletableFuture<Void> disconnect() {
         return CompletableFuture.failedFuture(
             new Exception(
                 "failed to close port '%s', lastErrorCode=%d"
-                    .formatted(config.serialPort(), serialPort.getLastErrorCode()))
-        );
+                    .formatted(config.serialPort(), serialPort.getLastErrorCode())));
       }
     } else {
       return CompletableFuture.completedFuture(null);
@@ -136,9 +133,7 @@ public void resetFrameParser() {
 
   private class ModbusRtuDataListener implements SerialPortDataListener {
 
-    /**
-     * Bit mask indicating what events we're interested in.
-     */
+    /** Bit mask indicating what events we're interested in. */
     private static final int LISTENING_EVENTS = SerialPort.LISTENING_EVENT_DATA_RECEIVED;
 
     @Override
@@ -173,24 +168,21 @@ private void onFrameReceived(ModbusRtuFrame frame) {
         executionQueue.submit(() -> frameReceiver.accept(frame));
       }
     }
-
   }
 
   /**
    * Create a new {@link SerialPortClientTransport} with a callback that allows customizing the
    * configuration.
    *
-   * @param configure a {@link Consumer} that accepts a
-   *     {@link SerialPortTransportConfig.Builder} instance to configure.
+   * @param configure a {@link Consumer} that accepts a {@link SerialPortTransportConfig.Builder}
+   *     instance to configure.
    * @return a new {@link SerialPortClientTransport}.
    */
   public static SerialPortClientTransport create(
-      Consumer<SerialPortTransportConfig.Builder> configure
-  ) {
+      Consumer<SerialPortTransportConfig.Builder> configure) {
 
     var builder = new SerialPortTransportConfig.Builder();
     configure.accept(builder);
     return new SerialPortClientTransport(builder.build());
   }
-
 }

modbus-serial/src/main/java/com/digitalpetri/modbus/serial/SerialPortTransportConfig.java

@@ -49,8 +49,7 @@ public SerialPortServerTransport(SerialPortTransportConfig config) {
         config.dataBits(),
         config.stopBits(),
         config.parity(),
-        config.rs485Mode()
-    );
+        config.rs485Mode());
 
     executionQueue = new ExecutionQueue(config.executor());
   }
@@ -70,8 +69,7 @@ public CompletionStage<Void> bind() {
         return CompletableFuture.failedFuture(
             new Exception(
                 "failed to open port '%s', lastErrorCode=%d"
-                    .formatted(config.serialPort(), serialPort.getLastErrorCode()))
-        );
+                    .formatted(config.serialPort(), serialPort.getLastErrorCode())));
       }
     }
   }
@@ -87,8 +85,7 @@ public CompletionStage<Void> unbind() {
         return CompletableFuture.failedFuture(
             new Exception(
                 "failed to close port '%s', lastErrorCode=%d"
-                    .formatted(config.serialPort(), serialPort.getLastErrorCode()))
-        );
+                    .formatted(config.serialPort(), serialPort.getLastErrorCode())));
       }
     } else {
       return CompletableFuture.completedFuture(null);
@@ -102,9 +99,7 @@ public void receive(FrameReceiver<ModbusRtuRequestContext, ModbusRtuFrame> frame
 
   private class ModbusRtuDataListener implements SerialPortDataListener {
 
-    /**
-     * Bit mask indicating what events we're interested in.
-     */
+    /** Bit mask indicating what events we're interested in. */
     private static final int LISTENING_EVENTS = SerialPort.LISTENING_EVENT_DATA_RECEIVED;
 
     @Override
@@ -138,56 +133,54 @@ private void onFrameReceived(ModbusRtuFrame requestFrame) {
           SerialPortServerTransport.this.frameReceiver.get();
 
       if (frameReceiver != null) {
-        executionQueue.submit(() -> {
-          try {
-            ModbusRtuFrame responseFrame =
-                frameReceiver.receive(new ModbusRtuRequestContext() {}, requestFrame);
-
-            int unitId = responseFrame.unitId();
-            ByteBuffer pdu = responseFrame.pdu();
-            ByteBuffer crc = responseFrame.crc();
-
-            byte[] data = new byte[1 + pdu.remaining() + crc.remaining()];
-            data[0] = (byte) unitId;
-            pdu.get(data, 1, pdu.remaining());
-            crc.get(data, data.length - 2, crc.remaining());
-
-            int totalWritten = 0;
-            while (totalWritten < data.length) {
-              int written = serialPort.writeBytes(data, data.length - totalWritten, totalWritten);
-              if (written == -1) {
-                logger.error("Error writing frame to serial port");
-
-                return;
+        executionQueue.submit(
+            () -> {
+              try {
+                ModbusRtuFrame responseFrame =
+                    frameReceiver.receive(new ModbusRtuRequestContext() {}, requestFrame);
+
+                int unitId = responseFrame.unitId();
+                ByteBuffer pdu = responseFrame.pdu();
+                ByteBuffer crc = responseFrame.crc();
+
+                byte[] data = new byte[1 + pdu.remaining() + crc.remaining()];
+                data[0] = (byte) unitId;
+                pdu.get(data, 1, pdu.remaining());
+                crc.get(data, data.length - 2, crc.remaining());
+
+                int totalWritten = 0;
+                while (totalWritten < data.length) {
+                  int written =
+                      serialPort.writeBytes(data, data.length - totalWritten, totalWritten);
+                  if (written == -1) {
+                    logger.error("Error writing frame to serial port");
+
+                    return;
+                  }
+                  totalWritten += written;
+                }
+              } catch (UnknownUnitIdException e) {
+                logger.debug("Ignoring request for unknown unit id: {}", requestFrame.unitId());
+              } catch (Exception e) {
+                logger.error("Error handling frame: {}", e.getMessage(), e);
               }
-              totalWritten += written;
-            }
-          } catch (UnknownUnitIdException e) {
-            logger.debug("Ignoring request for unknown unit id: {}", requestFrame.unitId());
-          } catch (Exception e) {
-            logger.error("Error handling frame: {}", e.getMessage(), e);
-          }
-        });
+            });
       }
     }
-
   }
 
   /**
    * Create a new {@link SerialPortServerTransport} with a callback that allows customizing the
    * configuration.
    *
-   * @param configure a {@link Consumer} that accepts a
-   *     {@link SerialPortTransportConfig.Builder} instance to configure.
+   * @param configure a {@link Consumer} that accepts a {@link SerialPortTransportConfig.Builder}
+   *     instance to configure.
    * @return a new {@link SerialPortServerTransport}.
    */
-  public static SerialPortServerTransport create(
-      Consumer<Builder> configure
-  ) {
+  public static SerialPortServerTransport create(Consumer<Builder> configure) {
 
     var builder = new SerialPortTransportConfig.Builder();
     configure.accept(builder);
     return new SerialPortServerTransport(builder.build());
   }
-
 }

modbus-serial/src/main/java/com/digitalpetri/modbus/serial/client/SerialPortClientTransport.java

@@ -40,5 +40,4 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) {
       }
     }
   }
-
 }

modbus-serial/src/main/java/com/digitalpetri/modbus/serial/server/SerialPortServerTransport.java

@@ -19,35 +19,36 @@ public final class Netty {
    */
   public static synchronized NioEventLoopGroup sharedEventLoop() {
     if (EVENT_LOOP == null) {
-      ThreadFactory threadFactory = new ThreadFactory() {
-        private final AtomicLong threadNumber = new AtomicLong(0L);
-
-        @Override
-        public Thread newThread(Runnable r) {
-          Thread thread = new Thread(r,
-              "modbus-netty-event-loop-" + threadNumber.getAndIncrement());
-          thread.setDaemon(true);
-          return thread;
-        }
-      };
+      ThreadFactory threadFactory =
+          new ThreadFactory() {
+            private final AtomicLong threadNumber = new AtomicLong(0L);
+
+            @Override
+            public Thread newThread(Runnable r) {
+              Thread thread =
+                  new Thread(r, "modbus-netty-event-loop-" + threadNumber.getAndIncrement());
+              thread.setDaemon(true);
+              return thread;
+            }
+          };
 
       EVENT_LOOP = new NioEventLoopGroup(1, threadFactory);
     }
 
     return EVENT_LOOP;
   }
 
-
   /**
    * @return a shared {@link HashedWheelTimer}.
    */
   public static synchronized HashedWheelTimer sharedWheelTimer() {
     if (WHEEL_TIMER == null) {
-      ThreadFactory threadFactory = r -> {
-        Thread thread = new Thread(r, "modbus-netty-wheel-timer");
-        thread.setDaemon(true);
-        return thread;
-      };
+      ThreadFactory threadFactory =
+          r -> {
+            Thread thread = new Thread(r, "modbus-netty-wheel-timer");
+            thread.setDaemon(true);
+            return thread;
+          };
 
       WHEEL_TIMER = new HashedWheelTimer(threadFactory);
     }
@@ -81,8 +82,7 @@ public static synchronized void releaseSharedResources(long timeout, TimeUnit un
         }
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
-        LoggerFactory.getLogger(Netty.class)
-            .warn("Interrupted awaiting event loop shutdown", e);
+        LoggerFactory.getLogger(Netty.class).warn("Interrupted awaiting event loop shutdown", e);
       }
       EVENT_LOOP = null;
     }
@@ -92,5 +92,4 @@ public static synchronized void releaseSharedResources(long timeout, TimeUnit un
       WHEEL_TIMER = null;
     }
   }
-
 }