Update libraries, fix new warnings

Author: bertrik

cayenne/src/main/java/nl/sikken/bertrik/cayenne/CayenneMessage.java

@@ -24,14 +24,11 @@ public CayenneMessage() {
      *               are supported.
      */
     public CayenneMessage(ECayennePayloadFormat format) {
-        switch (format) {
-            case DYNAMIC_SENSOR_PAYLOAD:
-            case PACKED_SENSOR_PAYLOAD:
-                break;
-            default:
-                throw new IllegalArgumentException("Payload format not supported: " + format);
-        }
-        this.format = format;
+        this.format = switch (format) {
+            case DYNAMIC_SENSOR_PAYLOAD -> format;
+            case PACKED_SENSOR_PAYLOAD -> format;
+            default -> throw new IllegalArgumentException("Payload format not supported: " + format);
+        };
     }
 
     /**
@@ -40,11 +37,12 @@ public CayenneMessage(ECayennePayloadFormat format) {
      * @param data the raw data
      * @throws CayenneException in case of a parsing problem
      */
+    @SuppressWarnings("StatementSwitchToExpressionSwitch")
     public void parse(byte[] data) throws CayenneException {
+        CayenneItem item;
         ByteBuffer bb = ByteBuffer.wrap(data);
         int channel = 0;
         while (bb.hasRemaining()) {
-            CayenneItem item;
             switch (format) {
                 case DYNAMIC_SENSOR_PAYLOAD:
                     item = CayenneItem.parse(bb);

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-errorprone = "2.37.0"
+errorprone = "2.38.0"
 jackson = "2.18.3"
 jersey = "3.1.10"
-junit = "5.12.1"
-mockito = "5.16.1"
+junit = "5.12.2"
+mockito = "5.17.0"
 retrofit = "2.11.0"
 slf4j = "2.0.17"
 

sensor-data-bridge/src/main/java/nl/bertriksikken/loraforwarder/CommandHandler.java

@@ -51,13 +51,10 @@ void processResponse(TtnUplinkMessage uplink) {
         ByteBuffer bb = ByteBuffer.wrap(uplink.getRawPayload()).order(ByteOrder.BIG_ENDIAN);
 
         int cmd = bb.get() & 0xFF;
-        switch (cmd) {
-            case 0:
-                executor.execute(new CatchingRunnable(LOG, () -> handleWifiLocalisation(bb, uplink.getDevId())));
-                break;
-            default:
-                LOG.warn("Unhandled command {}", cmd);
-                break;
+        if (cmd == 0) {
+            executor.execute(new CatchingRunnable(LOG, () -> handleWifiLocalisation(bb, uplink.getDevId())));
+        } else {
+            LOG.warn("Unhandled command {}", cmd);
         }
     }
 

sensor-data-bridge/src/main/java/nl/bertriksikken/loraforwarder/SensorDataBridge.java

@@ -120,6 +120,7 @@ private void messageReceived(TtnAppConfig appConfig, TtnUplinkMessage uplink) {
     }
 
     // package-private to allow testing
+    @SuppressWarnings("StatementSwitchToExpressionSwitch")
     SensorData decodeTtnMessage(DecoderConfig config, TtnUplinkMessage uplink) throws PayloadParseException {
         SensorData sensorData = new SensorData();