This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 074bf3d6c97d28ffdadb45d9de5395091e6e6f74 Author: Christofer Dutz <[email protected]> AuthorDate: Tue Oct 7 15:50:35 2025 +0200 chore: Minor Java 21 cleanups --- .../java/modbus/tcp/protocol/ModbusTcpProtocolLogic.java | 13 +++++-------- .../java/org/apache/plc4x/java/spi/tag/TagConfigParser.java | 1 - 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/protocol/ModbusTcpProtocolLogic.java b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/protocol/ModbusTcpProtocolLogic.java index e1615118a9..14707b2754 100644 --- a/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/protocol/ModbusTcpProtocolLogic.java +++ b/plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/tcp/protocol/ModbusTcpProtocolLogic.java @@ -114,7 +114,7 @@ public class ModbusTcpProtocolLogic extends ModbusProtocolLogic<ModbusTcpADU> im // Example for sending a request ... if (request.getTagNames().size() == 1) { - String tagName = request.getTagNames().iterator().next(); + String tagName = request.getTagNames().getFirst(); ModbusTag tag = (ModbusTag) request.getTag(tagName); final ModbusPDU requestPdu = getReadRequestPdu(tag); final short unitId = getUnitId(tag); @@ -138,8 +138,7 @@ public class ModbusTcpProtocolLogic extends ModbusProtocolLogic<ModbusTcpADU> im PlcValue plcValue = null; PlcResponseCode responseCode; // Check if the response was an error response. - if (responsePdu instanceof ModbusPDUError) { - ModbusPDUError errorResponse = (ModbusPDUError) responsePdu; + if (responsePdu instanceof ModbusPDUError errorResponse) { responseCode = getErrorCode(errorResponse); } else { try { @@ -185,7 +184,7 @@ public class ModbusTcpProtocolLogic extends ModbusProtocolLogic<ModbusTcpADU> im // - FileRecord (read-write) --> ModbusPduWriteFileRecordRequest // 2. Split up into multiple sub-requests if (request.getTagNames().size() == 1) { - String tagName = request.getTagNames().iterator().next(); + String tagName = request.getTagNames().getFirst(); PlcTag tag = request.getTag(tagName); final ModbusPDU requestPdu = getWriteRequestPdu(tag, writeRequest.getPlcValue(tagName)); final short unitId = getUnitId(tag); @@ -207,14 +206,12 @@ public class ModbusTcpProtocolLogic extends ModbusProtocolLogic<ModbusTcpADU> im PlcResponseCode responseCode; // Check if the response was an error response. - if (responsePdu instanceof ModbusPDUError) { - ModbusPDUError errorResponse = (ModbusPDUError) responsePdu; + if (responsePdu instanceof ModbusPDUError errorResponse) { responseCode = getErrorCode(errorResponse); } else { responseCode = PlcResponseCode.OK; // TODO: Check the correct number of elements were written. - if (responsePdu instanceof ModbusPDUWriteSingleCoilResponse) { - ModbusPDUWriteSingleCoilResponse response = (ModbusPDUWriteSingleCoilResponse) responsePdu; + if (responsePdu instanceof ModbusPDUWriteSingleCoilResponse response) { ModbusPDUWriteSingleCoilRequest requestSingleCoil = (ModbusPDUWriteSingleCoilRequest) requestPdu; if (!((response.getValue() == requestSingleCoil.getValue()) && (response.getAddress() == requestSingleCoil.getAddress()))) { responseCode = PlcResponseCode.REMOTE_ERROR; diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/tag/TagConfigParser.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/tag/TagConfigParser.java index 58e026ed98..5d0585e5ec 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/tag/TagConfigParser.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/tag/TagConfigParser.java @@ -19,7 +19,6 @@ package org.apache.plc4x.java.spi.tag; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.regex.Matcher;
