You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/04/28 10:32:46 UTC
[plc4x] branch develop updated: refactor(plc4j/s7): post merge cleanup
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new ee905808ad refactor(plc4j/s7): post merge cleanup
ee905808ad is described below
commit ee905808adf75aa30c9aae55544737214e3b5076
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Apr 28 12:32:39 2023 +0200
refactor(plc4j/s7): post merge cleanup
---
plc4j/drivers/s7/pom.xml | 14 +-
.../java/s7/readwrite/Alarm8MessageQueryType.java | 3 +-
.../readwrite/AlarmMessageAckObjectPushType.java | 3 +-
.../java/s7/readwrite/AlarmMessageAckPushType.java | 3 +-
.../s7/readwrite/AlarmMessageAckResponseType.java | 3 +-
.../java/s7/readwrite/AlarmMessageAckType.java | 3 +-
.../s7/readwrite/AlarmMessageObjectAckType.java | 3 +-
.../s7/readwrite/AlarmMessageObjectPushType.java | 3 +-
.../s7/readwrite/AlarmMessageObjectQueryType.java | 7 +-
.../java/s7/readwrite/AlarmMessagePushType.java | 3 +-
.../java/s7/readwrite/AlarmMessageQueryType.java | 3 +-
.../plc4x/java/s7/readwrite/AlarmStateType.java | 4 +-
.../apache/plc4x/java/s7/readwrite/AlarmType.java | 4 +-
.../s7/readwrite/AssociatedQueryValueType.java | 3 +-
.../java/s7/readwrite/AssociatedValueType.java | 8 +-
.../apache/plc4x/java/s7/readwrite/COTPPacket.java | 2 +-
.../s7/readwrite/COTPPacketConnectionRequest.java | 3 +-
.../s7/readwrite/COTPPacketConnectionResponse.java | 3 +-
.../plc4x/java/s7/readwrite/COTPPacketData.java | 3 +-
.../s7/readwrite/COTPPacketDisconnectRequest.java | 3 +-
.../s7/readwrite/COTPPacketDisconnectResponse.java | 3 +-
.../java/s7/readwrite/COTPPacketTpduError.java | 3 +-
.../java/s7/readwrite/COTPParameterCalledTsap.java | 2 +-
.../s7/readwrite/COTPParameterCallingTsap.java | 2 +-
.../java/s7/readwrite/COTPParameterChecksum.java | 2 +-
...TPParameterDisconnectAdditionalInformation.java | 2 +-
.../java/s7/readwrite/COTPParameterTpduSize.java | 2 +-
.../plc4x/java/s7/readwrite/COTPProtocolClass.java | 4 +-
.../plc4x/java/s7/readwrite/COTPTpduSize.java | 20 +-
.../java/s7/readwrite/CpuSubscribeEvents.java | 4 +-
.../java/s7/readwrite/CycServiceItemAnyType.java | 3 +-
.../s7/readwrite/CycServiceItemDbReadType.java | 3 +-
.../java/s7/readwrite/CycServiceItemType.java | 3 +-
.../apache/plc4x/java/s7/readwrite/DataItem.java | 84 +-
.../java/s7/readwrite/DataTransportErrorCode.java | 4 +-
.../plc4x/java/s7/readwrite/DataTransportSize.java | 20 +-
.../plc4x/java/s7/readwrite/DateAndTime.java | 8 +-
.../plc4x/java/s7/readwrite/DeviceGroup.java | 4 +-
.../apache/plc4x/java/s7/readwrite/EventType.java | 4 +-
.../apache/plc4x/java/s7/readwrite/MemoryArea.java | 24 +-
.../java/s7/readwrite/ModeTransitionType.java | 4 +-
.../apache/plc4x/java/s7/readwrite/QueryType.java | 4 +-
.../plc4x/java/s7/readwrite/S7AddressAny.java | 3 +-
.../apache/plc4x/java/s7/readwrite/S7Message.java | 15 +-
.../java/s7/readwrite/S7MessageObjectRequest.java | 3 +-
.../java/s7/readwrite/S7MessageObjectResponse.java | 3 +-
.../plc4x/java/s7/readwrite/S7MessageRequest.java | 2 +-
.../plc4x/java/s7/readwrite/S7MessageResponse.java | 3 +-
.../java/s7/readwrite/S7MessageResponseData.java | 3 +-
.../plc4x/java/s7/readwrite/S7MessageUserData.java | 2 +-
.../s7/readwrite/S7ParameterModeTransition.java | 7 +-
.../s7/readwrite/S7ParameterReadVarRequest.java | 2 +-
.../s7/readwrite/S7ParameterReadVarResponse.java | 2 +-
.../readwrite/S7ParameterSetupCommunication.java | 3 +-
.../java/s7/readwrite/S7ParameterUserData.java | 2 +-
.../S7ParameterUserDataItemCPUFunctions.java | 3 +-
.../s7/readwrite/S7ParameterWriteVarRequest.java | 2 +-
.../s7/readwrite/S7ParameterWriteVarResponse.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadAlarm8.java | 2 +-
.../java/s7/readwrite/S7PayloadAlarmAckInd.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadAlarmS.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadAlarmSC.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java | 2 +-
.../s7/readwrite/S7PayloadDiagnosticMessage.java | 3 +-
.../plc4x/java/s7/readwrite/S7PayloadNotify.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadNotify8.java | 2 +-
.../s7/readwrite/S7PayloadReadVarResponse.java | 2 +-
.../plc4x/java/s7/readwrite/S7PayloadUserData.java | 29 +-
.../java/s7/readwrite/S7PayloadUserDataItem.java | 15 +-
...erDataItemCpuFunctionAlarmAckErrorResponse.java | 2 +-
...loadUserDataItemCpuFunctionAlarmAckRequest.java | 2 +-
...oadUserDataItemCpuFunctionAlarmAckResponse.java | 3 +-
...S7PayloadUserDataItemCpuFunctionAlarmQuery.java | 3 +-
...adUserDataItemCpuFunctionAlarmQueryRequest.java | 3 +-
...dUserDataItemCpuFunctionAlarmQueryResponse.java | 2 +-
...loadUserDataItemCpuFunctionMsgSubscription.java | 3 +-
...temCpuFunctionMsgSubscriptionAlarmResponse.java | 3 +-
...rDataItemCpuFunctionMsgSubscriptionRequest.java | 3 +-
...DataItemCpuFunctionMsgSubscriptionResponse.java | 2 +-
...aItemCpuFunctionMsgSubscriptionSysResponse.java | 3 +-
...serDataItemCpuFunctionReadSzlNoDataRequest.java | 2 +-
...yloadUserDataItemCpuFunctionReadSzlRequest.java | 3 +-
...loadUserDataItemCpuFunctionReadSzlResponse.java | 2 +-
...UserDataItemCyclicServicesChangeDrivenPush.java | 3 +-
...yclicServicesChangeDrivenSubscribeResponse.java | 3 +-
...oadUserDataItemCyclicServicesErrorResponse.java | 2 +-
.../S7PayloadUserDataItemCyclicServicesPush.java | 3 +-
...UserDataItemCyclicServicesSubscribeRequest.java | 3 +-
...serDataItemCyclicServicesSubscribeResponse.java | 3 +-
...erDataItemCyclicServicesUnsubscribeRequest.java | 3 +-
...rDataItemCyclicServicesUnsubscribeResponse.java | 2 +-
.../s7/readwrite/S7PayloadWriteVarRequest.java | 2 +-
.../s7/readwrite/S7PayloadWriteVarResponse.java | 2 +-
.../java/s7/readwrite/S7VarPayloadDataItem.java | 18 +-
.../java/s7/readwrite/S7VarPayloadStatusItem.java | 2 +-
.../S7VarRequestParameterItemAddress.java | 2 +-
.../org/apache/plc4x/java/s7/readwrite/State.java | 3 +-
.../apache/plc4x/java/s7/readwrite/SubItem.java | 3 +-
.../plc4x/java/s7/readwrite/SyntaxIdType.java | 4 +-
.../plc4x/java/s7/readwrite/SzlDataTreeItem.java | 3 +-
.../org/apache/plc4x/java/s7/readwrite/SzlId.java | 3 +-
.../java/s7/readwrite/SzlModuleTypeClass.java | 4 +-
.../apache/plc4x/java/s7/readwrite/SzlSublist.java | 4 +-
.../apache/plc4x/java/s7/readwrite/TPKTPacket.java | 6 +-
.../apache/plc4x/java/s7/readwrite/TimeBase.java | 4 +-
.../plc4x/java/s7/readwrite/TransportSize.java | 338 +++---
.../apache/plc4x/java/s7/events/S7AlarmEvent.java | 11 +-
.../apache/plc4x/java/s7/events/S7CyclicEvent.java | 279 +++--
.../org/apache/plc4x/java/s7/events/S7Event.java | 2 +-
.../apache/plc4x/java/s7/readwrite/S7Driver.java | 1 -
.../readwrite/configuration/S7Configuration.java | 80 +-
.../java/s7/readwrite/context/S7DriverContext.java | 39 +-
.../optimizer/DefaultS7MessageProcessor.java | 2 +-
.../java/s7/readwrite/optimizer/S7Optimizer.java | 1 -
.../protocol/S7HAbortRequestException.java | 6 +-
.../protocol/S7HDefaultNettyPlcConnection.java | 293 +++--
.../readwrite/protocol/S7HGeneratedDriverBase.java | 72 +-
.../plc4x/java/s7/readwrite/protocol/S7HMux.java | 10 +-
.../java/s7/readwrite/protocol/S7HMuxImpl.java | 317 +++---
.../readwrite/protocol/S7ProtocolEventLogic.java | 258 +++--
.../s7/readwrite/protocol/S7ProtocolLogic.java | 1181 ++++++++++----------
.../plc4x/java/s7/readwrite/tag/S7AckTag.java | 50 +-
.../s7/readwrite/types/S7SubscriptionType.java | 2 +-
.../readwrite/utils/S7PlcSubscriptionHandle.java | 2 +-
.../java/s7/readwrite/utils/StaticHelper.java | 76 +-
.../plc4x/java/s7/utils/S7DiagnosticEventId.java | 3 +-
plc4j/drivers/s7/src/test/java/S7IoTest.java | 6 +-
plc4j/examples/plc4j-s7event/pom.xml | 4 +-
.../examples/plc4j/s7event/CycSubscription.java | 27 +-
.../examples/plc4j/s7event/EventSubscription.java | 20 +-
.../plc4x/examples/plc4j/s7event/SzlRequest.java | 49 +-
.../server/s7/protocol/S7Step7ServerAdapter.java | 17 +-
132 files changed, 1759 insertions(+), 1915 deletions(-)
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index 49cbb2ec58..6a755382f7 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -117,18 +117,18 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-spi</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-transport-tcp</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-utils-test-utils</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-code-generation-language-java</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
@@ -182,14 +182,14 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-s7</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-s7</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java
index 4783b3b23b..16d51c2632 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java
@@ -227,8 +227,7 @@ public class Alarm8MessageQueryType implements Message {
&& (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
&& (getByteCount() == that.getByteCount())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java
index 579333c9b4..c00205915d 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java
@@ -228,8 +228,7 @@ public class AlarmMessageAckObjectPushType implements Message {
&& (getNumberOfValues() == that.getNumberOfValues())
&& (getEventId() == that.getEventId())
&& (getAckStateGoing() == that.getAckStateGoing())
- && (getAckStateComing() == that.getAckStateComing())
- && true;
+ && (getAckStateComing() == that.getAckStateComing());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java
index 6aeaf270c6..c876539efc 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java
@@ -173,8 +173,7 @@ public class AlarmMessageAckPushType implements Message {
return (getTimeStamp() == that.getTimeStamp())
&& (getFunctionId() == that.getFunctionId())
&& (getNumberOfObjects() == that.getNumberOfObjects())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java
index 7d93a28b5c..c07d6e5e04 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java
@@ -145,8 +145,7 @@ public class AlarmMessageAckResponseType implements Message {
AlarmMessageAckResponseType that = (AlarmMessageAckResponseType) o;
return (getFunctionId() == that.getFunctionId())
&& (getNumberOfObjects() == that.getNumberOfObjects())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java
index 0cb1b92966..59737b40b5 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java
@@ -151,8 +151,7 @@ public class AlarmMessageAckType implements Message {
AlarmMessageAckType that = (AlarmMessageAckType) o;
return (getFunctionId() == that.getFunctionId())
&& (getNumberOfObjects() == that.getNumberOfObjects())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java
index bbbfc213c0..3e5699924b 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java
@@ -226,8 +226,7 @@ public class AlarmMessageObjectAckType implements Message {
&& (getNumberOfValues() == that.getNumberOfValues())
&& (getEventId() == that.getEventId())
&& (getAckStateGoing() == that.getAckStateGoing())
- && (getAckStateComing() == that.getAckStateComing())
- && true;
+ && (getAckStateComing() == that.getAckStateComing());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java
index 7680db5fd8..ca747fbb39 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java
@@ -301,8 +301,7 @@ public class AlarmMessageObjectPushType implements Message {
&& (getLocalState() == that.getLocalState())
&& (getAckStateGoing() == that.getAckStateGoing())
&& (getAckStateComing() == that.getAckStateComing())
- && (getAssociatedValues() == that.getAssociatedValues())
- && true;
+ && (getAssociatedValues() == that.getAssociatedValues());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java
index 49f8d6f275..71a0a27c12 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java
@@ -116,7 +116,7 @@ public class AlarmMessageObjectQueryType implements Message {
writeSimpleField("lengthDataset", lengthDataset, writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField("reserved", (int) 0x0000, writeUnsignedInt(writeBuffer, 16));
+ writeReservedField("reserved", 0x0000, writeUnsignedInt(writeBuffer, 16));
// Const Field (variableSpec)
writeConstField("variableSpec", VARIABLESPEC, writeUnsignedShort(writeBuffer, 8));
@@ -206,7 +206,7 @@ public class AlarmMessageObjectQueryType implements Message {
short lengthDataset = readSimpleField("lengthDataset", readUnsignedShort(readBuffer, 8));
Integer reservedField0 =
- readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0000);
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), 0x0000);
short variableSpec =
readConstField(
@@ -283,8 +283,7 @@ public class AlarmMessageObjectQueryType implements Message {
&& (getTimeComing() == that.getTimeComing())
&& (getValueComing() == that.getValueComing())
&& (getTimeGoing() == that.getTimeGoing())
- && (getValueGoing() == that.getValueGoing())
- && true;
+ && (getValueGoing() == that.getValueGoing());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java
index a34b68b163..9daf84cf76 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java
@@ -173,8 +173,7 @@ public class AlarmMessagePushType implements Message {
return (getTimeStamp() == that.getTimeStamp())
&& (getFunctionId() == that.getFunctionId())
&& (getNumberOfObjects() == that.getNumberOfObjects())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java
index 4174c08510..0fde3a8a83 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java
@@ -228,8 +228,7 @@ public class AlarmMessageQueryType implements Message {
&& (getNumberOfObjects() == that.getNumberOfObjects())
&& (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
- && (getMessageObjects() == that.getMessageObjects())
- && true;
+ && (getMessageObjects() == that.getMessageObjects());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java
index 10f555fd92..f72bcfe127 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java
@@ -35,11 +35,11 @@ public enum AlarmStateType {
static {
map = new HashMap<>();
for (AlarmStateType value : AlarmStateType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
AlarmStateType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
index a11a660508..405ce16768 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java
@@ -32,11 +32,11 @@ public enum AlarmType {
static {
map = new HashMap<>();
for (AlarmType value : AlarmType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
AlarmType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java
index 035fc29fea..ae57330e6f 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java
@@ -185,8 +185,7 @@ public class AssociatedQueryValueType implements Message {
return (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
&& (getValueLength() == that.getValueLength())
- && (getData() == that.getData())
- && true;
+ && (getData() == that.getData());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java
index 8b09036137..097efac56a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java
@@ -171,9 +171,8 @@ public class AssociatedValueType implements Message {
"valueLength",
readBuffer,
() ->
- (int)
- (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.RightShift3(
- readBuffer, transportSize)));
+ org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.RightShift3(
+ readBuffer, transportSize));
List<Short> data =
readCountArrayField(
@@ -201,8 +200,7 @@ public class AssociatedValueType implements Message {
return (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
&& (getValueLength() == that.getValueLength())
- && (getData() == that.getData())
- && true;
+ && (getData() == that.getData());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacket.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacket.java
index 6d4f3cd49b..852c83af69 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacket.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacket.java
@@ -217,7 +217,7 @@ public abstract class COTPPacket implements Message {
return false;
}
COTPPacket that = (COTPPacket) o;
- return (getParameters() == that.getParameters()) && (getPayload() == that.getPayload()) && true;
+ return (getParameters() == that.getParameters()) && (getPayload() == that.getPayload());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java
index afe5079f62..4363756b54 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java
@@ -180,8 +180,7 @@ public class COTPPacketConnectionRequest extends COTPPacket implements Message {
return (getDestinationReference() == that.getDestinationReference())
&& (getSourceReference() == that.getSourceReference())
&& (getProtocolClass() == that.getProtocolClass())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java
index 5fb6eb696e..bd040f1fc8 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java
@@ -180,8 +180,7 @@ public class COTPPacketConnectionResponse extends COTPPacket implements Message
return (getDestinationReference() == that.getDestinationReference())
&& (getSourceReference() == that.getSourceReference())
&& (getProtocolClass() == that.getProtocolClass())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java
index 3b56645300..681782c829 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java
@@ -140,8 +140,7 @@ public class COTPPacketData extends COTPPacket implements Message {
COTPPacketData that = (COTPPacketData) o;
return (getEot() == that.getEot())
&& (getTpduRef() == that.getTpduRef())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java
index 7a30250683..9dc7d2c555 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java
@@ -180,8 +180,7 @@ public class COTPPacketDisconnectRequest extends COTPPacket implements Message {
return (getDestinationReference() == that.getDestinationReference())
&& (getSourceReference() == that.getSourceReference())
&& (getProtocolClass() == that.getProtocolClass())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java
index cf4df50c21..9e557ff70a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java
@@ -148,8 +148,7 @@ public class COTPPacketDisconnectResponse extends COTPPacket implements Message
COTPPacketDisconnectResponse that = (COTPPacketDisconnectResponse) o;
return (getDestinationReference() == that.getDestinationReference())
&& (getSourceReference() == that.getSourceReference())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java
index 1cfaf8cf3c..da7cb509df 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java
@@ -146,8 +146,7 @@ public class COTPPacketTpduError extends COTPPacket implements Message {
COTPPacketTpduError that = (COTPPacketTpduError) o;
return (getDestinationReference() == that.getDestinationReference())
&& (getRejectCause() == that.getRejectCause())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java
index 2a9f41aa98..a97513636a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java
@@ -123,7 +123,7 @@ public class COTPParameterCalledTsap extends COTPParameter implements Message {
return false;
}
COTPParameterCalledTsap that = (COTPParameterCalledTsap) o;
- return (getTsapId() == that.getTsapId()) && super.equals(that) && true;
+ return (getTsapId() == that.getTsapId()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java
index bcbaf50457..4211f49e6a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java
@@ -123,7 +123,7 @@ public class COTPParameterCallingTsap extends COTPParameter implements Message {
return false;
}
COTPParameterCallingTsap that = (COTPParameterCallingTsap) o;
- return (getTsapId() == that.getTsapId()) && super.equals(that) && true;
+ return (getTsapId() == that.getTsapId()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java
index 23e0ceff57..fc516e6c37 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java
@@ -123,7 +123,7 @@ public class COTPParameterChecksum extends COTPParameter implements Message {
return false;
}
COTPParameterChecksum that = (COTPParameterChecksum) o;
- return (getCrc() == that.getCrc()) && super.equals(that) && true;
+ return (getCrc() == that.getCrc()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java
index b4a61e8774..6508e9e9ac 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java
@@ -127,7 +127,7 @@ public class COTPParameterDisconnectAdditionalInformation extends COTPParameter
}
COTPParameterDisconnectAdditionalInformation that =
(COTPParameterDisconnectAdditionalInformation) o;
- return (getData() == that.getData()) && super.equals(that) && true;
+ return (getData() == that.getData()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java
index 4cb45b96b8..cf20981940 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java
@@ -133,7 +133,7 @@ public class COTPParameterTpduSize extends COTPParameter implements Message {
return false;
}
COTPParameterTpduSize that = (COTPParameterTpduSize) o;
- return (getTpduSize() == that.getTpduSize()) && super.equals(that) && true;
+ return (getTpduSize() == that.getTpduSize()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java
index fd6ab7effd..bb31ba6154 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java
@@ -34,11 +34,11 @@ public enum COTPProtocolClass {
static {
map = new HashMap<>();
for (COTPProtocolClass value : COTPProtocolClass.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
COTPProtocolClass(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java
index f428cfee9b..254da400b9 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java
@@ -26,24 +26,24 @@ import java.util.Map;
// Code generated by code-generation. DO NOT EDIT.
public enum COTPTpduSize {
- SIZE_128((short) 0x07, (int) 128),
- SIZE_256((short) 0x08, (int) 256),
- SIZE_512((short) 0x09, (int) 512),
- SIZE_1024((short) 0x0a, (int) 1024),
- SIZE_2048((short) 0x0b, (int) 2048),
- SIZE_4096((short) 0x0c, (int) 4096),
- SIZE_8192((short) 0x0d, (int) 8192);
+ SIZE_128((short) 0x07, 128),
+ SIZE_256((short) 0x08, 256),
+ SIZE_512((short) 0x09, 512),
+ SIZE_1024((short) 0x0a, 1024),
+ SIZE_2048((short) 0x0b, 2048),
+ SIZE_4096((short) 0x0c, 4096),
+ SIZE_8192((short) 0x0d, 8192);
private static final Map<Short, COTPTpduSize> map;
static {
map = new HashMap<>();
for (COTPTpduSize value : COTPTpduSize.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
- private int sizeInBytes;
+ private final short value;
+ private final int sizeInBytes;
COTPTpduSize(short value, int sizeInBytes) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java
index b9cb3f0610..49d7b2b46d 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java
@@ -33,11 +33,11 @@ public enum CpuSubscribeEvents {
static {
map = new HashMap<>();
for (CpuSubscribeEvents value : CpuSubscribeEvents.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
CpuSubscribeEvents(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java
index 82cfa394db..09235c5a5d 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java
@@ -224,8 +224,7 @@ public class CycServiceItemAnyType extends CycServiceItemType implements Message
&& (getDbNumber() == that.getDbNumber())
&& (getMemoryArea() == that.getMemoryArea())
&& (getAddress() == that.getAddress())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java
index c2ca696f02..3d0b52a2ca 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java
@@ -150,8 +150,7 @@ public class CycServiceItemDbReadType extends CycServiceItemType implements Mess
CycServiceItemDbReadType that = (CycServiceItemDbReadType) o;
return (getNumberOfAreas() == that.getNumberOfAreas())
&& (getItems() == that.getItems())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java
index c7c6af1d4e..69ba9b16b7 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java
@@ -170,8 +170,7 @@ public abstract class CycServiceItemType implements Message {
}
CycServiceItemType that = (CycServiceItemType) o;
return (getByteLength() == that.getByteLength())
- && (getSyntaxId() == that.getSyntaxId())
- && true;
+ && (getSyntaxId() == that.getSyntaxId());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
index 7c5fb803ef..5d13999934 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java
@@ -163,18 +163,16 @@ public class DataItem {
// Manual Field (value)
String value =
- (String)
- (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.parseS7String(
- readBuffer, stringLength, "UTF-8"));
+ org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.parseS7String(
+ readBuffer, stringLength, "UTF-8");
return new PlcSTRING(value);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_WSTRING")) { // STRING
// Manual Field (value)
String value =
- (String)
- (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.parseS7String(
- readBuffer, stringLength, "UTF-16"));
+ org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.parseS7String(
+ readBuffer, stringLength, "UTF-16");
return new PlcSTRING(value);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME")) { // TIME
@@ -271,91 +269,91 @@ public class DataItem {
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort(
"", 7, ((Number) (short) 0x00).shortValue());
// Simple Field (value)
- boolean value = (boolean) _value.getBoolean();
+ boolean value = _value.getBoolean();
/*TODO: migrate me*/
- /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (value));
+ /*TODO: migrate me*/ writeBuffer.writeBit("", value);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_BYTE")) { // BYTE
// Simple Field (value)
- short value = (short) _value.getShort();
+ short value = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (value)).shortValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_WORD")) { // WORD
// Simple Field (value)
- int value = (int) _value.getInt();
+ int value = _value.getInt();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 16, ((Number) (value)).intValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DWORD")) { // DWORD
// Simple Field (value)
- long value = (long) _value.getLong();
+ long value = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 32, ((Number) (value)).longValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_LWORD")) { // LWORD
// Simple Field (value)
- BigInteger value = (BigInteger) _value.getBigInteger();
+ BigInteger value = _value.getBigInteger();
/*TODO: migrate me*/
- /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, (BigInteger) (value));
+ /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, value);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_SINT")) { // SINT
// Simple Field (value)
- byte value = (byte) _value.getByte();
+ byte value = _value.getByte();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeSignedByte("", 8, ((Number) (value)).byteValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_USINT")) { // USINT
// Simple Field (value)
- short value = (short) _value.getShort();
+ short value = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (value)).shortValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_INT")) { // INT
// Simple Field (value)
- short value = (short) _value.getShort();
+ short value = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeShort("", 16, ((Number) (value)).shortValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_UINT")) { // UINT
// Simple Field (value)
- int value = (int) _value.getInt();
+ int value = _value.getInt();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 16, ((Number) (value)).intValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DINT")) { // DINT
// Simple Field (value)
- int value = (int) _value.getInt();
+ int value = _value.getInt();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeInt("", 32, ((Number) (value)).intValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_UDINT")) { // UDINT
// Simple Field (value)
- long value = (long) _value.getLong();
+ long value = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 32, ((Number) (value)).longValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_LINT")) { // LINT
// Simple Field (value)
- long value = (long) _value.getLong();
+ long value = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeLong("", 64, ((Number) (value)).longValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_ULINT")) { // ULINT
// Simple Field (value)
- BigInteger value = (BigInteger) _value.getBigInteger();
+ BigInteger value = _value.getBigInteger();
/*TODO: migrate me*/
- /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, (BigInteger) (value));
+ /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, value);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_REAL")) { // REAL
// Simple Field (value)
- float value = (float) _value.getFloat();
+ float value = _value.getFloat();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeFloat("", 32, (value));
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_LREAL")) { // LREAL
// Simple Field (value)
- double value = (double) _value.getDouble();
+ double value = _value.getDouble();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeDouble("", 64, (value));
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_CHAR")) { // CHAR
// Simple Field (value)
- String value = (String) _value.getString();
+ String value = _value.getString();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeString(
- "", 8, (String) (value), WithOption.WithEncoding("UTF-8"));
+ "", 8, value, WithOption.WithEncoding("UTF-8"));
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_WCHAR")) { // CHAR
// Simple Field (value)
- String value = (String) _value.getString();
+ String value = _value.getString();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeString(
- "", 16, (String) (value), WithOption.WithEncoding("UTF-16"));
+ "", 16, value, WithOption.WithEncoding("UTF-16"));
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_STRING")) { // STRING
// Manual Field (value)
org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.serializeS7String(
@@ -366,65 +364,65 @@ public class DataItem {
writeBuffer, _value, stringLength, "UTF-16");
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME")) { // TIME
// Simple Field (milliseconds)
- long milliseconds = (long) _value.getLong();
+ long milliseconds = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedLong(
"", 32, ((Number) (milliseconds)).longValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_LTIME")) { // LTIME
// Simple Field (nanoseconds)
- BigInteger nanoseconds = (BigInteger) _value.getBigInteger();
+ BigInteger nanoseconds = _value.getBigInteger();
/*TODO: migrate me*/
- /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, (BigInteger) (nanoseconds));
+ /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 64, nanoseconds);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DATE")) { // DATE
// Simple Field (daysSinceSiemensEpoch)
- int daysSinceSiemensEpoch = (int) _value.getInt();
+ int daysSinceSiemensEpoch = _value.getInt();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedInt(
"", 16, ((Number) (daysSinceSiemensEpoch)).intValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_TIME_OF_DAY")) { // TIME_OF_DAY
// Simple Field (millisecondsSinceMidnight)
- long millisecondsSinceMidnight = (long) _value.getLong();
+ long millisecondsSinceMidnight = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedLong(
"", 32, ((Number) (millisecondsSinceMidnight)).longValue());
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_LTIME_OF_DAY")) { // LTIME_OF_DAY
// Simple Field (nanosecondsSinceMidnight)
- BigInteger nanosecondsSinceMidnight = (BigInteger) _value.getBigInteger();
+ BigInteger nanosecondsSinceMidnight = _value.getBigInteger();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger(
- "", 64, (BigInteger) (nanosecondsSinceMidnight));
+ "", 64, nanosecondsSinceMidnight);
} else if (EvaluationHelper.equals(dataProtocolId, "IEC61131_DATE_AND_TIME")) { // DATE_AND_TIME
// Simple Field (year)
- int year = (int) _value.getInt();
+ int year = _value.getInt();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 16, ((Number) (year)).intValue());
// Simple Field (month)
- short month = (short) _value.getShort();
+ short month = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (month)).shortValue());
// Simple Field (day)
- short day = (short) _value.getShort();
+ short day = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (day)).shortValue());
// Simple Field (dayOfWeek)
- short dayOfWeek = (short) _value.getShort();
+ short dayOfWeek = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort(
"", 8, ((Number) (dayOfWeek)).shortValue());
// Simple Field (hour)
- short hour = (short) _value.getShort();
+ short hour = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (hour)).shortValue());
// Simple Field (minutes)
- short minutes = (short) _value.getShort();
+ short minutes = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (minutes)).shortValue());
// Simple Field (seconds)
- short seconds = (short) _value.getShort();
+ short seconds = _value.getShort();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (seconds)).shortValue());
// Simple Field (nanoseconds)
- long nanoseconds = (long) _value.getLong();
+ long nanoseconds = _value.getLong();
/*TODO: migrate me*/
/*TODO: migrate me*/ writeBuffer.writeUnsignedLong(
"", 32, ((Number) (nanoseconds)).longValue());
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java
index 160a36c0ed..a281e0d13a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java
@@ -35,11 +35,11 @@ public enum DataTransportErrorCode {
static {
map = new HashMap<>();
for (DataTransportErrorCode value : DataTransportErrorCode.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
DataTransportErrorCode(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java
index 130f5f063d..eb18281fa5 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java
@@ -26,24 +26,24 @@ import java.util.Map;
// Code generated by code-generation. DO NOT EDIT.
public enum DataTransportSize {
- NULL((short) 0x00, (boolean) false),
- BIT((short) 0x03, (boolean) true),
- BYTE_WORD_DWORD((short) 0x04, (boolean) true),
- INTEGER((short) 0x05, (boolean) true),
- DINTEGER((short) 0x06, (boolean) false),
- REAL((short) 0x07, (boolean) false),
- OCTET_STRING((short) 0x09, (boolean) false);
+ NULL((short) 0x00, false),
+ BIT((short) 0x03, true),
+ BYTE_WORD_DWORD((short) 0x04, true),
+ INTEGER((short) 0x05, true),
+ DINTEGER((short) 0x06, false),
+ REAL((short) 0x07, false),
+ OCTET_STRING((short) 0x09, false);
private static final Map<Short, DataTransportSize> map;
static {
map = new HashMap<>();
for (DataTransportSize value : DataTransportSize.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
- private boolean sizeInBits;
+ private final short value;
+ private final boolean sizeInBits;
DataTransportSize(short value, boolean sizeInBits) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java
index 26fa8d9a10..78e9519d93 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java
@@ -257,9 +257,8 @@ public class DateAndTime implements Message {
"msec",
readBuffer,
() ->
- (int)
- (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.S7msecToInt(
- readBuffer)));
+ org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.S7msecToInt(
+ readBuffer));
byte dow = readSimpleField("dow", readUnsignedByte(readBuffer, 4));
@@ -286,8 +285,7 @@ public class DateAndTime implements Message {
&& (getMinutes() == that.getMinutes())
&& (getSeconds() == that.getSeconds())
&& (getMsec() == that.getMsec())
- && (getDow() == that.getDow())
- && true;
+ && (getDow() == that.getDow());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java
index 4fb8727c33..8f75200966 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java
@@ -32,11 +32,11 @@ public enum DeviceGroup {
static {
map = new HashMap<>();
for (DeviceGroup value : DeviceGroup.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
DeviceGroup(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java
index 1d9931cc3e..08e3c81ce0 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java
@@ -34,11 +34,11 @@ public enum EventType {
static {
map = new HashMap<>();
for (EventType value : EventType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
EventType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
index 0a244f9910..b44a071b68 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
@@ -26,26 +26,26 @@ import java.util.Map;
// Code generated by code-generation. DO NOT EDIT.
public enum MemoryArea {
- COUNTERS((short) 0x1C, (String) "C"),
- TIMERS((short) 0x1D, (String) "T"),
- DIRECT_PERIPHERAL_ACCESS((short) 0x80, (String) "D"),
- INPUTS((short) 0x81, (String) "I"),
- OUTPUTS((short) 0x82, (String) "Q"),
- FLAGS_MARKERS((short) 0x83, (String) "M"),
- DATA_BLOCKS((short) 0x84, (String) "DB"),
- INSTANCE_DATA_BLOCKS((short) 0x85, (String) "DBI"),
- LOCAL_DATA((short) 0x86, (String) "LD");
+ COUNTERS((short) 0x1C, "C"),
+ TIMERS((short) 0x1D, "T"),
+ DIRECT_PERIPHERAL_ACCESS((short) 0x80, "D"),
+ INPUTS((short) 0x81, "I"),
+ OUTPUTS((short) 0x82, "Q"),
+ FLAGS_MARKERS((short) 0x83, "M"),
+ DATA_BLOCKS((short) 0x84, "DB"),
+ INSTANCE_DATA_BLOCKS((short) 0x85, "DBI"),
+ LOCAL_DATA((short) 0x86, "LD");
private static final Map<Short, MemoryArea> map;
static {
map = new HashMap<>();
for (MemoryArea value : MemoryArea.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
- private String shortName;
+ private final short value;
+ private final String shortName;
MemoryArea(short value, String shortName) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java
index f31562b730..1f93308c82 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java
@@ -38,11 +38,11 @@ public enum ModeTransitionType {
static {
map = new HashMap<>();
for (ModeTransitionType value : ModeTransitionType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
ModeTransitionType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java
index 7a6eaf3204..eee2947d12 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java
@@ -33,11 +33,11 @@ public enum QueryType {
static {
map = new HashMap<>();
for (QueryType value : QueryType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
QueryType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java
index 5fc9b8f111..c5bf1d56d5 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java
@@ -250,8 +250,7 @@ public class S7AddressAny extends S7Address implements Message {
&& (getArea() == that.getArea())
&& (getByteAddress() == that.getByteAddress())
&& (getBitAddress() == that.getBitAddress())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java
index 4fc347ccb6..02cbb166ef 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java
@@ -87,7 +87,7 @@ public abstract class S7Message implements Message {
writeDiscriminatorField("messageType", getMessageType(), writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField("reserved", (int) 0x0000, writeUnsignedInt(writeBuffer, 16));
+ writeReservedField("reserved", 0x0000, writeUnsignedInt(writeBuffer, 16));
// Simple Field (tpduReference)
writeSimpleField("tpduReference", tpduReference, writeUnsignedInt(writeBuffer, 16));
@@ -95,12 +95,12 @@ public abstract class S7Message implements Message {
// Implicit Field (parameterLength) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
int parameterLength =
- (int) ((((getParameter()) != (null)) ? getParameter().getLengthInBytes() : 0));
+ (((getParameter()) != (null)) ? getParameter().getLengthInBytes() : 0);
writeImplicitField("parameterLength", parameterLength, writeUnsignedInt(writeBuffer, 16));
// Implicit Field (payloadLength) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- int payloadLength = (int) ((((getPayload()) != (null)) ? getPayload().getLengthInBytes() : 0));
+ int payloadLength = (((getPayload()) != (null)) ? getPayload().getLengthInBytes() : 0);
writeImplicitField("payloadLength", payloadLength, writeUnsignedInt(writeBuffer, 16));
// Switch field (Serialize the sub-type)
@@ -177,7 +177,7 @@ public abstract class S7Message implements Message {
short messageType = readDiscriminatorField("messageType", readUnsignedShort(readBuffer, 8));
Integer reservedField0 =
- readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0000);
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), 0x0000);
int tpduReference = readSimpleField("tpduReference", readUnsignedInt(readBuffer, 16));
@@ -209,7 +209,7 @@ public abstract class S7Message implements Message {
readOptionalField(
"parameter",
new DataReaderComplexDefault<>(
- () -> S7Parameter.staticParse(readBuffer, (short) (messageType)), readBuffer),
+ () -> S7Parameter.staticParse(readBuffer, messageType), readBuffer),
(parameterLength) > (0));
S7Payload payload =
@@ -218,7 +218,7 @@ public abstract class S7Message implements Message {
new DataReaderComplexDefault<>(
() ->
S7Payload.staticParse(
- readBuffer, (short) (messageType), (S7Parameter) (parameter)),
+ readBuffer, messageType, parameter),
readBuffer),
(payloadLength) > (0));
@@ -243,8 +243,7 @@ public abstract class S7Message implements Message {
S7Message that = (S7Message) o;
return (getTpduReference() == that.getTpduReference())
&& (getParameter() == that.getParameter())
- && (getPayload() == that.getPayload())
- && true;
+ && (getPayload() == that.getPayload());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java
index 4c85600d34..7d8cac1fc7 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java
@@ -237,8 +237,7 @@ public class S7MessageObjectRequest extends S7DataAlarmMessage implements Messag
return (getSyntaxId() == that.getSyntaxId())
&& (getQueryType() == that.getQueryType())
&& (getAlarmType() == that.getAlarmType())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java
index 36bf1cea70..cc043aa319 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java
@@ -177,8 +177,7 @@ public class S7MessageObjectResponse extends S7DataAlarmMessage implements Messa
S7MessageObjectResponse that = (S7MessageObjectResponse) o;
return (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java
index a4b77504ea..91898f5acf 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java
@@ -102,7 +102,7 @@ public class S7MessageRequest extends S7Message implements Message {
return false;
}
S7MessageRequest that = (S7MessageRequest) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java
index 722f168b01..7af10bcdb6 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java
@@ -145,8 +145,7 @@ public class S7MessageResponse extends S7Message implements Message {
S7MessageResponse that = (S7MessageResponse) o;
return (getErrorClass() == that.getErrorClass())
&& (getErrorCode() == that.getErrorCode())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java
index e41e0e2ff3..b2e46a3dd3 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java
@@ -146,8 +146,7 @@ public class S7MessageResponseData extends S7Message implements Message {
S7MessageResponseData that = (S7MessageResponseData) o;
return (getErrorClass() == that.getErrorClass())
&& (getErrorCode() == that.getErrorCode())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java
index f9a557b4a2..bab370c649 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java
@@ -103,7 +103,7 @@ public class S7MessageUserData extends S7Message implements Message {
return false;
}
S7MessageUserData that = (S7MessageUserData) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java
index b65cb58a2e..833ee78db8 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java
@@ -95,7 +95,7 @@ public class S7ParameterModeTransition extends S7Parameter implements Message {
writeBuffer.pushContext("S7ParameterModeTransition");
// Reserved Field (reserved)
- writeReservedField("reserved", (int) 0x0010, writeUnsignedInt(writeBuffer, 16));
+ writeReservedField("reserved", 0x0010, writeUnsignedInt(writeBuffer, 16));
// Implicit Field (itemLength) (Used for parsing, but its value is not stored as it's implicitly
// given by the objects content)
@@ -164,7 +164,7 @@ public class S7ParameterModeTransition extends S7Parameter implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Integer reservedField0 =
- readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0010);
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), 0x0010);
short itemLength = readImplicitField("itemLength", readUnsignedShort(readBuffer, 8));
@@ -227,8 +227,7 @@ public class S7ParameterModeTransition extends S7Parameter implements Message {
&& (getCpuFunctionGroup() == that.getCpuFunctionGroup())
&& (getCurrentMode() == that.getCurrentMode())
&& (getSequenceNumber() == that.getSequenceNumber())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java
index 4ca78328cf..6521817d37 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java
@@ -147,7 +147,7 @@ public class S7ParameterReadVarRequest extends S7Parameter implements Message {
return false;
}
S7ParameterReadVarRequest that = (S7ParameterReadVarRequest) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java
index 18f8428caa..dd24485d6c 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java
@@ -127,7 +127,7 @@ public class S7ParameterReadVarResponse extends S7Parameter implements Message {
return false;
}
S7ParameterReadVarResponse that = (S7ParameterReadVarResponse) o;
- return (getNumItems() == that.getNumItems()) && super.equals(that) && true;
+ return (getNumItems() == that.getNumItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java
index 4e12e06c3d..c0f74fd152 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java
@@ -172,8 +172,7 @@ public class S7ParameterSetupCommunication extends S7Parameter implements Messag
return (getMaxAmqCaller() == that.getMaxAmqCaller())
&& (getMaxAmqCallee() == that.getMaxAmqCallee())
&& (getPduLength() == that.getPduLength())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java
index aa681aade7..d306864400 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java
@@ -146,7 +146,7 @@ public class S7ParameterUserData extends S7Parameter implements Message {
return false;
}
S7ParameterUserData that = (S7ParameterUserData) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java
index 03c8bafb7c..d2331febcc 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java
@@ -309,8 +309,7 @@ public class S7ParameterUserDataItemCPUFunctions extends S7ParameterUserDataItem
&& (getDataUnitReferenceNumber() == that.getDataUnitReferenceNumber())
&& (getLastDataUnit() == that.getLastDataUnit())
&& (getErrorCode() == that.getErrorCode())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java
index 88985ee3a6..32bb7b96ec 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java
@@ -147,7 +147,7 @@ public class S7ParameterWriteVarRequest extends S7Parameter implements Message {
return false;
}
S7ParameterWriteVarRequest that = (S7ParameterWriteVarRequest) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java
index 157e0db755..b14eb7bfcd 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java
@@ -127,7 +127,7 @@ public class S7ParameterWriteVarResponse extends S7Parameter implements Message
return false;
}
S7ParameterWriteVarResponse that = (S7ParameterWriteVarResponse) o;
- return (getNumItems() == that.getNumItems()) && super.equals(that) && true;
+ return (getNumItems() == that.getNumItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java
index d7369d05c5..0704996f6f 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java
@@ -142,7 +142,7 @@ public class S7PayloadAlarm8 extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadAlarm8 that = (S7PayloadAlarm8) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java
index 1d0300ffa0..77b945b58b 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java
@@ -142,7 +142,7 @@ public class S7PayloadAlarmAckInd extends S7PayloadUserDataItem implements Messa
return false;
}
S7PayloadAlarmAckInd that = (S7PayloadAlarmAckInd) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java
index e589cd98c4..ea21fc24ba 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java
@@ -142,7 +142,7 @@ public class S7PayloadAlarmS extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadAlarmS that = (S7PayloadAlarmS) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java
index a37b06e484..ab2b761ff1 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java
@@ -142,7 +142,7 @@ public class S7PayloadAlarmSC extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadAlarmSC that = (S7PayloadAlarmSC) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java
index e69cd518f2..892c4094d3 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java
@@ -142,7 +142,7 @@ public class S7PayloadAlarmSQ extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadAlarmSQ that = (S7PayloadAlarmSQ) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java
index b9392871ab..9e86b136ee 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java
@@ -268,8 +268,7 @@ public class S7PayloadDiagnosticMessage extends S7PayloadUserDataItem implements
&& (getInfo1() == that.getInfo1())
&& (getInfo2() == that.getInfo2())
&& (getTimeStamp() == that.getTimeStamp())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java
index 7bcdc3efd5..da0c238a59 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java
@@ -142,7 +142,7 @@ public class S7PayloadNotify extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadNotify that = (S7PayloadNotify) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java
index 43960bb4a8..d7a7aad819 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java
@@ -142,7 +142,7 @@ public class S7PayloadNotify8 extends S7PayloadUserDataItem implements Message {
return false;
}
S7PayloadNotify8 that = (S7PayloadNotify8) o;
- return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that) && true;
+ return (getAlarmMessage() == that.getAlarmMessage()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java
index ced89add35..6f9f39301b 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java
@@ -136,7 +136,7 @@ public class S7PayloadReadVarResponse extends S7Payload implements Message {
return false;
}
S7PayloadReadVarResponse that = (S7PayloadReadVarResponse) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java
index 39b3de767c..76d3505cad 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java
@@ -109,21 +109,18 @@ public class S7PayloadUserData extends S7Payload implements Message {
() ->
S7PayloadUserDataItem.staticParse(
readBuffer,
- (byte)
- (CAST(
- CAST(parameter, S7ParameterUserData.class).getItems().get(0),
- S7ParameterUserDataItemCPUFunctions.class)
- .getCpuFunctionGroup()),
- (byte)
- (CAST(
- CAST(parameter, S7ParameterUserData.class).getItems().get(0),
- S7ParameterUserDataItemCPUFunctions.class)
- .getCpuFunctionType()),
- (short)
- (CAST(
- CAST(parameter, S7ParameterUserData.class).getItems().get(0),
- S7ParameterUserDataItemCPUFunctions.class)
- .getCpuSubfunction())),
+ CAST(
+ CAST(parameter, S7ParameterUserData.class).getItems().get(0),
+ S7ParameterUserDataItemCPUFunctions.class)
+ .getCpuFunctionGroup(),
+ CAST(
+ CAST(parameter, S7ParameterUserData.class).getItems().get(0),
+ S7ParameterUserDataItemCPUFunctions.class)
+ .getCpuFunctionType(),
+ CAST(
+ CAST(parameter, S7ParameterUserData.class).getItems().get(0),
+ S7ParameterUserDataItemCPUFunctions.class)
+ .getCpuSubfunction()),
readBuffer),
COUNT(CAST(parameter, S7ParameterUserData.class).getItems()));
@@ -154,7 +151,7 @@ public class S7PayloadUserData extends S7Payload implements Message {
return false;
}
S7PayloadUserData that = (S7PayloadUserData) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java
index b66f98148d..c8b8fc9d41 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java
@@ -243,7 +243,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x02)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x08)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x05)
- && EvaluationHelper.equals(dataLength, (int) 0x00)) {
+ && EvaluationHelper.equals(dataLength, 0x00)) {
builder =
S7PayloadUserDataItemCyclicServicesErrorResponse.staticParseS7PayloadUserDataItemBuilder(
readBuffer, cpuFunctionGroup, cpuFunctionType, cpuSubfunction);
@@ -305,7 +305,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x04)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x04)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x01)
- && EvaluationHelper.equals(dataLength, (int) 0x00)) {
+ && EvaluationHelper.equals(dataLength, 0x00)) {
builder =
S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest
.staticParseS7PayloadUserDataItemBuilder(
@@ -332,7 +332,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x04)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x08)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x02)
- && EvaluationHelper.equals(dataLength, (int) 0x00)) {
+ && EvaluationHelper.equals(dataLength, 0x00)) {
builder =
S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse
.staticParseS7PayloadUserDataItemBuilder(
@@ -340,7 +340,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x04)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x08)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x02)
- && EvaluationHelper.equals(dataLength, (int) 0x02)) {
+ && EvaluationHelper.equals(dataLength, 0x02)) {
builder =
S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse
.staticParseS7PayloadUserDataItemBuilder(
@@ -348,7 +348,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x04)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x08)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x02)
- && EvaluationHelper.equals(dataLength, (int) 0x05)) {
+ && EvaluationHelper.equals(dataLength, 0x05)) {
builder =
S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse
.staticParseS7PayloadUserDataItemBuilder(
@@ -362,7 +362,7 @@ public abstract class S7PayloadUserDataItem implements Message {
} else if (EvaluationHelper.equals(cpuFunctionGroup, (byte) 0x04)
&& EvaluationHelper.equals(cpuFunctionType, (byte) 0x08)
&& EvaluationHelper.equals(cpuSubfunction, (short) 0x0b)
- && EvaluationHelper.equals(dataLength, (int) 0x00)) {
+ && EvaluationHelper.equals(dataLength, 0x00)) {
builder =
S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse
.staticParseS7PayloadUserDataItemBuilder(
@@ -428,8 +428,7 @@ public abstract class S7PayloadUserDataItem implements Message {
S7PayloadUserDataItem that = (S7PayloadUserDataItem) o;
return (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
- && (getDataLength() == that.getDataLength())
- && true;
+ && (getDataLength() == that.getDataLength());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java
index dfb5a9ef03..0433df2098 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java
@@ -120,7 +120,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse extends S7Pay
}
S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse that =
(S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java
index 77d23edeba..6210d6fd8f 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java
@@ -183,7 +183,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmAckRequest extends S7PayloadUs
}
S7PayloadUserDataItemCpuFunctionAlarmAckRequest that =
(S7PayloadUserDataItemCpuFunctionAlarmAckRequest) o;
- return (getMessageObjects() == that.getMessageObjects()) && super.equals(that) && true;
+ return (getMessageObjects() == that.getMessageObjects()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java
index c56ff8b8d6..937b1cff09 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java
@@ -176,8 +176,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmAckResponse extends S7PayloadU
(S7PayloadUserDataItemCpuFunctionAlarmAckResponse) o;
return (getFunctionId() == that.getFunctionId())
&& (getMessageObjects() == that.getMessageObjects())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQuery.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQuery.java
index 4d37b96c42..6db11a71d6 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQuery.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQuery.java
@@ -296,8 +296,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmQuery extends S7PayloadUserDat
return (getSyntaxId() == that.getSyntaxId())
&& (getQueryType() == that.getQueryType())
&& (getAlarmType() == that.getAlarmType())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java
index 67f0ed073d..e932921012 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java
@@ -297,8 +297,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmQueryRequest extends S7Payload
return (getSyntaxId() == that.getSyntaxId())
&& (getQueryType() == that.getQueryType())
&& (getAlarmType() == that.getAlarmType())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java
index 1bff09b4c6..c3bf5ec42b 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java
@@ -148,7 +148,7 @@ public class S7PayloadUserDataItemCpuFunctionAlarmQueryResponse extends S7Payloa
}
S7PayloadUserDataItemCpuFunctionAlarmQueryResponse that =
(S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscription.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscription.java
index d6eb0ada76..9b3cbc7abc 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscription.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscription.java
@@ -230,8 +230,7 @@ public class S7PayloadUserDataItemCpuFunctionMsgSubscription extends S7PayloadUs
&& (getMagicKey() == that.getMagicKey())
&& (getAlarmtype() == that.getAlarmtype())
&& (getReserve() == that.getReserve())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java
index b3456d53b1..3bbad001db 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java
@@ -233,8 +233,7 @@ public class S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse
&& (getAlarmType() == that.getAlarmType())
&& (getReserved02() == that.getReserved02())
&& (getReserved03() == that.getReserved03())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java
index ad21923a35..b3e8c42e48 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java
@@ -230,8 +230,7 @@ public class S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest extends S7Pa
&& (getMagicKey() == that.getMagicKey())
&& (getAlarmtype() == that.getAlarmtype())
&& (getReserve() == that.getReserve())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java
index 30778765ef..3d5558d9c8 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java
@@ -120,7 +120,7 @@ public class S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse extends S7P
}
S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse that =
(S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java
index b4af396e7f..70667db868 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java
@@ -163,8 +163,7 @@ public class S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse
(S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) o;
return (getResult() == that.getResult())
&& (getReserved01() == that.getReserved01())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java
index 2ef1caa82b..60ad6c23e6 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java
@@ -120,7 +120,7 @@ public class S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest extends S7Payl
}
S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest that =
(S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java
index a7ca1d2778..74a139a0cd 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java
@@ -164,8 +164,7 @@ public class S7PayloadUserDataItemCpuFunctionReadSzlRequest extends S7PayloadUse
(S7PayloadUserDataItemCpuFunctionReadSzlRequest) o;
return (getSzlId() == that.getSzlId())
&& (getSzlIndex() == that.getSzlIndex())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java
index 53d665b693..c7699256a4 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java
@@ -148,7 +148,7 @@ public class S7PayloadUserDataItemCpuFunctionReadSzlResponse extends S7PayloadUs
}
S7PayloadUserDataItemCpuFunctionReadSzlResponse that =
(S7PayloadUserDataItemCpuFunctionReadSzlResponse) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java
index 5befacafb6..21b482f734 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java
@@ -173,8 +173,7 @@ public class S7PayloadUserDataItemCyclicServicesChangeDrivenPush extends S7Paylo
(S7PayloadUserDataItemCyclicServicesChangeDrivenPush) o;
return (getItemsCount() == that.getItemsCount())
&& (getItems() == that.getItems())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java
index 8653ab2f18..61e8c96eac 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java
@@ -174,8 +174,7 @@ public class S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse
(S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) o;
return (getItemsCount() == that.getItemsCount())
&& (getItems() == that.getItems())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java
index e6638a7ad4..fdb82d1343 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java
@@ -120,7 +120,7 @@ public class S7PayloadUserDataItemCyclicServicesErrorResponse extends S7PayloadU
}
S7PayloadUserDataItemCyclicServicesErrorResponse that =
(S7PayloadUserDataItemCyclicServicesErrorResponse) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java
index 0231b5d84b..86027faa6d 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java
@@ -171,8 +171,7 @@ public class S7PayloadUserDataItemCyclicServicesPush extends S7PayloadUserDataIt
S7PayloadUserDataItemCyclicServicesPush that = (S7PayloadUserDataItemCyclicServicesPush) o;
return (getItemsCount() == that.getItemsCount())
&& (getItems() == that.getItems())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java
index fb33e91d2c..31c853de9d 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java
@@ -219,8 +219,7 @@ public class S7PayloadUserDataItemCyclicServicesSubscribeRequest extends S7Paylo
&& (getTimeBase() == that.getTimeBase())
&& (getTimeFactor() == that.getTimeFactor())
&& (getItem() == that.getItem())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java
index bc9aae2598..fd8d6409e8 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java
@@ -173,8 +173,7 @@ public class S7PayloadUserDataItemCyclicServicesSubscribeResponse extends S7Payl
(S7PayloadUserDataItemCyclicServicesSubscribeResponse) o;
return (getItemsCount() == that.getItemsCount())
&& (getItems() == that.getItems())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java
index b1b484f92c..948ca05d6a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java
@@ -162,8 +162,7 @@ public class S7PayloadUserDataItemCyclicServicesUnsubscribeRequest extends S7Pay
(S7PayloadUserDataItemCyclicServicesUnsubscribeRequest) o;
return (getFunction() == that.getFunction())
&& (getJobId() == that.getJobId())
- && super.equals(that)
- && true;
+ && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java
index 47608319a0..b5bff02a09 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java
@@ -120,7 +120,7 @@ public class S7PayloadUserDataItemCyclicServicesUnsubscribeResponse extends S7Pa
}
S7PayloadUserDataItemCyclicServicesUnsubscribeResponse that =
(S7PayloadUserDataItemCyclicServicesUnsubscribeResponse) o;
- return super.equals(that) && true;
+ return super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java
index 48d4a5a334..424048979a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java
@@ -136,7 +136,7 @@ public class S7PayloadWriteVarRequest extends S7Payload implements Message {
return false;
}
S7PayloadWriteVarRequest that = (S7PayloadWriteVarRequest) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java
index 1f6e13cea1..54a447aa23 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java
@@ -136,7 +136,7 @@ public class S7PayloadWriteVarResponse extends S7Payload implements Message {
return false;
}
S7PayloadWriteVarResponse that = (S7PayloadWriteVarResponse) o;
- return (getItems() == that.getItems()) && super.equals(that) && true;
+ return (getItems() == that.getItems()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java
index 4483814eac..9633ed34df 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java
@@ -91,11 +91,10 @@ public class S7VarPayloadDataItem implements Message {
// Implicit Field (dataLength) (Used for parsing, but its value is not stored as it's implicitly
// given by the objects content)
int dataLength =
- (int)
- ((COUNT(getData()))
- * ((((((getTransportSize()) == (DataTransportSize.BIT)))
- ? 1
- : (((getTransportSize().getSizeInBits()) ? 8 : 1))))));
+ (COUNT(getData()))
+ * ((((((getTransportSize()) == (DataTransportSize.BIT)))
+ ? 1
+ : (((getTransportSize().getSizeInBits()) ? 8 : 1)))));
writeImplicitField("dataLength", dataLength, writeUnsignedInt(writeBuffer, 16));
// Array Field (data)
@@ -104,7 +103,7 @@ public class S7VarPayloadDataItem implements Message {
// Padding Field (padding)
writePaddingField(
"padding",
- (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)),
+ (((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0),
(short) 0x00,
writeUnsignedShort(writeBuffer, 8));
@@ -137,7 +136,7 @@ public class S7VarPayloadDataItem implements Message {
}
// Padding Field (padding)
- int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0));
+ int _timesPadding = (((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0);
while (_timesPadding-- > 0) {
lengthInBits += 8;
}
@@ -181,7 +180,7 @@ public class S7VarPayloadDataItem implements Message {
((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength)));
readPaddingField(
- readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)));
+ readUnsignedShort(readBuffer, 8), (((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0));
readBuffer.closeContext("S7VarPayloadDataItem");
// Create the instance
@@ -201,8 +200,7 @@ public class S7VarPayloadDataItem implements Message {
S7VarPayloadDataItem that = (S7VarPayloadDataItem) o;
return (getReturnCode() == that.getReturnCode())
&& (getTransportSize() == that.getTransportSize())
- && (getData() == that.getData())
- && true;
+ && (getData() == that.getData());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java
index aec0f0e161..793fdb103a 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java
@@ -121,7 +121,7 @@ public class S7VarPayloadStatusItem implements Message {
return false;
}
S7VarPayloadStatusItem that = (S7VarPayloadStatusItem) o;
- return (getReturnCode() == that.getReturnCode()) && true;
+ return (getReturnCode() == that.getReturnCode());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java
index 18cb81bd5f..c095923601 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java
@@ -137,7 +137,7 @@ public class S7VarRequestParameterItemAddress extends S7VarRequestParameterItem
return false;
}
S7VarRequestParameterItemAddress that = (S7VarRequestParameterItemAddress) o;
- return (getAddress() == that.getAddress()) && super.equals(that) && true;
+ return (getAddress() == that.getAddress()) && super.equals(that);
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java
index 82d8fb4ae9..ba86e897ec 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java
@@ -221,8 +221,7 @@ public class State implements Message {
&& (getSIG_4() == that.getSIG_4())
&& (getSIG_3() == that.getSIG_3())
&& (getSIG_2() == that.getSIG_2())
- && (getSIG_1() == that.getSIG_1())
- && true;
+ && (getSIG_1() == that.getSIG_1());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java
index ef70ef5de5..d4896a3f05 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java
@@ -138,8 +138,7 @@ public class SubItem implements Message {
SubItem that = (SubItem) o;
return (getBytesToRead() == that.getBytesToRead())
&& (getDbNumber() == that.getDbNumber())
- && (getStartAddress() == that.getStartAddress())
- && true;
+ && (getStartAddress() == that.getStartAddress());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java
index 3dd2c85acb..2634d6729c 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java
@@ -42,11 +42,11 @@ public enum SyntaxIdType {
static {
map = new HashMap<>();
for (SyntaxIdType value : SyntaxIdType.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
SyntaxIdType(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java
index de5e20b053..c824ec8cfa 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java
@@ -171,8 +171,7 @@ public class SzlDataTreeItem implements Message {
&& (getMlfb() == that.getMlfb())
&& (getModuleTypeId() == that.getModuleTypeId())
&& (getAusbg() == that.getAusbg())
- && (getAusbe() == that.getAusbe())
- && true;
+ && (getAusbe() == that.getAusbe());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java
index 8f46b999d7..4a8c0ee256 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java
@@ -160,8 +160,7 @@ public class SzlId implements Message {
SzlId that = (SzlId) o;
return (getTypeClass() == that.getTypeClass())
&& (getSublistExtract() == that.getSublistExtract())
- && (getSublistList() == that.getSublistList())
- && true;
+ && (getSublistList() == that.getSublistList());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java
index 4f93cc8312..cd9e5d00c5 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java
@@ -33,11 +33,11 @@ public enum SzlModuleTypeClass {
static {
map = new HashMap<>();
for (SzlModuleTypeClass value : SzlModuleTypeClass.values()) {
- map.put((byte) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private byte value;
+ private final byte value;
SzlModuleTypeClass(byte value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java
index 36bb532d16..9693d97948 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java
@@ -55,11 +55,11 @@ public enum SzlSublist {
static {
map = new HashMap<>();
for (SzlSublist value : SzlSublist.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
SzlSublist(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java
index 10351a8a73..288529bf44 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java
@@ -78,7 +78,7 @@ public class TPKTPacket implements Message {
// Implicit Field (len) (Used for parsing, but its value is not stored as it's implicitly given
// by the objects content)
- int len = (int) ((getPayload().getLengthInBytes()) + (4));
+ int len = (getPayload().getLengthInBytes()) + (4);
writeImplicitField(
"len",
len,
@@ -156,7 +156,7 @@ public class TPKTPacket implements Message {
readSimpleField(
"payload",
new DataReaderComplexDefault<>(
- () -> COTPPacket.staticParse(readBuffer, (int) ((len) - (4))), readBuffer),
+ () -> COTPPacket.staticParse(readBuffer, (len) - (4)), readBuffer),
WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN));
readBuffer.closeContext("TPKTPacket");
@@ -175,7 +175,7 @@ public class TPKTPacket implements Message {
return false;
}
TPKTPacket that = (TPKTPacket) o;
- return (getPayload() == that.getPayload()) && true;
+ return (getPayload() == that.getPayload());
}
@Override
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java
index 2552f37219..423fccc71f 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java
@@ -32,11 +32,11 @@ public enum TimeBase {
static {
map = new HashMap<>();
for (TimeBase value : TimeBase.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
+ private final short value;
TimeBase(short value) {
this.value = value;
diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
index 4b70936705..4ce00137b7 100644
--- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
+++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
@@ -28,363 +28,363 @@ import java.util.Map;
public enum TransportSize {
BOOL(
(short) 0x01,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x01,
(short) 1,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
DataTransportSize.BIT,
- (String) "IEC61131_BOOL",
+ "IEC61131_BOOL",
null),
BYTE(
(short) 0x02,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x02,
(short) 1,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'B',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_BYTE",
+ "IEC61131_BYTE",
null),
WORD(
(short) 0x03,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x04,
(short) 2,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'W',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_WORD",
+ "IEC61131_WORD",
null),
DWORD(
(short) 0x04,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x06,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'D',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_DWORD",
+ "IEC61131_DWORD",
TransportSize.WORD),
LWORD(
(short) 0x05,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 0x00,
(short) 8,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_LWORD",
+ "IEC61131_LWORD",
null),
INT(
(short) 0x06,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x05,
(short) 2,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'W',
- (boolean) true,
+ true,
DataTransportSize.INTEGER,
- (String) "IEC61131_INT",
+ "IEC61131_INT",
null),
UINT(
(short) 0x07,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x05,
(short) 2,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'W',
- (boolean) true,
+ true,
DataTransportSize.INTEGER,
- (String) "IEC61131_UINT",
+ "IEC61131_UINT",
TransportSize.INT),
SINT(
(short) 0x08,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x02,
(short) 1,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'B',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_SINT",
+ "IEC61131_SINT",
TransportSize.INT),
USINT(
(short) 0x09,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x02,
(short) 1,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'B',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_USINT",
+ "IEC61131_USINT",
TransportSize.INT),
DINT(
(short) 0x0A,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x07,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'D',
- (boolean) true,
+ true,
DataTransportSize.INTEGER,
- (String) "IEC61131_DINT",
+ "IEC61131_DINT",
TransportSize.INT),
UDINT(
(short) 0x0B,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x07,
(short) 4,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'D',
- (boolean) true,
+ true,
DataTransportSize.INTEGER,
- (String) "IEC61131_UDINT",
+ "IEC61131_UDINT",
TransportSize.INT),
LINT(
(short) 0x0C,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 0x00,
(short) 8,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_LINT",
+ "IEC61131_LINT",
TransportSize.INT),
ULINT(
(short) 0x0D,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 0x00,
(short) 16,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_ULINT",
+ "IEC61131_ULINT",
TransportSize.INT),
REAL(
(short) 0x0E,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x08,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'D',
- (boolean) true,
+ true,
DataTransportSize.REAL,
- (String) "IEC61131_REAL",
+ "IEC61131_REAL",
null),
LREAL(
(short) 0x0F,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 0x30,
(short) 8,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_LREAL",
+ "IEC61131_LREAL",
TransportSize.REAL),
CHAR(
(short) 0x10,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x03,
(short) 1,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'B',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_CHAR",
+ "IEC61131_CHAR",
null),
WCHAR(
(short) 0x11,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x13,
(short) 2,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_WCHAR",
+ "IEC61131_WCHAR",
null),
STRING(
(short) 0x12,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x03,
(short) 1,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_STRING",
+ "IEC61131_STRING",
null),
WSTRING(
(short) 0x13,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 0x00,
(short) 2,
- (boolean) false,
- (boolean) true,
+ false,
+ true,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_WSTRING",
+ "IEC61131_WSTRING",
null),
TIME(
(short) 0x14,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x0B,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_TIME",
+ "IEC61131_TIME",
null),
LTIME(
(short) 0x16,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 0x00,
(short) 8,
- (boolean) false,
- (boolean) false,
+ false,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_LTIME",
+ "IEC61131_LTIME",
TransportSize.TIME),
DATE(
(short) 0x17,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x09,
(short) 2,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_DATE",
+ "IEC61131_DATE",
null),
TIME_OF_DAY(
(short) 0x18,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x06,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_TIME_OF_DAY",
+ "IEC61131_TIME_OF_DAY",
null),
TOD(
(short) 0x19,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 0x06,
(short) 4,
- (boolean) true,
- (boolean) true,
+ true,
+ true,
(short) 'X',
- (boolean) true,
+ true,
DataTransportSize.BYTE_WORD_DWORD,
- (String) "IEC61131_TIME_OF_DAY",
+ "IEC61131_TIME_OF_DAY",
null),
DATE_AND_TIME(
(short) 0x1A,
- (boolean) true,
- (boolean) false,
+ true,
+ false,
(short) 0x0F,
(short) 12,
- (boolean) true,
- (boolean) false,
+ true,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_DATE_AND_TIME",
+ "IEC61131_DATE_AND_TIME",
null),
DT(
(short) 0x1B,
- (boolean) true,
- (boolean) false,
+ true,
+ false,
(short) 0x0F,
(short) 12,
- (boolean) true,
- (boolean) false,
+ true,
+ false,
(short) 'X',
- (boolean) true,
+ true,
null,
- (String) "IEC61131_DATE_AND_TIME",
+ "IEC61131_DATE_AND_TIME",
null);
private static final Map<Short, TransportSize> map;
static {
map = new HashMap<>();
for (TransportSize value : TransportSize.values()) {
- map.put((short) value.getValue(), value);
+ map.put(value.getValue(), value);
}
}
- private short value;
- private boolean supported_S7_300;
- private boolean supported_LOGO;
- private short code;
- private short sizeInBytes;
- private boolean supported_S7_400;
- private boolean supported_S7_1200;
- private short shortName;
- private boolean supported_S7_1500;
- private DataTransportSize dataTransportSize;
- private String dataProtocolId;
- private TransportSize baseType;
+ private final short value;
+ private final boolean supported_S7_300;
+ private final boolean supported_LOGO;
+ private final short code;
+ private final short sizeInBytes;
+ private final boolean supported_S7_400;
+ private final boolean supported_S7_1200;
+ private final short shortName;
+ private final boolean supported_S7_1500;
+ private final DataTransportSize dataTransportSize;
+ private final String dataProtocolId;
+ private final TransportSize baseType;
TransportSize(
short value,
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java
index d88475ef09..d338e1f093 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7AlarmEvent.java
@@ -141,8 +141,8 @@ public class S7AlarmEvent implements S7Event {
SIG_7_DATA_LENGTH,
SIG_8_DATA_LENGTH,
- };
-
+ }
+
private final Instant timeStamp;
private final Map<String, Object> map;
@@ -291,10 +291,9 @@ public class S7AlarmEvent implements S7Event {
}
- };
-
-
-
+ }
+
+
@Override
public Map<String, Object> getMap() {
return map;
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java
index 9bdeae6a26..a6d9fc37b9 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java
@@ -20,6 +20,13 @@ package org.apache.plc4x.java.s7.events;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
+import org.apache.plc4x.java.api.model.PlcTag;
+import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.api.value.PlcValue;
+import org.apache.plc4x.java.s7.readwrite.*;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
@@ -27,134 +34,122 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.model.PlcTag;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.api.value.PlcValue;
-import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesChangeDrivenPush;
-import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse;
-import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesPush;
-import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesSubscribeResponse;
/**
- *
* @author cgarcia
*/
public class S7CyclicEvent implements S7Event {
- public enum Fields{
+ public enum Fields {
TYPE,
JOBID,
- TIMESTAMP,
+ TIMESTAMP,
ITEMSCOUNT,
REQUEST,
MAP,
RETURNCODE_,
TRANSPORTSIZE_,
DATA_
- }
-
+ }
+
private final PlcSubscriptionRequest request;
-
+
private final Instant timeStamp;
- private final Map<String, Object> map;
-
+ private final Map<String, Object> map;
+
private int j;
-
- public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesPush event) {
- this.map = new HashMap();
- this.timeStamp = Instant.now();
+
+ public S7CyclicEvent(PlcSubscriptionRequest request, short jobId, S7PayloadUserDataItemCyclicServicesPush event) {
+ this.map = new HashMap<>();
+ this.timeStamp = Instant.now();
this.request = request;
- map.put(Fields.TYPE.name(), "CYCEVENT");
- map.put(Fields.TIMESTAMP.name(),this.timeStamp);
- map.put(Fields.JOBID.name(), jobid);
- map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
- for (int i=0; i<event.getItemsCount(); i++){
- //map.put(Fields.RETURNCODE_.name()+i, event.getItems()[i].getReturnCode().getValue());
- map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue());
- map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue());
- byte[] buffer = new byte[event.getItems().get(i).getData().size()];
+ map.put(Fields.TYPE.name(), "CYCEVENT");
+ map.put(Fields.TIMESTAMP.name(), this.timeStamp);
+ map.put(Fields.JOBID.name(), jobId);
+ map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
+ for (int i = 0; i < event.getItemsCount(); i++) {
+ AssociatedValueType associatedValueType = event.getItems().get(i);
+ map.put(Fields.RETURNCODE_.name() + i, associatedValueType.getReturnCode().getValue());
+ map.put(Fields.TRANSPORTSIZE_.name() + i, associatedValueType.getTransportSize().getValue());
+ byte[] buffer = new byte[associatedValueType.getData().size()];
j = 0;
- event.getItems().get(i).getData().forEach(s->{
- buffer[j] = s.byteValue();
- j ++;
- });
- map.put(Fields.DATA_.name()+i, buffer);
+ associatedValueType.getData().forEach(s -> {
+ buffer[j] = s.byteValue();
+ j++;
+ });
+ map.put(Fields.DATA_.name() + i, buffer);
}
}
-
- public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesChangeDrivenPush event) {
- this.map = new HashMap();
- this.timeStamp = Instant.now();
+
+ public S7CyclicEvent(PlcSubscriptionRequest request, short jobId, S7PayloadUserDataItemCyclicServicesChangeDrivenPush event) {
+ this.map = new HashMap<>();
+ this.timeStamp = Instant.now();
this.request = request;
- map.put(Fields.TYPE.name(), "CYCEVENT");
- map.put(Fields.TIMESTAMP.name(),this.timeStamp);
- map.put(Fields.JOBID.name(), jobid);
- map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
- for (int i=0; i<event.getItemsCount(); i++){
- map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue());
- map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue());
- byte[] buffer = new byte[event.getItems().get(i).getData().size()];
+ map.put(Fields.TYPE.name(), "CYCEVENT");
+ map.put(Fields.TIMESTAMP.name(), this.timeStamp);
+ map.put(Fields.JOBID.name(), jobId);
+ map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
+ for (int i = 0; i < event.getItemsCount(); i++) {
+ AssociatedQueryValueType associatedQueryValueType = event.getItems().get(i);
+ map.put(Fields.RETURNCODE_.name() + i, associatedQueryValueType.getReturnCode().getValue());
+ map.put(Fields.TRANSPORTSIZE_.name() + i, associatedQueryValueType.getTransportSize().getValue());
+ byte[] buffer = new byte[associatedQueryValueType.getData().size()];
j = 0;
- event.getItems().get(i).getData().forEach(s->{
- buffer[j] = s.byteValue();
- j ++;
- });
- map.put(Fields.DATA_.name()+i, buffer);
+ associatedQueryValueType.getData().forEach(s -> {
+ buffer[j] = s.byteValue();
+ j++;
+ });
+ map.put(Fields.DATA_.name() + i, buffer);
}
- }
-
- public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesSubscribeResponse event) {
- this.map = new HashMap();
- this.timeStamp = Instant.now();
+ }
+
+ public S7CyclicEvent(PlcSubscriptionRequest request, short jobId, S7PayloadUserDataItemCyclicServicesSubscribeResponse event) {
+ this.map = new HashMap<>();
+ this.timeStamp = Instant.now();
this.request = request;
- map.put(Fields.TYPE.name(), "CYCEVENT");
- map.put(Fields.TIMESTAMP.name(),this.timeStamp);
- map.put(Fields.JOBID.name(), jobid);
+ map.put(Fields.TYPE.name(), "CYCEVENT");
+ map.put(Fields.TIMESTAMP.name(), this.timeStamp);
+ map.put(Fields.JOBID.name(), jobId);
map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
- for (int i=0; i<event.getItemsCount(); i++){
- map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue());
- map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue());
- byte[] buffer = new byte[event.getItems().get(i).getData().size()];
+ for (int i = 0; i < event.getItemsCount(); i++) {
+ AssociatedValueType associatedValueType = event.getItems().get(i);
+ map.put(Fields.RETURNCODE_.name() + i, associatedValueType.getReturnCode().getValue());
+ map.put(Fields.TRANSPORTSIZE_.name() + i, associatedValueType.getTransportSize().getValue());
+ byte[] buffer = new byte[associatedValueType.getData().size()];
j = 0;
- event.getItems().get(i).getData().forEach(s->{
- buffer[j] = s.byteValue();
- j ++;
- });
- map.put(Fields.DATA_.name()+i, buffer);
- }
+ associatedValueType.getData().forEach(s -> {
+ buffer[j] = s.byteValue();
+ j++;
+ });
+ map.put(Fields.DATA_.name() + i, buffer);
+ }
}
- public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse event) {
- this.map = new HashMap();
- this.timeStamp = Instant.now();
+ public S7CyclicEvent(PlcSubscriptionRequest request, short jobId, S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse event) {
+ this.map = new HashMap<>();
+ this.timeStamp = Instant.now();
this.request = request;
- map.put(Fields.TYPE.name(), "CYCEVENT");
- map.put(Fields.TIMESTAMP.name(),this.timeStamp);
- map.put(Fields.JOBID.name(), jobid);
+ map.put(Fields.TYPE.name(), "CYCEVENT");
+ map.put(Fields.TIMESTAMP.name(), this.timeStamp);
+ map.put(Fields.JOBID.name(), jobId);
map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount());
- for (int i=0; i<event.getItemsCount(); i++){
- map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue());
- map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue());
- byte[] buffer = new byte[event.getItems().get(i).getData().size()];
+ for (int i = 0; i < event.getItemsCount(); i++) {
+ AssociatedQueryValueType associatedQueryValueType = event.getItems().get(i);
+ map.put(Fields.RETURNCODE_.name() + i, associatedQueryValueType.getReturnCode().getValue());
+ map.put(Fields.TRANSPORTSIZE_.name() + i, associatedQueryValueType.getTransportSize().getValue());
+ byte[] buffer = new byte[associatedQueryValueType.getData().size()];
j = 0;
- event.getItems().get(i).getData().forEach(s->{
- buffer[j] = s.byteValue();
- j ++;
- });
- map.put(Fields.DATA_.name()+i, buffer);
- }
- }
-
+ associatedQueryValueType.getData().forEach(s -> {
+ buffer[j] = s.byteValue();
+ j++;
+ });
+ map.put(Fields.DATA_.name() + i, buffer);
+ }
+ }
+
@Override
public Map<String, Object> getMap() {
return this.map;
@@ -238,30 +233,28 @@ public class S7CyclicEvent implements S7Event {
@Override
public Byte getByte(String name) {
- if (!(map.get(name) instanceof Byte))
+ if (!(map.get(name) instanceof Byte))
throw new UnsupportedOperationException("Field is not a Byte. Required Byte type.");
return (byte) map.get(name);
}
@Override
public Byte getByte(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Byte.BYTES;
+ int pos = index * Byte.BYTES;
return byteBuf.getByte(pos);
}
@Override
public Collection<Byte> getAllBytes(String name) {
- if (!(map.get(name) instanceof byte[]))
+ if (!(map.get(name) instanceof byte[]))
throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
byte[] array = (byte[]) map.get(name);
-
- List<Byte> list = IntStream.range(0, array.length).
- mapToObj(i -> array[i]).collect(Collectors.toList());
-
- return list;
+
+ return IntStream.range(0, array.length).
+ mapToObj(i -> array[i]).collect(Collectors.toList());
}
@Override
@@ -282,20 +275,20 @@ public class S7CyclicEvent implements S7Event {
@Override
public Short getShort(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Short.BYTES;
+ int pos = index * Short.BYTES;
return byteBuf.getShort(index);
}
@Override
public Collection<Short> getAllShorts(String name) {
- if (!(map.get(name) instanceof byte[]))
+ if (!(map.get(name) instanceof byte[]))
throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- List<Short> list = new ArrayList();
- while(byteBuf.isReadable(Short.BYTES)) list.add(byteBuf.readShort());
+ List<Short> list = new ArrayList<>();
+ while (byteBuf.isReadable(Short.BYTES)) list.add(byteBuf.readShort());
return list;
}
@@ -316,20 +309,20 @@ public class S7CyclicEvent implements S7Event {
@Override
public Integer getInteger(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Integer.BYTES;
+ int pos = index * Integer.BYTES;
return byteBuf.getInt(pos);
}
@Override
public Collection<Integer> getAllIntegers(String name) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- List<Integer> list = new ArrayList();
- while(byteBuf.isReadable(Integer.BYTES)) list.add(byteBuf.readInt());
+ List<Integer> list = new ArrayList<>();
+ while (byteBuf.isReadable(Integer.BYTES)) list.add(byteBuf.readInt());
return list;
}
@@ -375,20 +368,20 @@ public class S7CyclicEvent implements S7Event {
@Override
public Long getLong(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Long.BYTES;
+ int pos = index * Long.BYTES;
return byteBuf.getLong(pos);
}
@Override
public Collection<Long> getAllLongs(String name) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- List<Long> list = new ArrayList();
- while(byteBuf.isReadable(Long.BYTES)) list.add(byteBuf.readLong());
+ List<Long> list = new ArrayList<>();
+ while (byteBuf.isReadable(Long.BYTES)) list.add(byteBuf.readLong());
return list;
}
@@ -409,20 +402,20 @@ public class S7CyclicEvent implements S7Event {
@Override
public Float getFloat(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Float.BYTES;
+ int pos = index * Float.BYTES;
return byteBuf.getFloat(pos);
}
@Override
public Collection<Float> getAllFloats(String name) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- List<Float> list = new ArrayList();
- while(byteBuf.isReadable(Float.BYTES)) list.add(byteBuf.readFloat());
+ List<Float> list = new ArrayList<>();
+ while (byteBuf.isReadable(Float.BYTES)) list.add(byteBuf.readFloat());
return list;
}
@@ -443,20 +436,20 @@ public class S7CyclicEvent implements S7Event {
@Override
public Double getDouble(String name, int index) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- int pos = index*Double.BYTES;
+ int pos = index * Double.BYTES;
return byteBuf.getDouble(pos);
}
@Override
public Collection<Double> getAllDoubles(String name) {
- if (!(map.get(name) instanceof byte[]))
- throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
+ if (!(map.get(name) instanceof byte[]))
+ throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
- List<Double> list = new ArrayList();
- while(byteBuf.isReadable(Double.BYTES)) list.add(byteBuf.readDouble());
+ List<Double> list = new ArrayList<>();
+ while (byteBuf.isReadable(Double.BYTES)) list.add(byteBuf.readDouble());
return list;
}
@@ -497,7 +490,7 @@ public class S7CyclicEvent implements S7Event {
@Override
public String getString(String name) {
- if (!(map.get(name) instanceof byte[]))
+ if (!(map.get(name) instanceof byte[]))
throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type.");
ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name));
return byteBuf.toString(Charset.defaultCharset());
@@ -596,12 +589,12 @@ public class S7CyclicEvent implements S7Event {
@Override
public PlcTag getTag(String name) {
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
- }
+ }
@Override
public PlcResponseCode getResponseCode(String name) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
-
+ }
+
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java
index 6dab453787..db3a97d94d 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7Event.java
@@ -46,7 +46,7 @@ import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
public interface S7Event extends PlcSubscriptionEvent{
- public Map<String, Object> getMap();
+ Map<String, Object> getMap();
}
\ No newline at end of file
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
index 8a931a3e78..002f6b9562 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
@@ -27,7 +27,6 @@ import org.apache.plc4x.java.s7.readwrite.protocol.S7ProtocolLogic;
import org.apache.plc4x.java.s7.readwrite.tag.S7PlcTagHandler;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
-import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
import org.apache.plc4x.java.spi.connection.SingleProtocolStackConfigurer;
import org.apache.plc4x.java.spi.optimizer.BaseOptimizer;
import org.apache.plc4x.java.spi.values.PlcValueHandler;
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
index fca574593b..4a5db34664 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java
@@ -1,4 +1,4 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -34,7 +34,7 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
@ConfigurationParameter("local-slot")
@IntDefaultValue(1)
public int localSlot = 1;
-
+
@ConfigurationParameter("local-tsap")
@IntDefaultValue(0)
public int localTsap = 0;
@@ -46,15 +46,15 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
@ConfigurationParameter("remote-slot")
@IntDefaultValue(0)
public int remoteSlot = 0;
-
+
@ConfigurationParameter("remote-rack2")
@IntDefaultValue(0)
public int remoteRack2 = 0;
@ConfigurationParameter("remote-slot2")
@IntDefaultValue(0)
- public int remoteSlot2 = 0;
-
+ public int remoteSlot2 = 0;
+
@ConfigurationParameter("remote-tsap")
@IntDefaultValue(0)
@@ -74,23 +74,23 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
@ConfigurationParameter("controller-type")
public String controllerType;
-
+
@ConfigurationParameter("read-timeout")
- @IntDefaultValue(8)
+ @IntDefaultValue(8)
public int readTimeout = 8;
- @ConfigurationParameter("ping")
- @BooleanDefaultValue(false)
- public boolean ping = false;
-
- @ConfigurationParameter("ping-time")
- @IntDefaultValue(-1)
- public int pingTime = -1;
-
- @ConfigurationParameter("retry-time")
- @IntDefaultValue(4)
- public int retryTime = 4;
-
+ @ConfigurationParameter("ping")
+ @BooleanDefaultValue(false)
+ public boolean ping = false;
+
+ @ConfigurationParameter("ping-time")
+ @IntDefaultValue(-1)
+ public int pingTime = -1;
+
+ @ConfigurationParameter("retry-time")
+ @IntDefaultValue(4)
+ public int retryTime = 4;
+
public int getLocalRack() {
return localRack;
@@ -115,7 +115,7 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
public void setLocalTsap(int localTsap) {
this.localTsap = localTsap;
}
-
+
public int getRemoteRack() {
return remoteRack;
}
@@ -131,7 +131,7 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
public void setRemoteSlot(int remoteSlot) {
this.remoteSlot = remoteSlot;
}
-
+
public int getRemoteRack2() {
return remoteRack2;
}
@@ -146,7 +146,7 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
public void setRemoteSlot2(int remoteSlot2) {
this.remoteSlot2 = remoteSlot2;
- }
+ }
public int getRemoteTsap() {
return remoteTsap;
@@ -155,7 +155,7 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
public void setRemoteTsap(int remoteTsap) {
this.remoteTsap = remoteTsap;
}
-
+
public int getPduSize() {
return pduSize;
}
@@ -187,42 +187,43 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
public void setControllerType(String controllerType) {
this.controllerType = controllerType;
}
-
+
public int getReadTimeout() {
return readTimeout;
}
public void setReadTimeout(int readTimeOut) {
this.readTimeout = readTimeOut;
- }
-
+ }
+
public boolean getPing() {
return ping;
}
public void setPing(boolean ping) {
this.ping = ping;
- }
-
+ }
+
public int getPingTime() {
return pingTime;
}
public void setPingTime(int pingTime) {
this.pingTime = pingTime;
- }
-
+ }
+
public int getRetryTime() {
return pingTime;
}
public void setRetryTime(int retryTime) {
this.retryTime = retryTime;
- }
-
-
+ }
+
+
/**
* Per default port for the S7 protocol is 102.
+ *
* @return 102
*/
@Override
@@ -239,17 +240,16 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration
", remote-rack=" + remoteRack +
", remote-slot=" + remoteSlot +
", remote-rack2=" + remoteRack2 +
- ", remote-slot2=" + remoteSlot2 +
+ ", remote-slot2=" + remoteSlot2 +
", remote-tsap=" + remoteTsap +
", pduSize=" + pduSize +
", maxAmqCaller=" + maxAmqCaller +
", maxAmqCallee=" + maxAmqCallee +
- ", controllerType='" + controllerType +
- ", readTimeOut='" + readTimeout +
- ", ping='" + ping +
- ", pingTime='" + pingTime +
- ", retryTime='" + retryTime +
- '\'' +
+ ", controllerType=" + controllerType +
+ ", readTimeOut=" + readTimeout +
+ ", ping=" + ping +
+ ", pingTime=" + pingTime +
+ ", retryTime=" + retryTime +
'}';
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
index 97f34793e2..b62eb16099 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java
@@ -36,12 +36,12 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
private int maxAmqCaller;
private int maxAmqCallee;
private S7ControllerType controllerType;
-
-
- private int calledTsapId2;
+
+
+ private int calledTsapId2;
private int readTimeout;
private boolean ping;
- private int pingTime;
+ private int pingTime;
private int retryTime;
@Override
@@ -50,16 +50,16 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
configuration.localRack, configuration.localSlot);
this.calledTsapId = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC,
configuration.remoteRack, configuration.remoteSlot);
-
+
this.calledTsapId2 = S7TsapIdEncoder.encodeS7TsapId(DeviceGroup.PG_OR_PC,
- configuration.remoteRack2, configuration.remoteSlot2);
-
+ configuration.remoteRack2, configuration.remoteSlot2);
+
if (configuration.localTsap > 0) {
- this.callingTsapId = configuration.localTsap;
+ this.callingTsapId = configuration.localTsap;
}
if (configuration.remoteTsap > 0) {
- this.calledTsapId = configuration.remoteTsap;
+ this.calledTsapId = configuration.remoteTsap;
}
this.controllerType = configuration.controllerType == null ? S7ControllerType.ANY : S7ControllerType.valueOf(configuration.controllerType);
@@ -81,10 +81,11 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
this.maxAmqCaller = configuration.maxAmqCaller;
this.maxAmqCallee = configuration.maxAmqCallee;
-
+
this.readTimeout = configuration.readTimeout;
this.ping = configuration.ping;
this.pingTime = configuration.pingTime;
+ this.retryTime = configuration.retryTime;
}
public boolean isPassiveMode() {
@@ -110,14 +111,14 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
public void setCalledTsapId(int calledTsapId) {
this.calledTsapId = calledTsapId;
}
-
+
public int getCalledTsapId2() {
return calledTsapId2;
}
public void setCalledTsapId2(int calledTsapId2) {
this.calledTsapId2 = calledTsapId2;
- }
+ }
public COTPTpduSize getCotpTpduSize() {
return cotpTpduSize;
@@ -158,30 +159,30 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
public void setControllerType(S7ControllerType controllerType) {
this.controllerType = controllerType;
}
-
+
public int getReadTimeout() {
return readTimeout;
}
public void setReadTimeout(int readTimeout) {
this.readTimeout = readTimeout;
- }
-
+ }
+
public boolean getPing() {
return ping;
}
public void setPing(boolean ping) {
this.ping = ping;
- }
-
+ }
+
public int getPingTime() {
return pingTime;
}
public void setPingTime(int pingTime) {
this.pingTime = pingTime;
- }
+ }
public int getRetryTime() {
return pingTime;
@@ -189,7 +190,7 @@ public class S7DriverContext implements DriverContext, HasConfiguration<S7Config
public void setRetryTime(int retryTime) {
this.retryTime = retryTime;
- }
+ }
/**
* Iterate over all values until one is found that the given tpdu size will fit.
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/DefaultS7MessageProcessor.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/DefaultS7MessageProcessor.java
index 8e4a51347a..02d316a3b5 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/DefaultS7MessageProcessor.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/DefaultS7MessageProcessor.java
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class DefaultS7MessageProcessor implements S7MessageProcessor {
- private AtomicInteger tpduRefGen;
+ private final AtomicInteger tpduRefGen;
public static final int EMPTY_READ_REQUEST_SIZE = new S7MessageRequest(0, new S7ParameterReadVarRequest(
Collections.emptyList()), null).getLengthInBytes();
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java
index d33ca435be..35f497c842 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java
@@ -63,7 +63,6 @@ public class S7Optimizer extends BaseOptimizer {
LinkedHashMap<String, PlcTag> curTags = new LinkedHashMap<>();
for (String tagName : readRequest.getTagNames()) {
-
if (readRequest.getTag(tagName) instanceof S7SzlTag){
curTags.put(tagName, readRequest.getTag(tagName));
continue;
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HAbortRequestException.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HAbortRequestException.java
index f914b37c8a..839b385e26 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HAbortRequestException.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HAbortRequestException.java
@@ -18,10 +18,6 @@
*/
package org.apache.plc4x.java.s7.readwrite.protocol;
-/**
- *
- * @author cgarcia
- */
public class S7HAbortRequestException {
-
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java
index 2ae0f1d578..2abe2dad1f 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java
@@ -24,15 +24,12 @@ import io.netty.channel.embedded.EmbeddedChannel;
import io.netty.handler.codec.MessageToMessageCodec;
import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.value.PlcValueHandler;
+import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.configuration.ConfigurationFactory;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
@@ -45,56 +42,60 @@ import org.apache.plc4x.java.spi.optimizer.BaseOptimizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
/**
- *
* @author cgarcia
*/
-public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection implements Runnable{
-
- private static final Logger logger = LoggerFactory.getLogger(S7HDefaultNettyPlcConnection.class);
-
+public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection implements Runnable {
+
+ private static final Logger logger = LoggerFactory.getLogger(S7HDefaultNettyPlcConnection.class);
+
private static final String MULTIPLEXOR = "MULTIPLEXOR";
- private Boolean closed = false;
+ private Boolean closed = false;
- private ScheduledFuture scf = null;
-
- protected final ChannelFactory secondaryChannelFactory;
- protected Channel primary_channel = null;
- protected Channel secondary_channel = null;
+ private ScheduledFuture<?> scf = null;
+
+ protected final ChannelFactory secondaryChannelFactory;
+ protected Channel primary_channel = null;
+ protected Channel secondary_channel = null;
protected final MessageToMessageCodec<ByteBuf, ByteBuf> s7hmux;
-
+
protected int slice_ping = 0;
protected int slice_retry_time = 0;
-
- public S7HDefaultNettyPlcConnection(boolean canRead,
- boolean canWrite,
- boolean canSubscribe,
- boolean canBrowse,
- PlcTagHandler tagHandler,
- PlcValueHandler valueHandler,
- Configuration configuration,
- ChannelFactory channelFactory,
- ChannelFactory secondaryChannelFactory,
- boolean awaitSessionSetupComplete,
- boolean awaitSessionDisconnectComplete,
- boolean awaitSessionDiscoverComplete,
- ProtocolStackConfigurer stackConfigurer,
- BaseOptimizer optimizer,
- PlcAuthentication authentication) {
- super(canRead,
- canWrite,
- canSubscribe,
- canBrowse,
- tagHandler,
- valueHandler,
- configuration,
- channelFactory,
- awaitSessionSetupComplete,
- awaitSessionDisconnectComplete,
- awaitSessionDiscoverComplete,
- stackConfigurer,
- optimizer,
- authentication);
+
+ public S7HDefaultNettyPlcConnection(boolean canRead,
+ boolean canWrite,
+ boolean canSubscribe,
+ boolean canBrowse,
+ PlcTagHandler tagHandler,
+ PlcValueHandler valueHandler,
+ Configuration configuration,
+ ChannelFactory channelFactory,
+ ChannelFactory secondaryChannelFactory,
+ boolean awaitSessionSetupComplete,
+ boolean awaitSessionDisconnectComplete,
+ boolean awaitSessionDiscoverComplete,
+ ProtocolStackConfigurer<TPKTPacket> stackConfigurer,
+ BaseOptimizer optimizer,
+ PlcAuthentication authentication) {
+ super(canRead,
+ canWrite,
+ canSubscribe,
+ canBrowse,
+ tagHandler,
+ valueHandler,
+ configuration,
+ channelFactory,
+ awaitSessionSetupComplete,
+ awaitSessionDisconnectComplete,
+ awaitSessionDiscoverComplete,
+ stackConfigurer,
+ optimizer,
+ authentication);
this.secondaryChannelFactory = secondaryChannelFactory;
this.s7hmux = new S7HMuxImpl();
}
@@ -108,18 +109,18 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl
CompletableFuture<Void> sessionSetupCompleteFuture = new CompletableFuture<>();
CompletableFuture<Configuration> sessionDiscoveredCompleteFuture = new CompletableFuture<>();
- if(channelFactory == null) {
+ if (channelFactory == null) {
throw new PlcConnectionException("No primary channel factory provided");
}
// Inject the configuration
ConfigurationFactory.configure(configuration, channelFactory);
-
- if (secondaryChannelFactory != null )
- ConfigurationFactory.configure(configuration, secondaryChannelFactory);
-
+
+ if (secondaryChannelFactory != null)
+ ConfigurationFactory.configure(configuration, secondaryChannelFactory);
+
channel = new EmbeddedChannel(getChannelHandler(sessionSetupCompleteFuture, sessionDisconnectCompleteFuture, sessionDiscoveredCompleteFuture));
- channel.pipeline().addFirst(s7hmux);
+ channel.pipeline().addFirst(s7hmux);
((S7HMux) s7hmux).setEmbededhannel(channel);
//channel.pipeline().addFirst((new LoggingHandler(LogLevel.INFO)));
/*
@@ -131,18 +132,18 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl
});
*/
doPrimaryTcpConnections();
-
- if (secondaryChannelFactory != null )
- doSecondaryTcpConnections();
-
+
+ if (secondaryChannelFactory != null)
+ doSecondaryTcpConnections();
+
//If it is not possible to generate a TCP connection.
- //Safety shutdownn all executors in the channels.
- if (primary_channel == null)
- if (secondary_channel == null) {
- sendChannelDisconectEvent();
- throw new PlcConnectionException("Connection is not possible.");
- }
-
+ //Safety shutdown all executors in the channels.
+ if (primary_channel == null)
+ if (secondary_channel == null) {
+ sendChannelDisconectEvent();
+ throw new PlcConnectionException("Connection is not possible.");
+ }
+
scf = channel.eventLoop().scheduleWithFixedDelay(this, 1, 1, TimeUnit.SECONDS);
/*
@@ -158,15 +159,15 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl
}
});
*/
-
-
+
+
// Send an event to the pipeline telling the Protocol filters what's going on.
- sendChannelCreatedEvent();
-
+ sendChannelCreatedEvent();
+
// Wait till the connection is established.
if (awaitSessionSetupComplete) {
sessionSetupCompleteFuture.get();
- }
+ }
//channel.pipeline().write(new ConnectedEvent());
// Set the connection to "connected"
connected = true;
@@ -175,7 +176,7 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl
throw new PlcConnectionException(e);
} catch (ExecutionException e) {
throw new PlcConnectionException(e);
- }
+ }
}
@Override
@@ -186,130 +187,128 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl
} catch (Exception ex) {
logger.info(ex.toString());
}
- if (primary_channel != null)
- if (primary_channel.isActive()){
- try {
- primary_channel.pipeline().remove(MULTIPLEXOR);
- primary_channel.pipeline().fireUserEventTriggered(new CloseConnectionEvent());
- primary_channel.eventLoop().shutdownGracefully();
-
- } catch (Exception ex){
- logger.info(ex.toString());
+ if (primary_channel != null)
+ if (primary_channel.isActive()) {
+ try {
+ primary_channel.pipeline().remove(MULTIPLEXOR);
+ primary_channel.pipeline().fireUserEventTriggered(new CloseConnectionEvent());
+ primary_channel.eventLoop().shutdownGracefully();
+
+ } catch (Exception ex) {
+ logger.info(ex.toString());
+ }
}
- };
- if (secondary_channel != null)
- if (secondary_channel.isActive()){
- secondary_channel.pipeline().remove(MULTIPLEXOR);
- secondary_channel.pipeline().fireUserEventTriggered(new CloseConnectionEvent());
- secondary_channel.eventLoop().shutdownGracefully();
- }
+ if (secondary_channel != null)
+ if (secondary_channel.isActive()) {
+ secondary_channel.pipeline().remove(MULTIPLEXOR);
+ secondary_channel.pipeline().fireUserEventTriggered(new CloseConnectionEvent());
+ secondary_channel.eventLoop().shutdownGracefully();
+ }
- channel.pipeline().fireUserEventTriggered(new DisconnectEvent());
+ channel.pipeline().fireUserEventTriggered(new DisconnectEvent());
closed = true;
}
-
-
-
- public void doPrimaryTcpConnections(){
+
+
+ public void doPrimaryTcpConnections() {
try {
- primary_channel = channelFactory.createChannel(new LoggingHandler(LogLevel.TRACE) );
- } catch (Exception ex){
+ primary_channel = channelFactory.createChannel(new LoggingHandler(LogLevel.TRACE));
+ } catch (Exception ex) {
logger.info(ex.toString());
}
- if (primary_channel!=null)
- if (primary_channel.isActive())
- primary_channel.pipeline().addFirst(MULTIPLEXOR,s7hmux);
- ((S7HMux) s7hmux).setPrimaryChannel(primary_channel);
+ if (primary_channel != null)
+ if (primary_channel.isActive())
+ primary_channel.pipeline().addFirst(MULTIPLEXOR, s7hmux);
+ ((S7HMux) s7hmux).setPrimaryChannel(primary_channel);
}
-
- public void doSecondaryTcpConnections(){
+
+ public void doSecondaryTcpConnections() {
try {
- secondary_channel = secondaryChannelFactory.createChannel(new LoggingHandler(LogLevel.TRACE) );
- } catch (Exception ex){
+ secondary_channel = secondaryChannelFactory.createChannel(new LoggingHandler(LogLevel.TRACE));
+ } catch (Exception ex) {
logger.info(ex.toString());
}
- if (secondary_channel!=null)
- if (secondary_channel.isActive())
- secondary_channel.pipeline().addFirst(MULTIPLEXOR,s7hmux);
- ((S7HMux) s7hmux).setSecondaryChannel(secondary_channel);
- }
-
+ if (secondary_channel != null)
+ if (secondary_channel.isActive())
+ secondary_channel.pipeline().addFirst(MULTIPLEXOR, s7hmux);
+ ((S7HMux) s7hmux).setSecondaryChannel(secondary_channel);
+ }
+
/*
- * All handlers on the channel are notified that a disconnection has been
- * generated, generally during the first connection.
- * In this way, a controlled shutdown of the execution services is achieved.
- * The user application must take the measures to make the connection again.
- */
+ * All handlers on the channel are notified that a disconnection has been
+ * generated, generally during the first connection.
+ * In this way, a controlled shutdown of the execution services is achieved.
+ * The user application must take the measures to make the connection again.
+ */
protected void sendChannelDisconectEvent() {
logger.trace("Channels was not created, firing DisconnectEvent Event");
// Send an event to the pipeline telling the Protocol filters what's going on.
channel.pipeline().fireUserEventTriggered(new DisconnectEvent());
- }
+ }
/*
- * To avoid creating new tasks associated with the supervision of the
- * driver, I execute these tasks in a few slices of time. This allows me
- * to keep a simple control of the state machines.
- */
+ * To avoid creating new tasks associated with the supervision of the
+ * driver, I execute these tasks in a few slices of time. This allows me
+ * to keep a simple control of the state machines.
+ */
@Override
public void run() {
if (slice_retry_time >= channel.attr(S7HMuxImpl.RETRY_TIME).get()) {
- if (primary_channel != null){
- if (!primary_channel.isActive()){
- logger.info("Creating prymary conection.");
+ if (primary_channel != null) {
+ if (!primary_channel.isActive()) {
+ logger.info("Creating primary connection.");
primary_channel.eventLoop().shutdownGracefully();
- doPrimaryTcpConnections();
+ doPrimaryTcpConnections();
}
} else {
- logger.info("Creating firts prymary conection.");
- doPrimaryTcpConnections();
+ logger.info("Creating first primary connection.");
+ doPrimaryTcpConnections();
}
- if (secondary_channel != null){
- if (!secondary_channel.isActive()){
- logger.info("Creating secondary conection.");
- secondary_channel.eventLoop().shutdownGracefully();
- doSecondaryTcpConnections();
+ if (secondary_channel != null) {
+ if (!secondary_channel.isActive()) {
+ logger.info("Creating secondary connection.");
+ secondary_channel.eventLoop().shutdownGracefully();
+ doSecondaryTcpConnections();
}
- } else {
- if (secondaryChannelFactory != null ) {
- logger.info("Creating firts secondary conection.");
- doSecondaryTcpConnections();
+ } else {
+ if (secondaryChannelFactory != null) {
+ logger.info("Creating first secondary connection.");
+ doSecondaryTcpConnections();
}
- }
+ }
slice_retry_time = 0;
- };
+ }
if ((channel.attr(S7HMuxImpl.IS_PING_ACTIVE).get())) {
if (slice_ping >= channel.attr(S7HMuxImpl.PING_TIME).get()) {
ping();
slice_ping = 0;
- };
+ }
} else slice_ping = 0;
-
+
slice_retry_time++;
slice_ping++;
}
@Override
- public CompletableFuture<Void> ping() {
- if (channel.attr(S7HMuxImpl.IS_CONNECTED).get()) {
- channel.eventLoop().execute(()->{
+ public CompletableFuture<Void> ping() {
+ if (channel.attr(S7HMuxImpl.IS_CONNECTED).get()) {
+ channel.eventLoop().execute(() -> {
PlcReadRequest.Builder builder = readRequestBuilder();
- builder.addTagAddress("value", "%MX1.0:BOOL");
+ builder.addTagAddress("value", "%MX1.0:BOOL");
PlcReadRequest readRequest = builder.build();
- try
- {
+ try {
PlcReadResponse readResponse = readRequest.execute().get(2, TimeUnit.SECONDS);
logger.info("PING: " + readResponse.getResponseCode("value"));
- } catch (Exception ex){
- logger.info("PING: " + ex.toString());
+ } catch (Exception e) {
+ logger.info("PING: {}", e.getMessage(), e);
}
- });
- }
+ });
+ }
return null;
- }
-
+ }
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
index c7c386133e..fc6e6827cd 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java
@@ -18,9 +18,6 @@
*/
package org.apache.plc4x.java.s7.readwrite.protocol;
-import java.util.ServiceLoader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
@@ -28,52 +25,49 @@ import org.apache.plc4x.java.api.value.PlcValueHandler;
import org.apache.plc4x.java.s7.readwrite.TPKTPacket;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.configuration.ConfigurationFactory;
-import static org.apache.plc4x.java.spi.configuration.ConfigurationFactory.configure;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
-import org.apache.plc4x.java.spi.connection.DefaultNettyPlcConnection;
import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
-import static org.apache.plc4x.java.spi.connection.GeneratedDriverBase.PROPERTY_PLC4X_FORCE_AWAIT_DISCONNECT_COMPLETE;
-import static org.apache.plc4x.java.spi.connection.GeneratedDriverBase.PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE;
-import static org.apache.plc4x.java.spi.connection.GeneratedDriverBase.PROPERTY_PLC4X_FORCE_AWAIT_SETUP_COMPLETE;
import org.apache.plc4x.java.spi.connection.PlcTagHandler;
import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
import org.apache.plc4x.java.spi.transport.Transport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- * @author cgarcia
- */
-public class S7HGeneratedDriverBase extends GeneratedDriverBase<TPKTPacket>{
+import java.util.ServiceLoader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.apache.plc4x.java.spi.configuration.ConfigurationFactory.configure;
+
+public class S7HGeneratedDriverBase extends GeneratedDriverBase<TPKTPacket> {
+
+ private static final Logger logger = LoggerFactory.getLogger(S7HGeneratedDriverBase.class);
- private static final Logger logger = LoggerFactory.getLogger(S7HGeneratedDriverBase.class);
-
private static final Pattern URI_PATTERN = Pattern.compile(
- "^(?<protocolCode>[a-z0-9\\-]*)(:(?<transportCode>[a-z0-9]*))?://(?<transportConfig>[^?^/]*)(\\?(?<paramString>.*))?");
-
+ "^(?<protocolCode>[a-z0-9\\-]*)(:(?<transportCode>[a-z0-9]*))?://(?<transportConfig>[^?^/]*)(\\?(?<paramString>.*))?");
+
private static final Pattern URI_H_PATTERN = Pattern.compile(
"^(?<protocolCode>[a-z0-9\\-]*)(:(?<transportCode>[a-z0-9]*))?://(?<transportConfig>[^?]*)/(?<transportConfig2>[^?]*)\\?(?<paramString>.*)?");
-
+
@Override
public PlcConnection getConnection(String connectionString) throws PlcConnectionException {
// Split up the connection string into it's individual segments.
Matcher smatcher = URI_PATTERN.matcher(connectionString);
- Matcher hmatcher = URI_H_PATTERN.matcher(connectionString);
+ Matcher hmatcher = URI_H_PATTERN.matcher(connectionString);
if (!smatcher.matches() && !hmatcher.matches()) {
throw new PlcConnectionException(
"Connection string doesn't match the format '{protocol-code}:({transport-code})?//{transport-address}(?{parameter-string)?'");
}
-
- Matcher matcher = (smatcher.matches())?smatcher:hmatcher;
-
+
+ Matcher matcher = (smatcher.matches()) ? smatcher : hmatcher;
+
final String protocolCode = matcher.group("protocolCode");
final String transportCode = (matcher.group("transportCode") != null) ?
matcher.group("transportCode") : getDefaultTransport();
final String transportConfig = matcher.group("transportConfig");
- final String transportConfig2 = (hmatcher.matches())?matcher.group("transportConfig2"):null;
+ final String transportConfig2 = (hmatcher.matches()) ? matcher.group("transportConfig2") : null;
final String paramString = matcher.group("paramString");
-
+
// Check if the protocol code matches this driver.
if (!protocolCode.equals(getProtocolCode())) {
// Actually this shouldn't happen as the DriverManager should have not used this driver in the first place.
@@ -107,45 +101,45 @@ public class S7HGeneratedDriverBase extends GeneratedDriverBase<TPKTPacket>{
// Create an instance of the communication channel which the driver should use.
ChannelFactory channelFactory = transport.createChannelFactory(transportConfig);
- if(channelFactory == null) {
+ if (channelFactory == null) {
throw new PlcConnectionException("Unable to get channel factory from url " + transportConfig);
}
configure(configuration, channelFactory);
-
+
// Create an instance of the communication channel which the driver should use.
ChannelFactory secondaryChannelFactory = null;
if (hmatcher.matches()) {
secondaryChannelFactory = transport.createChannelFactory(transportConfig2);
- if(secondaryChannelFactory == null) {
+ if (secondaryChannelFactory == null) {
logger.info("Unable to get channel factory from url " + transportConfig2);
}
}
-
- if (hmatcher.matches())
- configure(configuration, secondaryChannelFactory);
+
+ if (hmatcher.matches())
+ configure(configuration, secondaryChannelFactory);
// Give drivers the option to customize the channel.
initializePipeline(channelFactory);
-
+
// Give drivers the option to customize the channel.
- if (hmatcher.matches())
- initializePipeline(secondaryChannelFactory);
+ if (hmatcher.matches())
+ initializePipeline(secondaryChannelFactory);
// Make the "await setup complete" overridable via system property.
boolean awaitSetupComplete = awaitSetupComplete();
- if(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_SETUP_COMPLETE) != null) {
+ if (System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_SETUP_COMPLETE) != null) {
awaitSetupComplete = Boolean.parseBoolean(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_SETUP_COMPLETE));
}
// Make the "await disconnect complete" overridable via system property.
boolean awaitDisconnectComplete = awaitDisconnectComplete();
- if(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCONNECT_COMPLETE) != null) {
+ if (System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCONNECT_COMPLETE) != null) {
awaitDisconnectComplete = Boolean.parseBoolean(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCONNECT_COMPLETE));
}
// Make the "await disconnect complete" overridable via system property.
boolean awaitDiscoverComplete = awaitDiscoverComplete();
- if(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE) != null) {
+ if (System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE) != null) {
awaitDiscoverComplete = Boolean.parseBoolean(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE));
}
@@ -199,10 +193,10 @@ public class S7HGeneratedDriverBase extends GeneratedDriverBase<TPKTPacket>{
public String getProtocolName() {
throw new UnsupportedOperationException("getProtocolName, Not supported yet.");
}
-
+
public PlcAuthentication getAuthentication() {
return null;
- }
+ }
+
-
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
index 96f97bb410..5cf9645b63 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java
@@ -21,9 +21,9 @@ package org.apache.plc4x.java.s7.readwrite.protocol;
import io.netty.channel.Channel;
public interface S7HMux {
-
-public void setEmbededhannel(Channel embeded_channel);
-public void setPrimaryChannel(Channel primary_channel);
-public void setSecondaryChannel(Channel secondary_channel);
-
+ void setEmbeddedChannel(Channel embeded_channel);
+
+ void setPrimaryChannel(Channel primary_channel);
+
+ void setSecondaryChannel(Channel secondary_channel);
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
index 4b192e82aa..2a90663b7a 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java
@@ -23,289 +23,286 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.embedded.EmbeddedChannel;
-
import io.netty.handler.codec.MessageToMessageCodec;
import io.netty.handler.timeout.ReadTimeoutHandler;
import io.netty.util.AttributeKey;
-import java.time.LocalTime;
-import java.util.List;
import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.DisconnectEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.time.LocalTime;
+import java.util.List;
+
/**
- * Implementation of a multiplexing channel, from an embedded channel to two
+ * Implementation of a multiplexing channel, from an embedded channel to two
* possible TCP connections, primary and secondary.
- * The objective is to allow connections to individual systems
- * with a two CP (PN CPUs, CP343-1, CP443-1 or similar), or H-type systems
+ * The objective is to allow connections to individual systems
+ * with a two CP (PN CPUs, CP343-1, CP443-1 or similar), or H-type systems
* (S7-400H or S7-1500H).
- *
- * The user App must be in charge of restoring the requests or
+ * <p>
+ * The user App must be in charge of restoring the requests or
* subscriptions that it is requesting.
- *
- * @author cgarcia
*/
@Sharable
public class S7HMuxImpl extends MessageToMessageCodec<ByteBuf, ByteBuf> implements S7HMux {
private static final Logger logger = LoggerFactory.getLogger(S7HMuxImpl.class);
-
+
/*
- * This attribute indicates to the other handlers that the channel is connected
- * or disconnected because a switch is being made between TCP channels or
- * both TCP channels are disconnected.
- * Default value: false
- */
+ * This attribute indicates to the other handlers that the channel is connected
+ * or disconnected because a switch is being made between TCP channels or
+ * both TCP channels are disconnected.
+ * Default value: false
+ */
final static AttributeKey<Boolean> IS_CONNECTED = AttributeKey.valueOf("IS_CONNECTED");
-
+
/*
- * This attribute indicates to the other handlers which channel is being used,
- * this allows the request to be properly prepared.
- * For example, in the case of a CPU with two CPs, you should change
- * the "slot", in the case of H systems, you should change the "rack",
- * the correct values will be defined in the connection URL.
- * Default value: true
- */
+ * This attribute indicates to the other handlers which channel is being used,
+ * this allows the request to be properly prepared.
+ * For example, in the case of a CPU with two CPs, you should change
+ * the "slot", in the case of H systems, you should change the "rack",
+ * the correct values will be defined in the connection URL.
+ * Default value: true
+ */
final static AttributeKey<Boolean> IS_PRIMARY = AttributeKey.valueOf("IS_PRIMARY");
-
+
/*
- * This is the maximum waiting time for reading on the TCP channel.
- * As there is no traffic, it must be assumed that the connection with the
- * interlocutor was lost and it must be restarted.
- * When the channel is closed, the "fail over" is carried out
- * in case of having the secondary channel, or it is expected that it
- * will be restored automatically, which is done every 4 seconds.
- * Default value: 8 sec.
- */
- final static AttributeKey<Integer> READ_TIME_OUT = AttributeKey.valueOf("READ_TIME_OUT");
-
+ * This is the maximum waiting time for reading on the TCP channel.
+ * As there is no traffic, it must be assumed that the connection with the
+ * interlocutor was lost and it must be restarted.
+ * When the channel is closed, the "fail over" is carried out
+ * in case of having the secondary channel, or it is expected that it
+ * will be restored automatically, which is done every 4 seconds.
+ * Default value: 8 sec.
+ */
+ final static AttributeKey<Integer> READ_TIME_OUT = AttributeKey.valueOf("READ_TIME_OUT");
+
/*
- * If your application requires sampling times greater than the
- * set "watchdog" time, it is important that the PING option is activated,
- * this will prevent the TCP channel from being closed unnecessarily.
- * Default value: false
- */
+ * If your application requires sampling times greater than the
+ * set "watchdog" time, it is important that the PING option is activated,
+ * this will prevent the TCP channel from being closed unnecessarily.
+ * Default value: false
+ */
final static AttributeKey<Boolean> IS_PING_ACTIVE = AttributeKey.valueOf("IS_PIN_ACTIVE");
-
+
/*
- * Time value in seconds at which the execution of the PING will be scheduled.
- * Generally set by developer experience, but generally should be the same
- * as READ_TIME_OUT / 2.
- * Default value: -1
- */
- final static AttributeKey<Integer> PING_TIME = AttributeKey.valueOf("PING_TIME");
-
+ * Time value in seconds at which the execution of the PING will be scheduled.
+ * Generally set by developer experience, but generally should be the same
+ * as READ_TIME_OUT / 2.
+ * Default value: -1
+ */
+ final static AttributeKey<Integer> PING_TIME = AttributeKey.valueOf("PING_TIME");
+
/*
- * Time for supervision of TCP channels. If the channel is not active,
- * a safe stop of the EventLoop must be performed, to ensure that
- * no additional tasks are created.
- * Default value: 4
- */
- final static AttributeKey<Integer> RETRY_TIME = AttributeKey.valueOf("RETRY_TIME");
-
+ * Time for supervision of TCP channels. If the channel is not active,
+ * a safe stop of the EventLoop must be performed, to ensure that
+ * no additional tasks are created.
+ * Default value: 4
+ */
+ final static AttributeKey<Integer> RETRY_TIME = AttributeKey.valueOf("RETRY_TIME");
+
ChannelHandlerContext embed_ctx = null;
- protected Channel embeded_channel = null;
+ protected Channel embeded_channel = null;
protected Channel tcp_channel = null;
- protected Channel primary_channel = null;
- protected Channel secondary_channel = null;
+ protected Channel primary_channel = null;
+ protected Channel secondary_channel = null;
/*
- * From S7ProtocolLogic
- * TODO: Evaluate if the "embed_ctx" is really required since we set
- * the Embeded channel when we created it.
- */
+ * From S7ProtocolLogic
+ * TODO: Evaluate if the "embed_ctx" is really required since we set
+ * the Embedded channel when we created it.
+ */
@Override
- protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List<Object> list) throws Exception {
- System.out.println("Llego aqui: " + outbb);
+ protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List<Object> list) throws Exception {
if ((embed_ctx == null) && (ctx.channel() instanceof EmbeddedChannel)) embed_ctx = ctx;
- if ((tcp_channel != null) && (embed_ctx == ctx)){
+ if ((tcp_channel != null) && (embed_ctx == ctx)) {
tcp_channel.writeAndFlush(outbb.copy());
} else {
- list.add(outbb.copy());
+ list.add(outbb.copy());
}
}
/*
- * To S7ProtocolLogic
- * The information received here from the channel "tcp_channel" is sent to
- * the pipeline of the channel "embeded_channel"
- */
+ * To S7ProtocolLogic
+ * The information received here from the channel "tcp_channel" is sent to
+ * the pipeline of the channel "embedded_channel"
+ */
@Override
- protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List<Object> list) throws Exception {
+ protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List<Object> list) throws Exception {
embed_ctx.fireChannelRead(inbb.copy());
}
@Override
public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
super.channelRegistered(ctx);
- logger.debug("channelRegistered: " + ctx.name());
+ logger.debug("channelRegistered: {}", ctx.name());
}
-
+
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
super.exceptionCaught(ctx, cause);
- logger.debug("exceptionCaught: " + ctx.name());
+ logger.debug("exceptionCaught: {}", ctx.name());
}
@Override
public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
- super.channelWritabilityChanged(ctx);
- logger.debug("channelWritabilityChanged: " + ctx.name() );
+ super.channelWritabilityChanged(ctx);
+ logger.debug("channelWritabilityChanged: {}", ctx.name());
}
/*
- * The events detected here flow from the S7ProtocolLogic object.
- * Upon receiving the "ConnectEvent" event, we must safely add the watchdog
- * to the pipeline of the "tcp_channel" connection.
- * The supervision time can be defined in the connection URL,
- * the default value being 8 secs, this value being defined experimentally.
- */
+ * The events detected here flow from the S7ProtocolLogic object.
+ * Upon receiving the "ConnectEvent" event, we must safely add the watchdog
+ * to the pipeline of the "tcp_channel" connection.
+ * The supervision time can be defined in the connection URL,
+ * the default value being 8 secs, this value being defined experimentally.
+ */
@Override
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
- super.userEventTriggered(ctx, evt);
- logger.info(LocalTime.now().toString() + " userEventTriggered: " + ctx.name() + " Event: " + evt);
+ super.userEventTriggered(ctx, evt);
+ logger.info("{} userEventTriggered: {} Event: {}", LocalTime.now(), ctx.name(), evt);
if (evt instanceof ConnectEvent) {
try {
- tcp_channel.pipeline().remove("watchdog");
- } catch (Exception ex){
+ tcp_channel.pipeline().remove("watchdog");
+ } catch (Exception ex) {
logger.info(ex.toString());
}
try {
- tcp_channel.pipeline().addFirst("watchdog", new ReadTimeoutHandler(30));
+ tcp_channel.pipeline().addFirst("watchdog", new ReadTimeoutHandler(30));
if (tcp_channel.isActive()) {
embeded_channel.attr(IS_CONNECTED).set(true);
- } else {
+ } else {
embeded_channel.attr(IS_CONNECTED).set(false);
- }
- } catch (Exception ex){
- logger.info(ex.toString());
- }
+ }
+ } catch (Exception ex) {
+ logger.info(ex.toString());
+ }
}
-
+
if (evt instanceof DisconnectEvent) {
logger.info("DisconnectEvent");
- }
-
+ }
+
}
@Override
public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
- super.channelReadComplete(ctx);
- logger.debug(LocalTime.now().toString() + " channelReadComplete: " + ctx.name() );
+ super.channelReadComplete(ctx);
+ logger.debug("{} channelReadComplete: {}", LocalTime.now(), ctx.name());
}
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- super.channelInactive(ctx);
- logger.debug("channelInactive: " + ctx.name());
+ super.channelInactive(ctx);
+ logger.debug("channelInactive: {}", ctx.name());
}
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
- super.channelActive(ctx);
- logger.debug("channelActive: " + ctx.name());
+ super.channelActive(ctx);
+ logger.debug("channelActive: {}", ctx.name());
}
@Override
public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
- super.channelUnregistered(ctx);
- logger.debug(LocalTime.now().toString() + " channelUnregistered: " + ctx.name() );
- String strCanal = (tcp_channel == primary_channel)?"PRIMARY":"SECONDARY";
+ super.channelUnregistered(ctx);
+ logger.debug("{} channelUnregistered: {}", LocalTime.now(), ctx.name());
+ String strCanal = (tcp_channel == primary_channel) ? "PRIMARY" : "SECONDARY";
logger.debug("Unregistered of channel: " + strCanal);
//TODO: If embedded channel is closed, we need close all channels
- if (ctx == embed_ctx) return;
-
+ if (ctx == embed_ctx) return;
+
if (tcp_channel == ctx.channel())
- embeded_channel.attr(IS_CONNECTED).set(false);
-
+ embeded_channel.attr(IS_CONNECTED).set(false);
+
logger.info(embed_ctx.executor().toString());
-
+
if ((tcp_channel == primary_channel) &&
(primary_channel == ctx.channel()))
- if ((!primary_channel.isActive()) &&
- (secondary_channel != null)) {
- if (secondary_channel.isActive())
- synchronized(tcp_channel) {
- logger.info("Using secondary TCP channel.");
- tcp_channel = secondary_channel;
- embeded_channel.attr(IS_PRIMARY).set(false);
- embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+ if ((!primary_channel.isActive()) &&
+ (secondary_channel != null)) {
+ if (secondary_channel.isActive())
+ synchronized (tcp_channel) {
+ logger.info("Using secondary TCP channel.");
+ tcp_channel = secondary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(false);
+ embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+ }
}
- };
if ((tcp_channel == secondary_channel) &&
(secondary_channel == ctx.channel()))
- if ((!secondary_channel.isActive() &&
- (primary_channel.isActive()))) {
- synchronized(tcp_channel) {
- logger.info("Using primary TCP channel.");
- tcp_channel = primary_channel;
- embeded_channel.attr(IS_PRIMARY).set(true);
- embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+ if ((!secondary_channel.isActive() &&
+ (primary_channel.isActive()))) {
+ synchronized (tcp_channel) {
+ logger.info("Using primary TCP channel.");
+ tcp_channel = primary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(true);
+ embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent());
+ }
}
- }
}
@Override
- public void setEmbededhannel(Channel embeded_channel) {
+ public void setEmbeddedChannel(Channel embeded_channel) {
this.embeded_channel = embeded_channel;
- this.embeded_channel.attr(IS_CONNECTED).set(false);
- this.embeded_channel.attr(IS_PRIMARY).set(true);
+ this.embeded_channel.attr(IS_CONNECTED).set(false);
+ this.embeded_channel.attr(IS_PRIMARY).set(true);
this.embeded_channel.attr(READ_TIME_OUT).set(8);
- this.embeded_channel.attr(IS_PING_ACTIVE).set(false);
- this.embeded_channel.attr(PING_TIME).set(-1);
- this.embeded_channel.attr(RETRY_TIME).set(8);
- }
-
- public void setPrimaryChannel(Channel primary_channel) {
- if ((this.primary_channel == null) && (tcp_channel == null)){
- if (primary_channel != null){
+ this.embeded_channel.attr(IS_PING_ACTIVE).set(false);
+ this.embeded_channel.attr(PING_TIME).set(-1);
+ this.embeded_channel.attr(RETRY_TIME).set(8);
+ }
+
+ public void setPrimaryChannel(Channel primary_channel) {
+ if ((this.primary_channel == null) && (tcp_channel == null)) {
+ if (primary_channel != null) {
this.primary_channel = primary_channel;
- tcp_channel = primary_channel;
- embeded_channel.attr(IS_PRIMARY).set(true);
+ tcp_channel = primary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(true);
}
- } else if ((!this.primary_channel.isActive()) && (tcp_channel == secondary_channel)){
+ } else if ((!this.primary_channel.isActive()) && (tcp_channel == secondary_channel)) {
this.primary_channel = primary_channel;
- } else if ((!this.primary_channel.isActive()) && (tcp_channel == this.primary_channel)){
- synchronized(tcp_channel) {
+ } else if ((!this.primary_channel.isActive()) && (tcp_channel == this.primary_channel)) {
+ synchronized (tcp_channel) {
tcp_channel.close();
this.primary_channel = primary_channel;
- tcp_channel = primary_channel;
- embeded_channel.attr(IS_PRIMARY).set(true);
+ tcp_channel = primary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(true);
if (tcp_channel.isActive()) {
- embed_ctx.fireUserEventTriggered(new ConnectEvent());
+ embed_ctx.fireUserEventTriggered(new ConnectEvent());
}
}
- }
+ }
}
@Override
public void setSecondaryChannel(Channel secondary_channel) {
if ((this.primary_channel == null) && (tcp_channel == null)) {
- if (secondary_channel != null){
+ if (secondary_channel != null) {
this.secondary_channel = secondary_channel;
- tcp_channel = secondary_channel;
- embeded_channel.attr(IS_PRIMARY).set(false);
+ tcp_channel = secondary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(false);
}
- } else if ((this.secondary_channel == null) || (tcp_channel == primary_channel)){
+ } else if ((this.secondary_channel == null) || (tcp_channel == primary_channel)) {
this.secondary_channel = secondary_channel;
- } else if ((!this.secondary_channel.isActive()) && (tcp_channel == primary_channel)){
+ } else if ((!this.secondary_channel.isActive()) && (tcp_channel == primary_channel)) {
this.secondary_channel = secondary_channel;
- } else if ((!this.secondary_channel.isActive()) && (tcp_channel == this.secondary_channel)){
- synchronized(tcp_channel) {
- tcp_channel.close();
+ } else if ((!this.secondary_channel.isActive()) && (tcp_channel == this.secondary_channel)) {
+ synchronized (tcp_channel) {
+ tcp_channel.close();
this.secondary_channel = secondary_channel;
- tcp_channel = secondary_channel;
- embeded_channel.attr(IS_PRIMARY).set(false);
+ tcp_channel = secondary_channel;
+ embeded_channel.attr(IS_PRIMARY).set(false);
}
if (tcp_channel.isActive()) {
- embed_ctx.fireUserEventTriggered(new ConnectEvent());
- }
+ embed_ctx.fireUserEventTriggered(new ConnectEvent());
+ }
}
}
-
-
+
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
index 56835b7e17..ac36d0651c 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java
@@ -18,70 +18,61 @@
*/
package org.apache.plc4x.java.s7.readwrite.protocol;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
+import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.s7.events.S7AlarmEvent;
-import org.apache.plc4x.java.s7.events.S7CyclicEvent;
-import org.apache.plc4x.java.s7.events.S7ModeEvent;
-import org.apache.plc4x.java.s7.events.S7SysEvent;
-import org.apache.plc4x.java.s7.events.S7UserEvent;
+import org.apache.plc4x.java.s7.events.*;
+import org.apache.plc4x.java.s7.readwrite.EventType;
import org.apache.plc4x.java.s7.readwrite.S7ParameterModeTransition;
import org.apache.plc4x.java.s7.readwrite.S7PayloadDiagnosticMessage;
-import org.apache.plc4x.java.s7.readwrite.EventType;
import org.apache.plc4x.java.s7.readwrite.utils.S7PlcSubscriptionHandle;
import org.apache.plc4x.java.spi.messages.PlcSubscriber;
import org.apache.plc4x.java.spi.model.DefaultPlcConsumerRegistration;
import org.slf4j.LoggerFactory;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
public class S7ProtocolEventLogic implements PlcSubscriber {
+
private final org.slf4j.Logger logger = LoggerFactory.getLogger(S7ProtocolEventLogic.class);
-
- private final BlockingQueue eventqueue;
- private final BlockingQueue dispachqueue = new ArrayBlockingQueue<>(1024);
-
- private Map<EventType, Map<PlcConsumerRegistration, Consumer>> mapIndex = new HashMap();
- private Map<EventType, PlcSubscriptionHandle> eventtypehandles = new HashMap(); ;
-
- private final Runnable runnProcessor;
- private final Runnable runnDispacher;
-
-
- private Thread processor;
- private Thread dispacher;
-
- public S7ProtocolEventLogic(BlockingQueue eventqueue) {
- this.eventqueue = eventqueue;
- runnProcessor = new ObjectProcessor(eventqueue,dispachqueue);
- runnDispacher = new EventDispacher(dispachqueue);
- processor = new Thread(runnProcessor);
- dispacher = new Thread(runnDispacher);
+
+ private final BlockingQueue<?> eventQueue;
+ private final BlockingQueue<PlcSubscriptionEvent> dispachQueue = new ArrayBlockingQueue<>(1024);
+
+ private final Map<EventType, Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>>> mapIndex = new HashMap<>();
+ private final Map<EventType, PlcSubscriptionHandle> eventTypeHandles = new HashMap<>();
+
+ private final Runnable runProcessor;
+ private final Runnable runDispacher;
+
+ private final Thread processor;
+ private final Thread dispacher;
+
+ public S7ProtocolEventLogic(BlockingQueue<?> eventQueue) {
+ this.eventQueue = eventQueue;
+ runProcessor = new ObjectProcessor(eventQueue, dispachQueue);
+ runDispacher = new EventDispatcher(dispachQueue);
+ processor = new Thread(runProcessor);
+ dispacher = new Thread(runDispacher);
}
-
+
public void start() {
processor.start();
- dispacher.start();
+ dispacher.start();
}
-
- public void stop(){
- ((ObjectProcessor) runnProcessor).doShutdown();
- ((EventDispacher) runnDispacher).doShutdown();
+
+ public void stop() {
+ ((ObjectProcessor) runProcessor).doShutdown();
+ ((EventDispatcher) runDispacher).doShutdown();
}
-
+
@Override
public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
@@ -94,144 +85,151 @@ public class S7ProtocolEventLogic implements PlcSubscriber {
@Override
public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer, Collection<PlcSubscriptionHandle> handles) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = null;
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = null;
S7PlcSubscriptionHandle handle = (S7PlcSubscriptionHandle) handles.toArray()[0];
if (!mapIndex.containsKey(handle.getEventType())) {
- mapConsumers = new HashMap();
+ mapConsumers = new HashMap<>();
mapIndex.put(handle.getEventType(), mapConsumers);
}
mapConsumers = mapIndex.get(handle.getEventType());
//TODO: Check the implementation of "DefaultPlcConsumerRegistration". List<> vs Collection<>
DefaultPlcConsumerRegistration registro = new DefaultPlcConsumerRegistration(this,
- consumer, handles.toArray(new PlcSubscriptionHandle[handles.size()]));
+ consumer, handles.toArray(new PlcSubscriptionHandle[0]));
mapConsumers.put(registro, consumer);
return registro;
}
@Override
public void unregister(PlcConsumerRegistration registration) {
- S7PlcSubscriptionHandle handle = (S7PlcSubscriptionHandle)registration.getSubscriptionHandles().get(0);
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(handle.getEventType());
+ S7PlcSubscriptionHandle handle = (S7PlcSubscriptionHandle) registration.getSubscriptionHandles().get(0);
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(handle.getEventType());
mapConsumers.remove(registration);
}
-
- private class ObjectProcessor implements Runnable {
-
- private final BlockingQueue eventqueue;
- private final BlockingQueue dispathqueue;
+
+ private static class ObjectProcessor implements Runnable {
+
+ private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ObjectProcessor.class);
+
+ private final BlockingQueue<?> eventQueue;
+ private final BlockingQueue<PlcSubscriptionEvent> dispatchQueue;
private boolean shutdown = false;
- private int delay = 100;
-
- public ObjectProcessor(BlockingQueue eventqueue, BlockingQueue dispathqueue) {
- this.eventqueue = eventqueue;
- this.dispathqueue = dispathqueue;
+ private final int delay = 100;
+
+ public ObjectProcessor(BlockingQueue<?> eventQueue, BlockingQueue<PlcSubscriptionEvent> dispatchQueue) {
+ this.eventQueue = eventQueue;
+ this.dispatchQueue = dispatchQueue;
}
-
+
@Override
public void run() {
- while(!shutdown){
+ while (!shutdown) {
try {
- Object obj = eventqueue.poll(delay, TimeUnit.MILLISECONDS);
- if (obj != null){
- if (obj instanceof S7ParameterModeTransition){
- S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) obj);
- dispathqueue.add(modeEvent);
- } else
- if (obj instanceof S7PayloadDiagnosticMessage){
- S7PayloadDiagnosticMessage msg = (S7PayloadDiagnosticMessage) obj;
- if ((msg.getEventId() >= 0x0A000) & (msg.getEventId() <= 0x0BFFF)) {
- S7UserEvent userevent = new S7UserEvent(msg);
- dispathqueue.add(userevent);
- } else {
- S7SysEvent sysevent = new S7SysEvent(msg);
- dispathqueue.add(sysevent);
- }
- } else
- if (obj instanceof S7CyclicEvent){
- dispathqueue.add(obj);
+ Object obj = eventQueue.poll(delay, TimeUnit.MILLISECONDS);
+ if (obj == null) {
+ continue;
+ }
+ if (obj instanceof S7ParameterModeTransition) {
+ S7ModeEvent modeEvent = new S7ModeEvent((S7ParameterModeTransition) obj);
+ dispatchQueue.add(modeEvent);
+ } else if (obj instanceof S7PayloadDiagnosticMessage) {
+ S7PayloadDiagnosticMessage msg = (S7PayloadDiagnosticMessage) obj;
+ if ((msg.getEventId() >= 0x0A000) & (msg.getEventId() <= 0x0BFFF)) {
+ S7UserEvent userEvent = new S7UserEvent(msg);
+ dispatchQueue.add(userEvent);
} else {
- S7AlarmEvent alarmevent = new S7AlarmEvent(obj);
- dispathqueue.add(alarmevent);
+ S7SysEvent sysEvent = new S7SysEvent(msg);
+ dispatchQueue.add(sysEvent);
}
- }
- } catch (InterruptedException ex) {
- Logger.getLogger(S7ProtocolEventLogic.class.getName()).log(Level.SEVERE, null, ex);
+ } else if (obj instanceof S7CyclicEvent) {
+ dispatchQueue.add((S7CyclicEvent) obj);
+ } else {
+ S7AlarmEvent alarmEvent = new S7AlarmEvent(obj);
+ dispatchQueue.add(alarmEvent);
+ }
+ } catch (InterruptedException e) {
+ LOGGER.error("oh no", e);
+ Thread.currentThread().interrupt();
}
}
- System.out.println("ObjectProcessor Bye!");
+ LOGGER.trace("ObjectProcessor Bye!");
}
- public void doShutdown(){
+ public void doShutdown() {
shutdown = true;
}
- }
-
- private class EventDispacher implements Runnable {
- private final BlockingQueue dispachqueue;
+ }
+
+ private class EventDispatcher implements Runnable {
+
+ private final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(EventDispatcher.class);
+
+ private final BlockingQueue<PlcSubscriptionEvent> dispachQueue;
private boolean shutdown = false;
- private int delay = 100;
- private Object cycDelayedObject = null;
+ private final int delay = 100;
+ private PlcSubscriptionEvent cycDelayedObject = null;
- public EventDispacher(BlockingQueue dispachqueue) {
- this.dispachqueue = dispachqueue;
+ public EventDispatcher(BlockingQueue<PlcSubscriptionEvent> dispachQueue) {
+ this.dispachQueue = dispachQueue;
}
-
+
@Override
public void run() {
try {
Thread.sleep(500);
- } catch (InterruptedException ex) {
- logger.warn(ex.toString());
+ } catch (InterruptedException e) {
+ logger.warn("Error sleeping", e);
+ Thread.currentThread().interrupt();
}
- while(!shutdown){
+ while (!shutdown) {
try {
- Object obj = dispachqueue.poll(delay, TimeUnit.MILLISECONDS);
- if (obj != null){
- if (obj instanceof S7ModeEvent){
+ PlcSubscriptionEvent obj = dispachQueue.poll(delay, TimeUnit.MILLISECONDS);
+ if (obj != null) {
+ if (obj instanceof S7ModeEvent) {
if (mapIndex.containsKey(EventType.MODE)) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(EventType.MODE);
- mapConsumers.forEach((x,y) -> y.accept(obj));
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(EventType.MODE);
+ mapConsumers.forEach((x, y) -> y.accept(obj));
}
} else if (obj instanceof S7UserEvent) {
if (mapIndex.containsKey(EventType.USR)) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(EventType.USR);
- mapConsumers.forEach((x,y) -> y.accept(obj));
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(EventType.USR);
+ mapConsumers.forEach((x, y) -> y.accept(obj));
}
} else if (obj instanceof S7SysEvent) {
if (mapIndex.containsKey(EventType.SYS)) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(EventType.SYS);
- mapConsumers.forEach((x,y) -> y.accept(obj));
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(EventType.SYS);
+ mapConsumers.forEach((x, y) -> y.accept(obj));
}
- }else if (obj instanceof S7AlarmEvent) {
+ } else if (obj instanceof S7AlarmEvent) {
if (mapIndex.containsKey(EventType.ALM)) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(EventType.ALM);
- mapConsumers.forEach((x,y) -> y.accept(obj));
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(EventType.ALM);
+ mapConsumers.forEach((x, y) -> y.accept(obj));
}
- }else if (obj instanceof S7CyclicEvent) {
+ } else if (obj instanceof S7CyclicEvent) {
if (mapIndex.containsKey(EventType.CYC)) {
- Map<PlcConsumerRegistration, Consumer> mapConsumers = mapIndex.get(EventType.CYC);
- if (cycDelayedObject != null) {
- mapConsumers.forEach((x,y) -> y.accept(cycDelayedObject));
- cycDelayedObject = null;
- }
- mapConsumers.forEach((x,y) -> y.accept(obj));
+ Map<PlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> mapConsumers = mapIndex.get(EventType.CYC);
+ if (cycDelayedObject != null) {
+ mapConsumers.forEach((x, y) -> y.accept(cycDelayedObject));
+ cycDelayedObject = null;
+ }
+ mapConsumers.forEach((x, y) -> y.accept(obj));
} else {
cycDelayedObject = obj;
- }
- }
+ }
+ }
}
- } catch (Exception ex) {
- Logger.getLogger(S7ProtocolEventLogic.class.getName()).log(Level.SEVERE, null, ex);
+ } catch (Exception e) {
+ LOGGER.error("oh no", e);
+ Thread.currentThread().interrupt();
}
}
- System.out.println("EventDispacher Bye!");
+ LOGGER.trace("EventDispatcher Bye!");
}
- public void doShutdown(){
+ public void doShutdown() {
shutdown = true;
}
-
+
}
-
-
+
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
index 343754c0cb..42e61bf3c8 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java
@@ -18,37 +18,39 @@
*/
package org.apache.plc4x.java.s7.readwrite.protocol;
-import org.apache.plc4x.java.api.model.PlcTag;
-import org.apache.plc4x.java.s7.readwrite.utils.S7PlcSubscriptionHandle;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
+import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
+import org.apache.plc4x.java.api.model.PlcSubscriptionTag;
+import org.apache.plc4x.java.api.model.PlcTag;
import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.spi.generation.*;
-import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionTag;
-import org.apache.plc4x.java.spi.values.PlcNull;
import org.apache.plc4x.java.api.value.PlcValue;
-import org.apache.plc4x.java.spi.values.PlcValueHandler;
+import org.apache.plc4x.java.s7.events.S7CyclicEvent;
import org.apache.plc4x.java.s7.readwrite.*;
-import org.apache.plc4x.java.s7.readwrite.tag.S7StringTag;
-import org.apache.plc4x.java.s7.readwrite.types.*;
-import org.apache.plc4x.java.s7.readwrite.tag.S7Tag;
+import org.apache.plc4x.java.s7.readwrite.context.S7DriverContext;
+import org.apache.plc4x.java.s7.readwrite.tag.*;
+import org.apache.plc4x.java.s7.readwrite.types.S7ControllerType;
+import org.apache.plc4x.java.s7.readwrite.types.S7SubscriptionType;
+import org.apache.plc4x.java.s7.readwrite.utils.S7PlcSubscriptionHandle;
+import org.apache.plc4x.java.s7.utils.S7ParamErrorCode;
import org.apache.plc4x.java.spi.ConversationContext;
import org.apache.plc4x.java.spi.Plc4xProtocolBase;
import org.apache.plc4x.java.spi.context.DriverContext;
-import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest;
-import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
-import org.apache.plc4x.java.spi.messages.DefaultPlcWriteRequest;
-import org.apache.plc4x.java.spi.messages.DefaultPlcWriteResponse;
+import org.apache.plc4x.java.spi.generation.*;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.utils.ResponseItem;
+import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionTag;
import org.apache.plc4x.java.spi.transaction.RequestTransactionManager;
+import org.apache.plc4x.java.spi.values.PlcList;
+import org.apache.plc4x.java.spi.values.PlcNull;
+import org.apache.plc4x.java.spi.values.PlcSINT;
+import org.apache.plc4x.java.spi.values.PlcValueHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,39 +58,11 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.time.Duration;
import java.util.*;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
-import java.util.logging.Level;
import java.util.stream.IntStream;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.commons.lang3.tuple.MutablePair;
-
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse;
-import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
-import org.apache.plc4x.java.api.model.PlcSubscriptionTag;
-import org.apache.plc4x.java.s7.events.S7CyclicEvent;
-import org.apache.plc4x.java.s7.readwrite.context.S7DriverContext;
-import org.apache.plc4x.java.s7.readwrite.tag.S7AckTag;
-import org.apache.plc4x.java.s7.readwrite.tag.S7SubscriptionTag;
-import org.apache.plc4x.java.s7.readwrite.tag.S7SzlTag;
-import org.apache.plc4x.java.s7.utils.S7ParamErrorCode;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionRequest;
-import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionResponse;
-import org.apache.plc4x.java.spi.messages.DefaultPlcUnsubscriptionRequest;
-import org.apache.plc4x.java.spi.values.PlcList;
-import org.apache.plc4x.java.spi.values.PlcSINT;
/**
* The S7 Protocol states that there can not be more then {min(maxAmqCaller, maxAmqCallee} "ongoing" requests.
@@ -96,21 +70,21 @@ import org.apache.plc4x.java.spi.values.PlcSINT;
* Thus, each request goes to a Work Queue and this Queue ensures, that only 3 are open at the same time.
*/
public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
-
+
private final Logger logger = LoggerFactory.getLogger(S7ProtocolLogic.class);
-
+
public static final Duration REQUEST_TIMEOUT = Duration.ofMillis(10000);
private final AtomicInteger tpduGenerator = new AtomicInteger(10);
-
+
/*
* Task group for managing connection redundancy.
*/
- private ExecutorService clientExecutorService = Executors.newFixedThreadPool(4, new BasicThreadFactory.Builder()
- .namingPattern("plc4x-app-thread-%d")
- .daemon(true)
- .priority(Thread.MAX_PRIORITY)
- .build());
-
+ private final ExecutorService clientExecutorService = Executors.newFixedThreadPool(4, new BasicThreadFactory.Builder()
+ .namingPattern("plc4x-app-thread-%d")
+ .daemon(true)
+ .priority(Thread.MAX_PRIORITY)
+ .build());
+
/*
* Take into account that the size of this buffer depends on the final device.
* S7-300 goes from 20 to 300 and for S7-400 it goes from 300 to 10000.
@@ -119,25 +93,25 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
* (Examples of this are PCS7 and Braumat).
* Alarm filtering, ack, etc. must be performed by the client application.
*/
- private final BlockingQueue eventQueue = new ArrayBlockingQueue<>(1024);
+ private final BlockingQueue<Object> eventQueue = new ArrayBlockingQueue<>(1024);
private final S7ProtocolEventLogic EventLogic = new S7ProtocolEventLogic(eventQueue);
private final S7PlcSubscriptionHandle modeHandle = new S7PlcSubscriptionHandle(EventType.MODE, EventLogic);
private final S7PlcSubscriptionHandle sysHandle = new S7PlcSubscriptionHandle(EventType.SYS, EventLogic);
private final S7PlcSubscriptionHandle usrHandle = new S7PlcSubscriptionHandle(EventType.USR, EventLogic);
private final S7PlcSubscriptionHandle almHandle = new S7PlcSubscriptionHandle(EventType.ALM, EventLogic);
- private final S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(EventType.CYC,EventLogic);
+ private final S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(EventType.CYC, EventLogic);
/*
- * For the reconnection functionality by a "TimeOut" of the connection,
- * you must keep track of open transactions. In general, an S7 device
- * supports a couple of simultaneous requests.
- * The rhythm of execution must be determined by the TransactionManager.
- * So far it is the way to indicate to the user that he must redo
- * his request.
- */
- private HashMap<Object,MutablePair<RequestTransactionManager.RequestTransaction, Object>> active_requests = new HashMap<>();
-
-
+ * For the reconnection functionality by a "TimeOut" of the connection,
+ * you must keep track of open transactions. In general, an S7 device
+ * supports a couple of simultaneous requests.
+ * The rhythm of execution must be determined by the TransactionManager.
+ * So far it is the way to indicate to the user that he must redo
+ * his request.
+ */
+ private final HashMap<Object, MutablePair<RequestTransactionManager.RequestTransaction, Object>> activeRequests = new HashMap<>();
+
+
private S7DriverContext s7DriverContext;
private RequestTransactionManager tm;
@@ -164,10 +138,9 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
context.fireConnected();
return;
}
-
- //Set feature for all handlers in the pipeline from
- //the driver configuration.
- setChannelFeatures();
+
+ //Set feature for all handlers in the pipeline from the driver configuration.
+ setChannelFeatures();
// Only the TCP transport supports login.
logger.info("S7 Driver running in ACTIVE mode.");
@@ -245,15 +218,15 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
});
}
-
- /*
- * It performs the sequential and safe shutdown of the driver.
- * Completion of pending requests, executors and associated tasks.
- */
+
+ /*
+ * It performs the sequential and safe shutdown of the driver.
+ * Completion of pending requests, executors and associated tasks.
+ */
@Override
public void onDisconnect(ConversationContext<TPKTPacket> context) {
//1. Clear all pending requests and their associated transaction
- cleanFutures();
+ cleanFutures();
//2. Here we shutdown the local task executor.
clientExecutorService.shutdown();
//3. Performs the shutdown of the transaction executor.
@@ -265,47 +238,47 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
//6. Here is the stop of any task or state machine that is added.
}
-
+
@Override
public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
if (!isConnected()) {
- CompletableFuture<PlcReadResponse> future = new CompletableFuture<PlcReadResponse>();
- future.completeExceptionally(new PlcRuntimeException("Disconnected"));
+ CompletableFuture<PlcReadResponse> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcRuntimeException("Disconnected"));
return future;
- }
+ }
DefaultPlcReadRequest request = (DefaultPlcReadRequest) readRequest;
List<S7VarRequestParameterItem> requestItems = new ArrayList<>(request.getNumberOfTags());
-
+
if (request.getTags().get(0) instanceof S7SzlTag) {
S7SzlTag szltag = (S7SzlTag) request.getTags().get(0);
-
- final S7MessageUserData s7SzlMessageRequest = new S7MessageUserData(1, new S7ParameterUserData(Arrays.asList(
+
+ final S7MessageUserData s7SzlMessageRequest = new S7MessageUserData(1, new S7ParameterUserData(List.of(
new S7ParameterUserDataItemCPUFunctions((short) 0x11, (byte) 0x4, (byte) 0x4, (short) 0x01, (short) 0x00, null, null, null)
- )), new S7PayloadUserData(Arrays.asList(
- new S7PayloadUserDataItemCpuFunctionReadSzlRequest(DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- 0x04,
- new SzlId(SzlModuleTypeClass.enumForValue((byte) ((szltag.getSzlId() & 0xf000) >> 12)),
- (byte) ((szltag.getSzlId() & 0x0f00) >> 8),
- SzlSublist.enumForValue((short) (szltag.getSzlId() & 0x00ff))),
- szltag.getIndex())
- )));
-
- return toPlcReadResponse(readRequest, readInternal(s7SzlMessageRequest));
-
+ )), new S7PayloadUserData(List.of(
+ new S7PayloadUserDataItemCpuFunctionReadSzlRequest(DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ 0x04,
+ new SzlId(SzlModuleTypeClass.enumForValue((byte) ((szltag.getSzlId() & 0xf000) >> 12)),
+ (byte) ((szltag.getSzlId() & 0x0f00) >> 8),
+ SzlSublist.enumForValue((short) (szltag.getSzlId() & 0x00ff))),
+ szltag.getIndex())
+ )));
+
+ return toPlcReadResponse(readRequest, readInternal(s7SzlMessageRequest));
+
} else if (request.getTags().get(0) instanceof S7AckTag) {
-
+
List<S7ParameterUserDataItem> parameterItems = new ArrayList<>(request.getNumberOfTags());
List<S7PayloadUserDataItem> payloadItems = new ArrayList<>(request.getNumberOfTags());
encodeAlarmAckRequest(request, parameterItems, payloadItems);
- final S7MessageUserData s7MessageRequest = new S7MessageUserData(-1,
+ final S7MessageUserData s7MessageRequest = new S7MessageUserData(-1,
new S7ParameterUserData(parameterItems),
- new S7PayloadUserData(payloadItems));
- return toPlcReadResponse(readRequest, readInternal(s7MessageRequest ));
-
- }
-
-
+ new S7PayloadUserData(payloadItems));
+ return toPlcReadResponse(readRequest, readInternal(s7MessageRequest));
+
+ }
+
+
for (PlcTag tag : request.getTags()) {
requestItems.add(new S7VarRequestParameterItemAddress(encodeS7Address(tag)));
}
@@ -324,27 +297,25 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
* Maps the S7ReadResponse of a PlcReadRequest to a PlcReadResponse
*/
private CompletableFuture<PlcReadResponse> toPlcReadResponse(PlcReadRequest readRequest, CompletableFuture<S7Message> response) {
- CompletableFuture<PlcReadResponse> client_future = new CompletableFuture<>();
- active_requests.get(response).setRight(client_future);
-
+ CompletableFuture<PlcReadResponse> client_future = new CompletableFuture<>();
+ activeRequests.get(response).setRight(client_future);
+
try {
- clientExecutorService.execute(()->{
- try
- {
- PlcReadResponse plcitems = (PlcReadResponse) decodeReadResponse(response.get(), readRequest);
- client_future.complete(plcitems);
- } catch (Exception ex) {
- logger.info(ex.toString());
+ clientExecutorService.execute(() -> {
+ try {
+ PlcReadResponse plcItems = (PlcReadResponse) decodeReadResponse(response.get(), readRequest);
+ client_future.complete(plcItems);
+ } catch (Exception e) {
+ logger.info("uh", e);
}
});
- } catch (Exception ex) {
- logger.info(ex.toString());
- }
-
- return client_future;
+ } catch (Exception e) {
+ logger.info("uh", e);
+ }
+ return client_future;
-
+// TODO: whoever out commented this describe why it is out commented and describe what the above does different
// return response
// .thenApply(p -> {
// try {
@@ -371,11 +342,11 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
S7Message message = (request instanceof S7MessageUserData) ?
- new S7MessageUserData(tpduId, request.getParameter(), request.getPayload()) :
- new S7MessageRequest(tpduId, request.getParameter(), request.getPayload());
-
- TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, message, true, (short) tpduId));
-
+ new S7MessageUserData(tpduId, request.getParameter(), request.getPayload()) :
+ new S7MessageRequest(tpduId, request.getParameter(), request.getPayload());
+
+ TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, message, true, (short) tpduId));
+
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
transaction.submit(() -> context.sendRequest(tpktPacket)
@@ -388,16 +359,16 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
.unwrap(COTPPacket::getPayload)
.check(p -> p.getTpduReference() == tpduId)
.handle(p -> {
- active_requests.remove(future);
+ activeRequests.remove(future);
future.complete(p);
// Finish the request-transaction.
transaction.endRequest();
}));
- active_requests.put(future, new MutablePair<>(transaction, null));
-
+ activeRequests.put(future, new MutablePair<>(transaction, null));
+
return future;
}
-
+
@Override
public CompletableFuture<PlcWriteResponse> write(PlcWriteRequest writeRequest) {
@@ -407,17 +378,17 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
List<S7VarPayloadDataItem> payloadItems = new ArrayList<>(request.getNumberOfTags());
Iterator<String> iter = request.getTagNames().iterator();
-
+
String tagName = null;
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
tagName = iter.next();
final S7Tag tag = (S7Tag) request.getTag(tagName);
final PlcValue plcValue = request.getPlcValue(tagName);
parameterItems.add(new S7VarRequestParameterItemAddress(encodeS7Address(tag)));
- payloadItems.add(serializePlcValue(tag, plcValue, iter.hasNext()));
+ payloadItems.add(serializePlcValue(tag, plcValue, iter.hasNext()));
}
-
-
+
+
// for (String tagName : request.getTagNames()) {
// final S7Tag tag = (S7Tag) request.getTag(tagName);
// final PlcValue plcValue = request.getPlcValue(tagName);
@@ -425,9 +396,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
// payloadItems.add(serializePlcValue(tag, plcValue));
//
// }
-
-
-
+
+
final int tpduId = tpduGenerator.getAndIncrement();
// If we've reached the max value for a 16 bit transaction identifier, reset back to 1
if (tpduGenerator.get() == 0xFFFF) {
@@ -445,7 +415,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
(short) tpduId
)
);
-
+
// Start a new request-transaction (Is ended in the response-handler)
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
transaction.submit(() -> context.sendRequest(tpktPacket)
@@ -471,36 +441,36 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
@Override
public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
if (!isConnected()) {
- CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<PlcSubscriptionResponse>();
- future.completeExceptionally(new PlcRuntimeException("Disconnected"));
+ CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcRuntimeException("Disconnected"));
return future;
- }
+ }
if (!isFeatureSupported()) {
- CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<PlcSubscriptionResponse>();
- future.completeExceptionally(new PlcRuntimeException("Not Supported"));
+ CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcRuntimeException("Not Supported"));
return future;
- }
-
- CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
- HashMap<String, PlcSubscriptionResponse> valuesResponse = new HashMap<>();
+ }
+
+ CompletableFuture<PlcSubscriptionResponse> future = new CompletableFuture<>();
+ HashMap<String, PlcSubscriptionResponse> valuesResponse = new HashMap<>();
HashMap<String, CompletableFuture<S7Message>> futures = new HashMap<>();
-
+
//Initialize multiple requests.
- CompletableFuture<PlcSubscriptionResponse> response = new CompletableFuture<>();
- subscriptionRequest.getTagNames().forEach(fieldname -> futures.put(fieldname, new CompletableFuture<>()));
-
+ CompletableFuture<PlcSubscriptionResponse> response = new CompletableFuture<>();
+ subscriptionRequest.getTagNames().forEach(fieldname -> futures.put(fieldname, new CompletableFuture<>()));
+
DefaultPlcSubscriptionRequest request = (DefaultPlcSubscriptionRequest) subscriptionRequest;
List<S7ParameterUserDataItem> parameterItems = new ArrayList<>(request.getNumberOfTags());
List<S7PayloadUserDataItem> payloadItems = new ArrayList<>(request.getNumberOfTags());
-
+
//The main task that runs the subscriptions.
- CompletableFuture<Void> maintask;
- maintask = CompletableFuture.
- allOf(futures.values().toArray(new CompletableFuture[0]));
-
- Thread t1 = new Thread(()->{
+ CompletableFuture<Void> mainTask;
+ mainTask = CompletableFuture.
+ allOf(futures.values().toArray(new CompletableFuture[0]));
+
+ Thread t1 = new Thread(() -> {
for (String tagName : request.getTagNames()) {
final DefaultPlcSubscriptionTag sf = (DefaultPlcSubscriptionTag) request.getTag(tagName);
@@ -564,35 +534,35 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
// Finish the request-transaction.
transaction.endRequest();
- }));
-
+ }));
+
try {
valuesResponse.put(tagName, decodeEventSubscriptionRequest(tagName, subscriptionRequest, futures.get(tagName).get()));
} catch (Exception ex) {
logger.warn(ex.toString());
}
-
+
} //Next
-
+
try {
- maintask.get();
+ mainTask.get();
HashMap<String, ResponseItem<PlcSubscriptionHandle>> values = new HashMap<>();
-
- valuesResponse.forEach((s,p)->{
+
+ valuesResponse.forEach((s, p) -> {
if (p != null)
- values.putAll(((DefaultPlcSubscriptionResponse)p).getValues());
- });
-
- response.complete(new DefaultPlcSubscriptionResponse(subscriptionRequest, values));
+ values.putAll(((DefaultPlcSubscriptionResponse) p).getValues());
+ });
- } catch (Exception ex) {
- logger.warn(ex.getMessage());
- }
+ response.complete(new DefaultPlcSubscriptionResponse(subscriptionRequest, values));
+
+ } catch (Exception e) {
+ logger.warn("uh", e);
+ }
});
-
+
t1.start();
-
+
return response;
}
@@ -600,15 +570,15 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
@Override
public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
if (!isConnected()) {
- CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<PlcUnsubscriptionResponse>();
- future.completeExceptionally(new PlcRuntimeException("Disconnected"));
+ CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcRuntimeException("Disconnected"));
return future;
- }
+ }
if (!isFeatureSupported()) {
- CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<PlcUnsubscriptionResponse>();
- future.completeExceptionally(new PlcRuntimeException("Not Supported"));
+ CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcRuntimeException("Not Supported"));
return future;
- }
+ }
CompletableFuture<PlcUnsubscriptionResponse> future = new CompletableFuture<>();
DefaultPlcUnsubscriptionRequest request = (DefaultPlcUnsubscriptionRequest) unsubscriptionRequest;
@@ -623,8 +593,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
if (request.getTag(tagName) instanceof DefaultPlcSubscriptionTag) {
PlcTag event = ((DefaultPlcSubscriptionTag) request.getTag(tagName)).getTag();
if (event instanceof S7SubscriptionTag) {
- if (((S7SubscriptionTag) event).getTagType() == S7SubscriptionType.EVENT_SUBSCRIPTION)
- subsevent = (byte) (subsevent | ((S7SubscriptionTag) event).getEventType().getValue());
+ if (((S7SubscriptionTag) event).getTagType() == S7SubscriptionType.EVENT_SUBSCRIPTION)
+ subsevent = (byte) (subsevent | ((S7SubscriptionTag) event).getEventType().getValue());
}
}
}
@@ -644,7 +614,6 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest payload;
- //System.out.println("Subsevent: " + subsevent + " : " + String.format("0x%04X", subsevent));
if (subsevent > 0) {
payload = new S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest(
DataTransportErrorCode.OK,
@@ -662,9 +631,9 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
} else {
alarmtype = AlarmStateType.ALARM_S_INITIATE;
}
-
- short auxsubsevent = (short) (subsevent & 0xFF);
-
+
+ short auxsubsevent = (short) (subsevent & 0xFF);
+
payload = new S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest(
DataTransportErrorCode.OK,
DataTransportSize.OCTET_STRING,
@@ -681,8 +650,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName,
- PlcSubscriptionRequest plcSubscriptionRequest,
- S7Message responseMessage)
+ PlcSubscriptionRequest plcSubscriptionRequest,
+ S7Message responseMessage)
throws PlcProtocolException {
Map<String, ResponseItem<PlcSubscriptionHandle>> values = new HashMap<>();
@@ -724,12 +693,12 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
}
}
-
+
S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter();
List<S7ParameterUserDataItem> parameters = parameter.getItems();
- S7ParameterUserDataItemCPUFunctions itemparameter = (S7ParameterUserDataItemCPUFunctions) parameters.get(0);
- errorCode = itemparameter.getErrorCode().shortValue();
-
+ S7ParameterUserDataItemCPUFunctions itemparameter = (S7ParameterUserDataItemCPUFunctions) parameters.get(0);
+ errorCode = itemparameter.getErrorCode().shortValue();
+
// In all other cases all went well.
S7PayloadUserData payload = (S7PayloadUserData) responseMessage.getPayload();
@@ -763,63 +732,63 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
(item.getTransportSize() == DataTransportSize.OCTET_STRING)) {
responseOk = true;
}
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmAckResponse) {
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmAckResponse) {
S7PayloadUserDataItemCpuFunctionAlarmAckResponse items =
- (S7PayloadUserDataItemCpuFunctionAlarmAckResponse)
- payloadItems.get(0) ;
+ (S7PayloadUserDataItemCpuFunctionAlarmAckResponse)
+ payloadItems.get(0);
//String tagName = (String) plcSubscriptionRequest.getTagNames().toArray()[0];
//TODO: Chequear si tagName es el correcto
- logger.info("strTagName: " + strTagName);
- values.put(strTagName, new ResponseItem(PlcResponseCode.OK, null));
- for (short s:items.getMessageObjects()){
+ logger.info("strTagName: {}", strTagName);
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.OK, null));
+ for (short s : items.getMessageObjects()) {
if (s == 0x0000) {
- values.put(Integer.toHexString(s), new ResponseItem(PlcResponseCode.OK, null));
+ values.put(Integer.toHexString(s), new ResponseItem<>(PlcResponseCode.OK, null));
} else if (s == 0x000a) {
- values.put(Integer.toHexString(s), new ResponseItem(PlcResponseCode.NOT_FOUND, null));
+ values.put(Integer.toHexString(s), new ResponseItem<>(PlcResponseCode.NOT_FOUND, null));
}
}
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
-
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse) {
-
- S7PayloadUserDataItemCpuFunctionAlarmAckResponse items =
- (S7PayloadUserDataItemCpuFunctionAlarmAckResponse)
- payloadItems.get(0);
- //String fieldName = (String) S7PayloadUserDataItemCyclicServicesPush .getFieldNames().toArray()[0];
- logger.warn("Request field: " + strTagName + ": " + S7ParamErrorCode.valueOf(errorCode)+ " " + S7ParamErrorCode.valueOf(errorCode).getEvent());
- values.put(strTagName, new ResponseItem(PlcResponseCode.NOT_FOUND, null));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
-
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) {
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse) {
+
+ S7PayloadUserDataItemCpuFunctionAlarmAckResponse items =
+ (S7PayloadUserDataItemCpuFunctionAlarmAckResponse)
+ payloadItems.get(0);
+ //String fieldName = (String) S7PayloadUserDataItemCyclicServicesPush .getFieldNames().toArray()[0];
+ logger.warn("Request field: {}: {} {}", strTagName, S7ParamErrorCode.valueOf(errorCode), S7ParamErrorCode.valueOf(errorCode).getEvent());
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.NOT_FOUND, null));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) {
S7PayloadUserDataItemCpuFunctionAlarmQueryResponse items =
- (S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) payloadItems.get(0);
+ (S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) payloadItems.get(0);
ByteBuf buffer = Unpooled.directBuffer(items.getItems().length * 2);
ByteBuf rxbuffer = Unpooled.directBuffer(items.getItems().length * 2);
buffer.writeBytes(items.getItems());
-
-
+
+
int numberOfItems = 1;
-
- if (itemparameter.getLastDataUnit() == 1){
- short loop = 0xff;
+ if (itemparameter.getLastDataUnit() == 1) {
+
+ short loop = 0xff;
CompletableFuture<S7MessageUserData> loopfuture = null;
- S7MessageUserData msg = null;
+ S7MessageUserData msg = null;
S7ParameterUserDataItemCPUFunctions loopparameter = null;
- S7PayloadUserDataItemCpuFunctionAlarmQueryResponse looppayload = null;
-
+ S7PayloadUserDataItemCpuFunctionAlarmQueryResponse looppayload = null;
+
do {
loopfuture = reassembledAlarmEvents(itemparameter.getSequenceNumber());
-
+
try {
-
+
msg = loopfuture.get();
if (msg != null) {
- loopparameter = (S7ParameterUserDataItemCPUFunctions) ((S7ParameterUserData) msg.getParameter()).getItems().get(0);
+ loopparameter = (S7ParameterUserDataItemCPUFunctions) ((S7ParameterUserData) msg.getParameter()).getItems().get(0);
looppayload = (S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) ((S7PayloadUserData) msg.getPayload()).getItems().get(0);
buffer.writeBytes(looppayload.getItems());
@@ -827,91 +796,91 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
loop = loopparameter.getLastDataUnit();
} else loop = 0x00;
-
+
} catch (Exception ex) {
logger.warn(ex.toString());
}
} while (loop > 0x00);
- rxbuffer.writeByte(looppayload .getReturnCode().getValue());
- rxbuffer.writeByte(looppayload .getTransportSize().getValue());
+ rxbuffer.writeByte(looppayload.getReturnCode().getValue());
+ rxbuffer.writeByte(looppayload.getTransportSize().getValue());
rxbuffer.writeShort(looppayload.getDataLength());
rxbuffer.writeBytes(buffer);
} else {
- rxbuffer.writeByte(payloadItems.get(0).getReturnCode().getValue());
- rxbuffer.writeByte(payloadItems.get(0).getTransportSize().getValue());
- rxbuffer.writeShort(payloadItems.get(0).getDataLength());
- rxbuffer.writeBytes(buffer);
+ rxbuffer.writeByte(payloadItems.get(0).getReturnCode().getValue());
+ rxbuffer.writeByte(payloadItems.get(0).getTransportSize().getValue());
+ rxbuffer.writeShort(payloadItems.get(0).getDataLength());
+ rxbuffer.writeBytes(buffer);
}
-
+
ReadBuffer readBuffer = new ReadBufferByteBased(ByteBufUtil.getBytes(rxbuffer));
try {
-
+
short cpuSubfunction = 0x00;
-
+
if (s7DriverContext.getControllerType() == S7ControllerType.S7_300) {
- cpuSubfunction = 0x13;
- } else cpuSubfunction = 0xf0 ;
+ cpuSubfunction = 0x13;
+ } else cpuSubfunction = 0xf0;
- S7PayloadUserDataItem payloaditem =
- S7PayloadUserDataItem.staticParse(readBuffer,
+ S7PayloadUserDataItem payloadItem =
+ S7PayloadUserDataItem.staticParse(readBuffer,
(byte) 0x04,
- (byte) 0x00,
+ (byte) 0x00,
cpuSubfunction);
- eventQueue.add(payloaditem);
- } catch (Exception ex) {
+ eventQueue.add(payloadItem);
+ } catch (Exception ex) {
logger.info(ex.toString());
- }
-
+ }
+
PlcResponseCode rescode = (items.getReturnCode() == DataTransportErrorCode.OK) ? PlcResponseCode.OK : PlcResponseCode.INTERNAL_ERROR;
- values.put(strTagName, new ResponseItem(rescode, null));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
-
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesSubscribeResponse) {
+ values.put(strTagName, new ResponseItem<>(rescode, null));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesSubscribeResponse) {
//S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter();
//logger.info("Aqui debe responder a Cyclic transfer");
S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions)
- parameter.getItems().get(0);
-
+ parameter.getItems().get(0);
+
S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest,
- msgparameter.getSequenceNumber(),
- (S7PayloadUserDataItemCyclicServicesSubscribeResponse) payloadItems.get(0));
-
- eventQueue.add(cycevent);
- values.put(strTagName, new ResponseItem(PlcResponseCode.OK, cycHandle));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
-
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) {
+ msgparameter.getSequenceNumber(),
+ (S7PayloadUserDataItemCyclicServicesSubscribeResponse) payloadItems.get(0));
+
+ eventQueue.add(cycevent);
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.OK, cycHandle));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) {
//logger.info("Aqui debe responder a Cyclic transfer Change Driven");
S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions)
- parameter.getItems().get(0);
-
+ parameter.getItems().get(0);
+
S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest,
- msgparameter.getSequenceNumber(),
- (S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) payloadItems.get(0));
-
- eventQueue.add(cycevent);
- values.put(strTagName, new ResponseItem(PlcResponseCode.OK, cycHandle));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
-
- } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesErrorResponse) {
+ msgparameter.getSequenceNumber(),
+ (S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) payloadItems.get(0));
+
+ eventQueue.add(cycevent);
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.OK, cycHandle));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+
+ } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesErrorResponse) {
//S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter();
//S7ParameterUserDataItem[] parameters = parameter.getItems();
//S7ParameterUserDataItemCPUFunctions itemparameter = (S7ParameterUserDataItemCPUFunctions) parameters[0];
//errorCode = itemparameter.getErrorCode().shortValue();
- logger.warn("Request field: " + strTagName + ": " + S7ParamErrorCode.valueOf(errorCode)+ " " + S7ParamErrorCode.valueOf(errorCode).getEvent());
- if (errorCode == 0x8104){
- values.put(strTagName, new ResponseItem(PlcResponseCode.UNSUPPORTED, null));
- } else
- values.put(strTagName, new ResponseItem(PlcResponseCode.INTERNAL_ERROR, null));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
+ logger.warn("Request field: " + strTagName + ": " + S7ParamErrorCode.valueOf(errorCode) + " " + S7ParamErrorCode.valueOf(errorCode).getEvent());
+ if (errorCode == 0x8104) {
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.UNSUPPORTED, null));
+ } else
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.INTERNAL_ERROR, null));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
} else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesUnsubscribeResponse) {
- values.put(strTagName, new ResponseItem(PlcResponseCode.OK, null));
- return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values);
- }
+ values.put(strTagName, new ResponseItem<>(PlcResponseCode.OK, null));
+ return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values);
+ }
if (responseOk) {
for (String tagName : plcSubscriptionRequest.getTagNames()) {
@@ -945,23 +914,23 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
- private void encodeAlarmAckRequest( DefaultPlcReadRequest request,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItems) {
-
+ private void encodeAlarmAckRequest(DefaultPlcReadRequest request,
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItems) {
+
S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions(
- (short) 0x11, //Method
- (byte) 0x04, //FunctionType
- (byte) 0x04, //FunctionGroup
- (short) 0x0b, //SubFunction
- (short) 0x00, //SequenceNumber
- null, //DataUnitReferenceNumber
- null, //LastDataUnit
- null //errorCode
- );
+ (short) 0x11, //Method
+ (byte) 0x04, //FunctionType
+ (byte) 0x04, //FunctionGroup
+ (short) 0x0b, //SubFunction
+ (short) 0x00, //SequenceNumber
+ null, //DataUnitReferenceNumber
+ null, //LastDataUnit
+ null //errorCode
+ );
parameterItems.clear();
parameterItems.add(parameter);
-
+
ArrayList<AlarmMessageObjectAckType> messageObjects = null;
BitSet bs = new BitSet();
for (String fieldName : request.getTagNames()) {
@@ -974,107 +943,107 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
messageObjects = new ArrayList();
int j = 0;
for (int i = 0; i < arrAlarmIds.size(); i++) {
- bs = BitSet.valueOf(new byte[]{arrAlarmSigs.get(i).byteValue()});
-
- AlarmMessageObjectAckType messageObject = new AlarmMessageObjectAckType(
- SyntaxIdType.ALARM_ACKSET,
- (short) 0,
- arrAlarmIds.get(i),
- new State(bs.get(7),bs.get(6),bs.get(5),bs.get(4),bs.get(3),bs.get(2),bs.get(1),bs.get(0)),
- new State(bs.get(7),bs.get(6),bs.get(5),bs.get(4),bs.get(3),bs.get(2),bs.get(1),bs.get(0))
- );
- //messageObjects[i] = messageObject;
- messageObjects.add(messageObject);
+ bs = BitSet.valueOf(new byte[]{arrAlarmSigs.get(i).byteValue()});
+
+ AlarmMessageObjectAckType messageObject = new AlarmMessageObjectAckType(
+ SyntaxIdType.ALARM_ACKSET,
+ (short) 0,
+ arrAlarmIds.get(i),
+ new State(bs.get(7), bs.get(6), bs.get(5), bs.get(4), bs.get(3), bs.get(2), bs.get(1), bs.get(0)),
+ new State(bs.get(7), bs.get(6), bs.get(5), bs.get(4), bs.get(3), bs.get(2), bs.get(1), bs.get(0))
+ );
+ //messageObjects[i] = messageObject;
+ messageObjects.add(messageObject);
}
}
}
}
-
+
S7PayloadUserDataItemCpuFunctionAlarmAckRequest payload =
new S7PayloadUserDataItemCpuFunctionAlarmAckRequest(
- DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- 0x0c,
- messageObjects);
+ DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ 0x0c,
+ messageObjects);
//
payloadItems.clear();
- payloadItems.add(payload);
-
- }
+ payloadItems.add(payload);
+
+ }
private void encodeAlarmQueryRequest(DefaultPlcSubscriptionRequest request,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItems) {
-
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItems) {
+
S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions(
- (short) 0x11, //Method
- (byte) 0x04, //FunctionType
- (byte) 0x04, //FunctionGroup
- (short) 0x13, //SubFunction
- (short) 0x00, //SequenceNumber
- null, //DataUnitReferenceNumber
- null, //LastDataUnit
- null //errorCode
- );
-
+ (short) 0x11, //Method
+ (byte) 0x04, //FunctionType
+ (byte) 0x04, //FunctionGroup
+ (short) 0x13, //SubFunction
+ (short) 0x00, //SequenceNumber
+ null, //DataUnitReferenceNumber
+ null, //LastDataUnit
+ null //errorCode
+ );
+
parameterItems.clear();
parameterItems.add(parameter);
-
+
//TODO: Chequear el tipo dfe larma.
S7PayloadUserDataItemCpuFunctionAlarmQueryRequest payload =
new S7PayloadUserDataItemCpuFunctionAlarmQueryRequest(
- DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- 0x0c,
- SyntaxIdType.ALARM_QUERYREQSET,
- QueryType.ALARM_8P,
- AlarmType.ALARM_8);
-
+ DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ 0x0c,
+ SyntaxIdType.ALARM_QUERYREQSET,
+ QueryType.ALARM_8P,
+ AlarmType.ALARM_8);
+
payloadItems.clear();
- payloadItems.add(payload);
+ payloadItems.add(payload);
}
private void encodeCycledSubscriptionRequest(DefaultPlcSubscriptionRequest request,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItem) {
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItem) {
}
private void encodeCycledS7ANYSubscriptionRequest(PlcSubscriptionTag plctag,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItems){
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItems) {
S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions(
- (short) 0x11, //Method
- (byte) 0x04, //FunctionType
- (byte) 0x02, //FunctionGroup
- (short) 0x01, //SubFunction
- (short) 0x00, //SequenceNumber
- null, //DataUnitReferenceNumber
- null, //LastDataUnit
- null //errorCode
- );
-
+ (short) 0x11, //Method
+ (byte) 0x04, //FunctionType
+ (byte) 0x02, //FunctionGroup
+ (short) 0x01, //SubFunction
+ (short) 0x00, //SequenceNumber
+ null, //DataUnitReferenceNumber
+ null, //LastDataUnit
+ null //errorCode
+ );
+
parameterItems.clear();
parameterItems.add(parameter);
-
+
//TODO: Chequear la asignacionde tipo
-
+
PlcTag tag = ((DefaultPlcSubscriptionTag) plctag).getTag();
S7SubscriptionTag s7tag = (S7SubscriptionTag) tag;
//
- List<CycServiceItemType> items = new ArrayList();
+ List<CycServiceItemType> items = new ArrayList<>();
//
- int i=0;
- for (S7Tag userfield:s7tag.getS7Tags()) {
+ int i = 0;
+ for (S7Tag userfield : s7tag.getS7Tags()) {
items.add(new CycServiceItemAnyType(
- (short) 0x0a,
- (short) 0x10, //S7ANY
- userfield.getDataType(),
- userfield.getNumberOfElements(),
- userfield.getBlockNumber(),
- userfield.getMemoryArea(),
- (long) (((userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007)))
+ (short) 0x0a,
+ (short) 0x10, //S7ANY
+ userfield.getDataType(),
+ userfield.getNumberOfElements(),
+ userfield.getBlockNumber(),
+ userfield.getMemoryArea(),
+ ((((long) userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007)))
));
i++;
}
@@ -1084,126 +1053,126 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
int lengthInBytes = 4 + items.size() * 12;
//
S7PayloadUserDataItemCyclicServicesSubscribeRequest payload =
- new S7PayloadUserDataItemCyclicServicesSubscribeRequest(
- DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- lengthInBytes,
- items.size(),
- s7tag.getTimeBase(),
- s7tag.getMultiplier(),
- items
- );
-
+ new S7PayloadUserDataItemCyclicServicesSubscribeRequest(
+ DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ lengthInBytes,
+ items.size(),
+ s7tag.getTimeBase(),
+ s7tag.getMultiplier(),
+ items
+ );
+
payloadItems.clear();
payloadItems.add(payload);
}
-
+
private void encodeCycledDBREADSubscriptionRequest(PlcSubscriptionTag plctag,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItems){
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItems) {
S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions(
- (short) 0x11, //Method
- (byte) 0x04, //FunctionType
- (byte) 0x02, //FunctionGroup
- (short) 0x01, //SubFunction
- (short) 0x00, //SequenceNumber
- null, //DataUnitReferenceNumber
- null, //LastDataUnit
- null //errorCode
- );
-
+ (short) 0x11, //Method
+ (byte) 0x04, //FunctionType
+ (byte) 0x02, //FunctionGroup
+ (short) 0x01, //SubFunction
+ (short) 0x00, //SequenceNumber
+ null, //DataUnitReferenceNumber
+ null, //LastDataUnit
+ null //errorCode
+ );
+
parameterItems.clear();
parameterItems.add(parameter);
-
+
//TODO: Chequear la asignacionde tipo
PlcTag tag = ((DefaultPlcSubscriptionTag) plctag).getTag();
S7SubscriptionTag s7tag = (S7SubscriptionTag) tag;
- double cycitemcount = Math.ceil(((double)s7tag.getS7Tags().length / (double) 50));
-
+ double cycitemcount = Math.ceil(((double) s7tag.getS7Tags().length / (double) 50));
+
//CycServiceItemDbReadType[] cycitems = new CycServiceItemDbReadType[(int) cycitemcount];
List<CycServiceItemType> cycitems = new ArrayList();
- ArrayList<SubItem> subitems = new ArrayList();
- for (S7Tag userfield:s7tag.getS7Tags()){
+ ArrayList<SubItem> subitems = new ArrayList();
+ for (S7Tag userfield : s7tag.getS7Tags()) {
subitems.add(new SubItem((short) userfield.getNumberOfElements(),
- userfield.getBlockNumber(),
- userfield.getByteOffset()));
- }
-
+ userfield.getBlockNumber(),
+ userfield.getByteOffset()));
+ }
+
int initpos = 0;
- int endpos = (subitems.size() < 50)?subitems.size():49;
- int j=0;
- int lengthInBytes = 4;
- do{
- List<SubItem> arraysubitems = subitems.subList(initpos, endpos);
-
- cycitems.add(j,new CycServiceItemDbReadType(
- (short) (arraysubitems.size()*5+2),
- (short) 0xb0,
- (short) arraysubitems.size(),
- arraysubitems));
-
+ int endpos = (subitems.size() < 50) ? subitems.size() : 49;
+ int j = 0;
+ int lengthInBytes = 4;
+ do {
+ List<SubItem> arraysubitems = subitems.subList(initpos, endpos);
+
+ cycitems.add(j, new CycServiceItemDbReadType(
+ (short) (arraysubitems.size() * 5 + 2),
+ (short) 0xb0,
+ (short) arraysubitems.size(),
+ arraysubitems));
+
lengthInBytes += 4 + arraysubitems.size() * 5;
initpos = endpos++;
- endpos = ((initpos+49) < subitems.size())?(initpos+49):subitems.size();
+ endpos = ((initpos + 49) < subitems.size()) ? (initpos + 49) : subitems.size();
j++;
} while (j < cycitems.size());
S7PayloadUserDataItemCyclicServicesSubscribeRequest payload =
- new S7PayloadUserDataItemCyclicServicesSubscribeRequest(
- DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- lengthInBytes,
- cycitems.size(),
- s7tag.getTimeBase(),
- s7tag.getMultiplier(),
- cycitems
- );
-
+ new S7PayloadUserDataItemCyclicServicesSubscribeRequest(
+ DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ lengthInBytes,
+ cycitems.size(),
+ s7tag.getTimeBase(),
+ s7tag.getMultiplier(),
+ cycitems
+ );
+
payloadItems.clear();
payloadItems.add(payload);
}
-
-
+
+
private void encodeCycledUnSubscriptionRequest(DefaultPlcSubscriptionRequest request,
- List<S7ParameterUserDataItem> parameterItems,
- List<S7PayloadUserDataItem> payloadItems) {
-
+ List<S7ParameterUserDataItem> parameterItems,
+ List<S7PayloadUserDataItem> payloadItems) {
+
S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions(
- (short) 0x11, //Method
- (byte) 0x04, //FunctionType
- (byte) 0x02, //FunctionGroup
- (short) 0x04, //SubFunction
- (short) 0x00, //SequenceNumber
- null, //DataUnitReferenceNumber
- null, //LastDataUnit
- null //errorCode
- );
-
+ (short) 0x11, //Method
+ (byte) 0x04, //FunctionType
+ (byte) 0x02, //FunctionGroup
+ (short) 0x04, //SubFunction
+ (short) 0x00, //SequenceNumber
+ null, //DataUnitReferenceNumber
+ null, //LastDataUnit
+ null //errorCode
+ );
+
parameterItems.clear();
parameterItems.add(parameter);
-
+
PlcSubscriptionTag tag = request.getTags().get(0);
- S7SubscriptionTag s7tag = (S7SubscriptionTag) tag;
+ S7SubscriptionTag s7tag = (S7SubscriptionTag) tag;
//PlcField field = ((DefaultPlcSubscriptionField) plcfield).getPlcField();
//S7SubscriptionField s7field = (S7SubscriptionField) field;
-
+
//TODO:Check CPU type
S7PayloadUserDataItemCyclicServicesUnsubscribeRequest payload =
- new S7PayloadUserDataItemCyclicServicesUnsubscribeRequest (
- DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- 0x02,
- (short) 0x05,
- s7tag.getAckAlarms().get(0).byteValue()
- );
-
+ new S7PayloadUserDataItemCyclicServicesUnsubscribeRequest(
+ DataTransportErrorCode.OK,
+ DataTransportSize.OCTET_STRING,
+ 0x02,
+ (short) 0x05,
+ s7tag.getAckAlarms().get(0).byteValue()
+ );
+
payloadItems.clear();
- payloadItems.add(payload);
+ payloadItems.add(payload);
}
@@ -1212,7 +1181,6 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
*/
@Override
protected void decode(ConversationContext<TPKTPacket> context, TPKTPacket msg) throws Exception {
-
S7Message s7msg = msg.getPayload().getPayload();
S7Parameter parameter = s7msg.getParameter();
if (parameter instanceof S7ParameterModeTransition) {
@@ -1245,39 +1213,39 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
eventQueue.addAll(items);
} else if ((myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x13)) {
- } else if ((myparameter.getCpuFunctionGroup() == 0x02) && (myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x01)){
-
- S7ParameterUserDataItemCPUFunctions parameteritem =
- (S7ParameterUserDataItemCPUFunctions)
- ((S7ParameterUserData) parameter).getItems().get(0);
-
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
-
- S7PayloadUserDataItemCyclicServicesPush payloaditem =
- (S7PayloadUserDataItemCyclicServicesPush)
- payload.getItems().get(0);
-
- S7CyclicEvent cycevent = new S7CyclicEvent(null,
- parameteritem.getSequenceNumber(),
- payloaditem);
- eventQueue.add(cycevent);
-
- } else if ((myparameter.getCpuFunctionGroup() == 0x02) && (myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x05)) {
- S7ParameterUserDataItemCPUFunctions parameteritem =
- (S7ParameterUserDataItemCPUFunctions)
- ((S7ParameterUserData) parameter).getItems().get(0);
-
- S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
-
- S7PayloadUserDataItemCyclicServicesChangeDrivenPush payloaditem =
- (S7PayloadUserDataItemCyclicServicesChangeDrivenPush)
- payload.getItems().get(0);
-
- S7CyclicEvent cycevent = new S7CyclicEvent(null,
- parameteritem.getSequenceNumber(),
- payloaditem);
- eventQueue.add(cycevent);
-
+ } else if ((myparameter.getCpuFunctionGroup() == 0x02) && (myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x01)) {
+
+ S7ParameterUserDataItemCPUFunctions parameteritem =
+ (S7ParameterUserDataItemCPUFunctions)
+ ((S7ParameterUserData) parameter).getItems().get(0);
+
+ S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
+
+ S7PayloadUserDataItemCyclicServicesPush payloaditem =
+ (S7PayloadUserDataItemCyclicServicesPush)
+ payload.getItems().get(0);
+
+ S7CyclicEvent cycevent = new S7CyclicEvent(null,
+ parameteritem.getSequenceNumber(),
+ payloaditem);
+ eventQueue.add(cycevent);
+
+ } else if ((myparameter.getCpuFunctionGroup() == 0x02) && (myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x05)) {
+ S7ParameterUserDataItemCPUFunctions parameteritem =
+ (S7ParameterUserDataItemCPUFunctions)
+ ((S7ParameterUserData) parameter).getItems().get(0);
+
+ S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload();
+
+ S7PayloadUserDataItemCyclicServicesChangeDrivenPush payloaditem =
+ (S7PayloadUserDataItemCyclicServicesChangeDrivenPush)
+ payload.getItems().get(0);
+
+ S7CyclicEvent cycevent = new S7CyclicEvent(null,
+ parameteritem.getSequenceNumber(),
+ payloaditem);
+ eventQueue.add(cycevent);
+
} else if ((myparameter.getCpuFunctionType() == 0x08) && (myparameter.getCpuSubfunction() == 0x01)) {
} else if ((myparameter.getCpuFunctionType() == 0x08) && (myparameter.getCpuSubfunction() == 0x04)) {
@@ -1301,7 +1269,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
}
S7PayloadUserDataItemCpuFunctionReadSzlResponse readSzlResponseItem =
(S7PayloadUserDataItemCpuFunctionReadSzlResponse) item;
-
+
+ // TODO: describe why this is out commented
// for (SzlDataTreeItem readSzlResponseItemItem : readSzlResponseItem.getItems()) {
// if (readSzlResponseItemItem.getItemIndex() != 0x0001) {
// continue;
@@ -1314,8 +1283,8 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
// }
ByteBuf szlitem = Unpooled.wrappedBuffer(readSzlResponseItem.getItems());
String articleNumber = szlitem.toString(2, 20, Charset.defaultCharset());
- s7DriverContext.setControllerType(decodeControllerType(articleNumber));
- context.fireConnected();
+ s7DriverContext.setControllerType(decodeControllerType(articleNumber));
+ context.fireConnected();
}
}
@@ -1324,12 +1293,12 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
new S7ParameterUserDataItemCPUFunctions((short) 0x11, (byte) 0x4, (byte) 0x4, (short) 0x01, (short) 0x00, null, null, null)
)), new S7PayloadUserData(Collections.singletonList(
new S7PayloadUserDataItemCpuFunctionReadSzlRequest(DataTransportErrorCode.OK,
- DataTransportSize.OCTET_STRING,
- 0x0C,
- new SzlId(SzlModuleTypeClass.CPU,
+ DataTransportSize.OCTET_STRING,
+ 0x0C,
+ new SzlId(SzlModuleTypeClass.CPU,
(byte) 0x00,
- SzlSublist.MODULE_IDENTIFICATION),
- 0x0000)
+ SzlSublist.MODULE_IDENTIFICATION),
+ 0x0000)
)));
COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2);
return new TPKTPacket(cotpPacketData);
@@ -1378,7 +1347,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
short errorClass;
short errorCode;
- S7ParameterUserDataItemCPUFunctions parameteritem = null;
+ S7ParameterUserDataItemCPUFunctions parameteritem = null;
if (responseMessage instanceof S7MessageResponseData) {
S7MessageResponseData messageResponseData = (S7MessageResponseData) responseMessage;
errorClass = messageResponseData.getErrorClass();
@@ -1387,13 +1356,13 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
S7MessageResponse messageResponse = (S7MessageResponse) responseMessage;
errorClass = messageResponse.getErrorClass();
errorCode = messageResponse.getErrorCode();
- } else if(responseMessage instanceof S7MessageUserData) {
+ } else if (responseMessage instanceof S7MessageUserData) {
S7MessageUserData messageResponse = (S7MessageUserData) responseMessage;
S7ParameterUserData parameters = (S7ParameterUserData) messageResponse.getParameter();
parameteritem = (S7ParameterUserDataItemCPUFunctions) parameters.getItems().get(0);
errorClass = 0;
errorCode = parameteritem.getErrorCode().shortValue();
- } else {
+ } else {
throw new PlcProtocolException("Unsupported message type " + responseMessage.getClass().getName());
}
// If the result contains any form of non-null error code, handle this instead.
@@ -1423,87 +1392,88 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
//TODO: Reemsambling message.
if (responseMessage instanceof S7MessageUserData) {
-
- S7PayloadUserData payload = (S7PayloadUserData) responseMessage.getPayload();
+
+ S7PayloadUserData payload = (S7PayloadUserData) responseMessage.getPayload();
if (plcReadRequest.getNumberOfTags() != payload.getItems().size()) {
throw new PlcProtocolException(
"The number of requested items doesn't match the number of returned items");
- }
-
- List<S7PayloadUserDataItem> payloadItems = payload.getItems();
+ }
+
+ List<S7PayloadUserDataItem> payloadItems = payload.getItems();
PlcResponseCode responseCode = PlcResponseCode.INTERNAL_ERROR;
- PlcValue plcValue = null;
+ PlcValue plcValue = null;
int index = 0;
for (String tagName : plcReadRequest.getTagNames()) {
-
- if (plcReadRequest.getTag(tagName) instanceof S7SzlTag ) {
+
+ if (plcReadRequest.getTag(tagName) instanceof S7SzlTag) {
S7SzlTag tag = (S7SzlTag) plcReadRequest.getTag(tagName);
- S7PayloadUserDataItemCpuFunctionReadSzlResponse payloadItem = (S7PayloadUserDataItemCpuFunctionReadSzlResponse) payloadItems.get(index);
+ S7PayloadUserDataItemCpuFunctionReadSzlResponse payloadItem = (S7PayloadUserDataItemCpuFunctionReadSzlResponse) payloadItems.get(index);
responseCode = decodeResponseCode(payloadItem.getReturnCode());
-
+
if (responseCode == PlcResponseCode.OK) {
try {
LinkedList plcvalues = null;
byte[] data = payloadItem.getItems();
plcvalues = new LinkedList<PlcSINT>();
- for (byte b:data ) plcvalues.add(new PlcSINT(b));
+ for (byte b : data) plcvalues.add(new PlcSINT(b));
if (parameteritem.getLastDataUnit() == 1) {
CompletableFuture<S7MessageUserData> next_future = null;
S7ParameterUserData next_parameter = null;
S7PayloadUserData next_payload = null;
S7PayloadUserDataItemCpuFunctionReadSzlResponse next_payloadItem = null;
-
+
while (parameteritem.getLastDataUnit() == 1) {
//TODO: Just wait for one answer!. Pending for other packages for rearm.
- next_future = reassembledMessage(parameteritem.getSequenceNumber(), plcvalues);
+ next_future = reassembledMessage(parameteritem.getSequenceNumber(), plcvalues);
S7MessageUserData msg = null;
- msg = next_future.get();
+ msg = next_future.get();
if (msg != null) {
next_parameter = (S7ParameterUserData) msg.getParameter();
parameteritem = (S7ParameterUserDataItemCPUFunctions) next_parameter.getItems().get(0);
next_payload = (S7PayloadUserData) msg.getPayload();
next_payloadItem = (S7PayloadUserDataItemCpuFunctionReadSzlResponse) next_payload.getItems().get(0);
- for (byte b:next_payloadItem.getItems()) plcvalues.add(new PlcSINT(b));
+ for (byte b : next_payloadItem.getItems()) plcvalues.add(new PlcSINT(b));
}
-
- plcValue = new PlcList(plcvalues);
+
+ plcValue = new PlcList(plcvalues);
}
-
+
} else {
- plcValue = new PlcList(plcvalues);
+ plcValue = new PlcList(plcvalues);
}
- } catch(Exception e) {
+ } catch (Exception e) {
throw new PlcProtocolException("Error decoding PlcValue", e);
}
}
-
- } if (plcReadRequest.getTag(tagName) instanceof S7AckTag ) {
+
+ }
+ if (plcReadRequest.getTag(tagName) instanceof S7AckTag) {
S7AckTag field = (S7AckTag) plcReadRequest.getTag(tagName);
- S7PayloadUserDataItemCpuFunctionAlarmAckResponse payloadItem =
- (S7PayloadUserDataItemCpuFunctionAlarmAckResponse) payloadItems.get(index);
- responseCode = decodeResponseCode(payloadItem.getReturnCode());
+ S7PayloadUserDataItemCpuFunctionAlarmAckResponse payloadItem =
+ (S7PayloadUserDataItemCpuFunctionAlarmAckResponse) payloadItems.get(index);
+ responseCode = decodeResponseCode(payloadItem.getReturnCode());
List<Short> data = payloadItem.getMessageObjects();
- LinkedList plcvalues = new LinkedList<PlcSINT>();
- for (short b:data ) plcvalues.add(new PlcSINT((byte) b));
- plcValue = new PlcList(plcvalues);
+ LinkedList<PlcValue> plcvalues = new LinkedList<>();
+ for (short b : data) plcvalues.add(new PlcSINT((byte) b));
+ plcValue = new PlcList(plcvalues);
}
-
+
ResponseItem<PlcValue> result = new ResponseItem<>(responseCode, plcValue);
values.put(tagName, result);
index++;
}
- return new DefaultPlcReadResponse(plcReadRequest, values);
-
- }
-
+ return new DefaultPlcReadResponse(plcReadRequest, values);
+
+ }
+
// In all other cases all went well.
S7PayloadReadVarResponse payload = (S7PayloadReadVarResponse) responseMessage.getPayload();
@@ -1740,147 +1710,138 @@ public class S7ProtocolLogic extends Plc4xProtocolBase<TPKTPacket> {
s7Tag.getMemoryArea(), s7Tag.getByteOffset(), s7Tag.getBitOffset());
}
-
- private void cleanFutures(){
+
+ private void cleanFutures() {
//TODO: Debe ser ejecutado si la conexion esta levanta.
- active_requests.forEach((f,p)->{
+ activeRequests.forEach((f, p) -> {
CompletableFuture<Object> cf = (CompletableFuture<Object>) f;
try {
if (!cf.isDone()) {
logger.info("CF");
cf.cancel(true);
logger.info("ClientCF");
- ((CompletableFuture<Object>) p.getRight()).completeExceptionally(new PlcRuntimeException("Disconnected"));
+ ((CompletableFuture<Object>) p.getRight()).completeExceptionally(new PlcRuntimeException("Disconnected"));
logger.info("TM");
p.getLeft().endRequest();
- };
- } catch (Exception ex){
+ }
+ } catch (Exception ex) {
logger.info(ex.toString());
}
});
- active_requests.clear();
+ activeRequests.clear();
+
+ }
- }
-
- private boolean isConnected(){
+ private boolean isConnected() {
return context.getChannel().attr(S7HMuxImpl.IS_CONNECTED).get();
//return true;
}
-
- private boolean isPrimaryChannel(){
- boolean b = (context.getChannel().attr(S7HMuxImpl.IS_PRIMARY).get() == null)?true:context.getChannel().attr(S7HMuxImpl.IS_PRIMARY).get();
- return b;
- //return true;
- }
-
- private void setChannelFeatures(){
- context.getChannel().attr(S7HMuxImpl.READ_TIME_OUT).set(s7DriverContext.getReadTimeout());
+
+ private boolean isPrimaryChannel() {
+ return context.getChannel().attr(S7HMuxImpl.IS_PRIMARY).get() == null || context.getChannel().attr(S7HMuxImpl.IS_PRIMARY).get();
+ }
+
+ private void setChannelFeatures() {
+ context.getChannel().attr(S7HMuxImpl.READ_TIME_OUT).set(s7DriverContext.getReadTimeout());
context.getChannel().attr(S7HMuxImpl.IS_PING_ACTIVE).set(s7DriverContext.getPing());
context.getChannel().attr(S7HMuxImpl.PING_TIME).set(s7DriverContext.getPingTime());
- context.getChannel().attr(S7HMuxImpl.RETRY_TIME).set(s7DriverContext.getRetryTime());
- }
-
-
- private boolean isFeatureSupported(){
- boolean b = ((s7DriverContext.getControllerType() == S7ControllerType.S7_300) ||
- (s7DriverContext.getControllerType() == S7ControllerType.S7_400))
- ?true:false;
- return b;
- }
-
- private CompletableFuture<S7MessageUserData> reassembledMessage(short sequenceNumber, LinkedList<PlcSINT> plcValues){
-
+ context.getChannel().attr(S7HMuxImpl.RETRY_TIME).set(s7DriverContext.getRetryTime());
+ }
+
+
+ private boolean isFeatureSupported() {
+ return (s7DriverContext.getControllerType() == S7ControllerType.S7_300) ||
+ (s7DriverContext.getControllerType() == S7ControllerType.S7_400);
+ }
+
+ private CompletableFuture<S7MessageUserData> reassembledMessage(short sequenceNumber, LinkedList<PlcSINT> plcValues) {
+
CompletableFuture<S7MessageUserData> future = new CompletableFuture<>();
-
+
//TODO: PDU id is the same, we need check.
int tpduId = tpduGenerator.getAndIncrement();
// If we've reached the max value for a 16 bit transaction identifier, reset back to 1
- if(tpduGenerator.get() == 0xFFFF) {
+ if (tpduGenerator.get() == 0xFFFF) {
tpduGenerator.set(1);
- }
+ }
TPKTPacket request = createSzlReassembledRequest(tpduId, sequenceNumber);
-
+
context.sendRequest(request)
- .onTimeout(e -> {
- logger.warn("Timeout during Connection establishing, closing channel...");
- //context.getChannel().close();
- })
- .expectResponse(TPKTPacket.class, Duration.ofMillis(1000))
- .check(p -> p.getPayload() instanceof COTPPacketData)
- .unwrap(p -> ((COTPPacketData) p.getPayload()))
- .check(p -> p.getPayload() instanceof S7MessageUserData)
- .unwrap(p -> ((S7MessageUserData) p.getPayload()))
- .check(p -> p.getPayload() instanceof S7PayloadUserData)
- .handle(messageUserData -> {
- future.complete(messageUserData);
- });
+ .onTimeout(e -> {
+ logger.warn("Timeout during Connection establishing, closing channel...");
+ //context.getChannel().close();
+ })
+ .expectResponse(TPKTPacket.class, Duration.ofMillis(1000))
+ .check(p -> p.getPayload() instanceof COTPPacketData)
+ .unwrap(p -> ((COTPPacketData) p.getPayload()))
+ .check(p -> p.getPayload() instanceof S7MessageUserData)
+ .unwrap(p -> ((S7MessageUserData) p.getPayload()))
+ .check(p -> p.getPayload() instanceof S7PayloadUserData)
+ .handle(future::complete);
return future;
}
-
+
/*
- *
- */
+ *
+ */
private TPKTPacket createSzlReassembledRequest(int tpduId, short sequenceNumber) {
- S7MessageUserData identifyRemoteMessage = new S7MessageUserData(tpduId, new S7ParameterUserData(Arrays.asList(
- new S7ParameterUserDataItemCPUFunctions((short) 0x12, (byte) 0x4, (byte) 0x4, (short) 0x01, sequenceNumber, (short) 0x00, (short) 0x00, 0)
- )), new S7PayloadUserData(Arrays.asList(
- new S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest(
- DataTransportErrorCode.NOT_FOUND,
- DataTransportSize.NULL,
- 0x00)
+ S7MessageUserData identifyRemoteMessage = new S7MessageUserData(tpduId, new S7ParameterUserData(List.of(
+ new S7ParameterUserDataItemCPUFunctions((short) 0x12, (byte) 0x4, (byte) 0x4, (short) 0x01, sequenceNumber, (short) 0x00, (short) 0x00, 0)
+ )), new S7PayloadUserData(List.of(
+ new S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest(
+ DataTransportErrorCode.NOT_FOUND,
+ DataTransportSize.NULL,
+ 0x00)
)));
COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2);
return new TPKTPacket(cotpPacketData);
- }
-
- private CompletableFuture<S7MessageUserData> reassembledAlarmEvents(short sequenceNumber) {
+ }
+
+ private CompletableFuture<S7MessageUserData> reassembledAlarmEvents(short sequenceNumber) {
CompletableFuture<S7MessageUserData> future = new CompletableFuture<>();
-
+
//TODO: PDU id is the same, we need check.
int tpduId = tpduGenerator.getAndIncrement();
// If we've reached the max value for a 16 bit transaction identifier, reset back to 1
- if(tpduGenerator.get() == 0xFFFF) {
+ if (tpduGenerator.get() == 0xFFFF) {
tpduGenerator.set(1);
- }
-
+ }
+
TPKTPacket request = createAlarmQueryReassembledRequest(tpduId, sequenceNumber);
context.sendRequest(request)
- .onTimeout(e -> {
- logger.warn("Timeout during Connection establishing, closing channel...");
- //context.getChannel().close();
- })
- .expectResponse(TPKTPacket.class, Duration.ofMillis(1000))
- .check(p -> p.getPayload() instanceof COTPPacketData)
- .unwrap(p -> ((COTPPacketData) p.getPayload()))
- .check(p -> p.getPayload() instanceof S7MessageUserData)
- .unwrap(p -> ((S7MessageUserData) p.getPayload()))
- .check(p -> p.getPayload() instanceof S7PayloadUserData)
- .handle(messageUserData -> {
- future.complete(messageUserData);
- });
+ .onTimeout(e -> {
+ logger.warn("Timeout during Connection establishing, closing channel...");
+ //context.getChannel().close();
+ })
+ .expectResponse(TPKTPacket.class, Duration.ofMillis(1000))
+ .check(p -> p.getPayload() instanceof COTPPacketData)
+ .unwrap(p -> ((COTPPacketData) p.getPayload()))
+ .check(p -> p.getPayload() instanceof S7MessageUserData)
+ .unwrap(p -> ((S7MessageUserData) p.getPayload()))
+ .check(p -> p.getPayload() instanceof S7PayloadUserData)
+ .handle(future::complete);
- return future;
+ return future;
}
//TODO: S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest to S7PayloadUserDataItemCpuFunctionAlarmQueryNoDataRequest
private TPKTPacket createAlarmQueryReassembledRequest(int tpduId, short sequenceNumber) {
- S7MessageUserData identifyRemoteMessage = new S7MessageUserData(tpduId, new S7ParameterUserData(Arrays.asList(
- new S7ParameterUserDataItemCPUFunctions((short) 0x12, (byte) 0x4, (byte) 0x4, (short) 0x13, sequenceNumber, (short) 0x00, (short) 0x00, 0)
- )), new S7PayloadUserData(Arrays.asList(
- new S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest (
- DataTransportErrorCode.NOT_FOUND,
- DataTransportSize.NULL,
- 0x00)
- )));
+ S7MessageUserData identifyRemoteMessage = new S7MessageUserData(tpduId, new S7ParameterUserData(List.of(
+ new S7ParameterUserDataItemCPUFunctions((short) 0x12, (byte) 0x4, (byte) 0x4, (short) 0x13, sequenceNumber, (short) 0x00, (short) 0x00, 0)
+ )), new S7PayloadUserData(List.of(
+ new S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest(
+ DataTransportErrorCode.NOT_FOUND,
+ DataTransportSize.NULL,
+ 0x00)
+ )));
COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2);
return new TPKTPacket(cotpPacketData);
- }
-
-
-
+ }
+
+
/**
* A generic purpose error handler which terminates transaction and calls back given future with error message.
*/
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7AckTag.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7AckTag.java
index ed101afa6e..f3569e2ed6 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7AckTag.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/tag/S7AckTag.java
@@ -18,61 +18,61 @@
*/
package org.apache.plc4x.java.s7.readwrite.tag;
+import org.apache.plc4x.java.api.model.PlcTag;
+
import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.plc4x.java.api.model.PlcTag;
-import org.apache.plc4x.java.s7.readwrite.types.S7SubscriptionType;
public class S7AckTag implements PlcTag {
-
- private static final Pattern EVENT_ALARM_ACK_PATTERN =
+
+ private static final Pattern EVENT_ALARM_ACK_PATTERN =
Pattern.compile("(^ACK:)(((?:,{0,1})(16#[0-9a-fA-F]{8})(;([0-9a-fA-F]{2})))+)");
-
+
private final ArrayList<Integer> ackAlarmIds;
- private final ArrayList<Integer> ackAlarmSigs;
-
- public S7AckTag(ArrayList<Integer> ackAlarmIds, ArrayList<Integer> ackAlarmSigs){
+ private final ArrayList<Integer> ackAlarmSigs;
+
+ public S7AckTag(ArrayList<Integer> ackAlarmIds, ArrayList<Integer> ackAlarmSigs) {
this.ackAlarmIds = ackAlarmIds;
this.ackAlarmSigs = ackAlarmSigs;
- };
-
-
+ }
+
+
public ArrayList<Integer> getAlarmIds() {
return ackAlarmIds;
}
public ArrayList<Integer> getAlarmSigs() {
return ackAlarmSigs;
- }
-
+ }
+
public static boolean matches(String fieldString) {
return EVENT_ALARM_ACK_PATTERN.matcher(fieldString).matches();
- }
-
+ }
+
public static S7AckTag of(String fieldString) {
//TODO: Actually only ALARM_S (SIG_1)
Matcher matcher = EVENT_ALARM_ACK_PATTERN.matcher(fieldString);
- if (matcher.matches()){
+ if (matcher.matches()) {
String[] arrIdAndSig;
String EventIds = matcher.group(2);
String[] arrStrEventId = EventIds.split(",");
ArrayList<Integer> arrAlarmIds = new ArrayList<>();
- ArrayList<Integer> arrAlarmSigs = new ArrayList<>();
- for (String EventId:arrStrEventId){
+ ArrayList<Integer> arrAlarmSigs = new ArrayList<>();
+ for (String EventId : arrStrEventId) {
EventId = EventId.replaceAll("16#", "");
- arrIdAndSig = EventId.split(";");
+ arrIdAndSig = EventId.split(";");
arrAlarmIds.add(Integer.parseInt(arrIdAndSig[0], 16));
- arrAlarmSigs.add(Integer.parseInt(arrIdAndSig[1], 16));
+ arrAlarmSigs.add(Integer.parseInt(arrIdAndSig[1], 16));
}
- return new S7AckTag(arrAlarmIds, arrAlarmSigs);
- } else return null;
- };
+ return new S7AckTag(arrAlarmIds, arrAlarmSigs);
+ } else return null;
+ }
@Override
public String getAddressString() {
throw new UnsupportedOperationException("Not supported yet.");
}
-
-
+
+
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/types/S7SubscriptionType.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/types/S7SubscriptionType.java
index 2b3062af0b..6869b9f606 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/types/S7SubscriptionType.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/types/S7SubscriptionType.java
@@ -25,5 +25,5 @@ public enum S7SubscriptionType {
ALARM_QUERY,
CYCLIC_SUBSCRIPTION,
CYCLIC_DB_SUBSCRIPTION,
- CYCLIC_UNSUBSCRIPTION;
+ CYCLIC_UNSUBSCRIPTION
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java
index dc5d7aac94..a209baf9ca 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java
@@ -24,7 +24,7 @@ import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionHandle;
public class S7PlcSubscriptionHandle extends DefaultPlcSubscriptionHandle {
- private EventType eventtype;
+ private final EventType eventtype;
public S7PlcSubscriptionHandle(EventType eventtype, PlcSubscriber plcSubscriber) {
super(plcSubscriber);
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
index 10917dd383..74d93ebc63 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java
@@ -640,7 +640,7 @@ public class StaticHelper {
} catch (Exception ex) {
sb.append(ex);
}
- return sb.append(jsonszl.toString());
+ return sb.append(jsonszl);
}
/*
@@ -678,7 +678,7 @@ public class StaticHelper {
} catch (Exception ex) {
sb.append(ex);
}
- return sb.append(jsonszl.toString());
+ return sb.append(jsonszl);
}
/*
@@ -713,7 +713,7 @@ public class StaticHelper {
} catch (Exception ex) {
sb.append(ex);
}
- return sb.append(jsonszl.toString());
+ return sb.append(jsonszl);
}
/*
@@ -759,7 +759,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -803,7 +803,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -843,7 +843,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -992,7 +992,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1032,7 +1032,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
@@ -1072,7 +1072,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1112,7 +1112,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1161,7 +1161,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1202,7 +1202,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1246,7 +1246,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1295,7 +1295,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1342,7 +1342,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1397,7 +1397,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1440,7 +1440,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1495,7 +1495,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1549,7 +1549,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1594,7 +1594,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1664,7 +1664,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1707,7 +1707,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1747,7 +1747,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1786,7 +1786,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -1831,7 +1831,7 @@ public class StaticHelper {
sb.append(ex);
}
- sb.append(jsonszl.toString());
+ sb.append(jsonszl);
return sb;
}
@@ -2064,13 +2064,13 @@ public class StaticHelper {
res[4] = ByteToBcd(data.getMinute());
res[5] = ByteToBcd(data.getSecond());
- long ms = (long) (data.getNano() / 1_000_000);
+ long ms = data.getNano() / 1_000_000;
res[6] = (byte) ((int) (((ms / 100) << 4) | ((ms / 10) % 10)));
//Java:1 (Monday) to 7 (Sunday)->S7:1 (Sunday) to 7 (Saturday)
byte dayofweek = (byte) ((data.getDayOfWeek().getValue() < 7) ?
data.getDayOfWeek().getValue() + 1 :
(byte) 0x01);
- res[7] = (byte) (((ms % 10) << 4) | ((byte) (dayofweek)));
+ res[7] = (byte) (((ms % 10) << 4) | dayofweek);
return res;
}
@@ -2239,7 +2239,6 @@ public class StaticHelper {
if (bytebuf.capacity() < Byte.BYTES) break;
strField = String.valueOf(bytebuf.getBoolean(0));
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "Y":
if (bytebuf.capacity() < Byte.BYTES) break;
@@ -2258,7 +2257,6 @@ public class StaticHelper {
strField = String.format(format, value);
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "C":
if (format.contains("%T#")) {
@@ -2270,11 +2268,10 @@ public class StaticHelper {
length = Integer.parseInt(fieldformat.group(1));
length = (length > bytebuf.capacity()) ? bytebuf.capacity() : length;
strField =
- bytebuf.readCharSequence(length, Charset.forName("utf-8")).toString();
+ bytebuf.readCharSequence(length, StandardCharsets.UTF_8).toString();
}
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "W":
if (bytebuf.capacity() < Short.BYTES) break;
@@ -2293,7 +2290,6 @@ public class StaticHelper {
strField = String.format(format, value);
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "I":
if (bytebuf.capacity() < Integer.BYTES) break;
@@ -2355,7 +2351,6 @@ public class StaticHelper {
strField = String.format(format, value);
strOut = strOut.replaceAll(matcher.group(0), strField);
}
- ;
break;
}
}
@@ -2423,7 +2418,7 @@ public class StaticHelper {
int length = 0;
int sig = 0;
long value = 0;
- String strOut = new String(alarmText);
+ String strOut = alarmText;
String strField = null;
while (matcher.find()) {
@@ -2440,7 +2435,6 @@ public class StaticHelper {
if (bytebuf.capacity() < Byte.BYTES) break;
strField = String.valueOf(bytebuf.getBoolean(0));
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "Y":
if (bytebuf.capacity() < Byte.BYTES) break;
@@ -2459,7 +2453,6 @@ public class StaticHelper {
strField = String.format(format, value);
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "C":
if (format.contains("%T#")) {
@@ -2471,11 +2464,10 @@ public class StaticHelper {
length = Integer.parseInt(fieldformat.group(1));
length = (length > bytebuf.capacity()) ? bytebuf.capacity() : length;
strField =
- bytebuf.readCharSequence(length, Charset.forName("utf-8")).toString();
+ bytebuf.readCharSequence(length, StandardCharsets.UTF_8).toString();
}
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "W":
if (bytebuf.capacity() < Short.BYTES) break;
@@ -2494,7 +2486,6 @@ public class StaticHelper {
strField = String.format(format, value);
}
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "I":
if (bytebuf.capacity() < Integer.BYTES) break;
@@ -2512,9 +2503,7 @@ public class StaticHelper {
value = bytebuf.getInt(0);
strField = String.format(format, value);
}
- ;
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "X":
if (bytebuf.capacity() < Long.BYTES) break;
@@ -2532,9 +2521,7 @@ public class StaticHelper {
value = bytebuf.getLong(0);
strField = String.format(format, value);
}
- ;
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "D":
if (bytebuf.capacity() < Double.BYTES) break;
@@ -2552,9 +2539,7 @@ public class StaticHelper {
value = bytebuf.getLong(0);
strField = String.format(format, value);
}
- ;
strOut = strOut.replaceAll(matcher.group(0), strField);
- ;
break;
case "R":
if (bytebuf.capacity() < Float.BYTES) break;
@@ -2562,7 +2547,6 @@ public class StaticHelper {
strField = String.format(format, value);
strOut = strOut.replaceAll(matcher.group(0), strField);
}
- ;
break;
}
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
index ae7fef3d10..af12f818b8 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/utils/S7DiagnosticEventId.java
@@ -667,8 +667,7 @@ public enum S7DiagnosticEventId {
}
public static S7DiagnosticEventId valueOf(short code) {
-
- Integer intcode = Short.toUnsignedInt(code);
+ int intcode = Short.toUnsignedInt(code);
int a = code & 0xA000;
int b = code & 0xB000;
if ((a != 0) || (b != 0)) intcode = 0x0000;
diff --git a/plc4j/drivers/s7/src/test/java/S7IoTest.java b/plc4j/drivers/s7/src/test/java/S7IoTest.java
index e110c5b5f6..28c39f1d0a 100644
--- a/plc4j/drivers/s7/src/test/java/S7IoTest.java
+++ b/plc4j/drivers/s7/src/test/java/S7IoTest.java
@@ -34,8 +34,7 @@ public class S7IoTest {
@Test
void TestS7MessageBytes() throws Exception {
- String wantBoxStringSerialized = ""
- + "╔═TPKTPacket═══════════════════════════════════════════════════════════════════════════════════════════════════════╗\n"
+ String wantBoxStringSerialized = "╔═TPKTPacket═══════════════════════════════════════════════════════════════════════════════════════════════════════╗\n"
+ "║╔═protocolId╗╔═reserved╗╔═len═════╗ ║\n"
+ "║║ 0x03 3 ║║ 0x00 0 ║║0x001d 29║ ║\n"
+ "║╚═══════════╝╚═════════╝╚═════════╝ ║\n"
@@ -89,8 +88,7 @@ public class S7IoTest {
+ "║║╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝║║\n"
+ "║╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝║\n"
+ "╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝";
- String wantBoxStringSerializedCompact = ""
- + "╔═TPKTPacket═════════════════════════════════════════════════════════════════════════════════════╗\n"
+ String wantBoxStringSerializedCompact = "╔═TPKTPacket═════════════════════════════════════════════════════════════════════════════════════╗\n"
+ "║╔═protocolId╗╔═reserved╗╔═len═════╗ ║\n"
+ "║║ 0x03 3 ║║ 0x00 0 ║║0x001d 29║ ║\n"
+ "║╚═══════════╝╚═════════╝╚═════════╝ ║\n"
diff --git a/plc4j/examples/plc4j-s7event/pom.xml b/plc4j/examples/plc4j-s7event/pom.xml
index 787e961a2c..1ff8b52d08 100644
--- a/plc4j/examples/plc4j-s7event/pom.xml
+++ b/plc4j/examples/plc4j-s7event/pom.xml
@@ -66,14 +66,14 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- TODO: Only needed because we directly rely on types of the driver -->
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
- <version>${project.version}</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java
index efd9b52145..303a11349f 100644
--- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java
+++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java
@@ -18,22 +18,17 @@
*/
package org.apache.plc4x.examples.plc4j.s7event;
-import java.util.Map;
-
+import org.apache.commons.codec.binary.Hex;
import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.s7.events.S7AlarmEvent;
import org.apache.plc4x.java.s7.events.S7CyclicEvent;
-import org.apache.plc4x.java.s7.events.S7ModeEvent;
-import org.apache.plc4x.java.s7.events.S7SysEvent;
-import org.apache.plc4x.java.s7.events.S7UserEvent;
-import org.apache.plc4x.java.s7.readwrite.protocol.S7ProtocolLogic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.simple.SimpleLogger;
-import org.apache.commons.codec.binary.Hex;
+
+import java.util.Map;
/**
@@ -45,20 +40,20 @@ import org.apache.commons.codec.binary.Hex;
*/
public class CycSubscription {
- private static final Logger logger = LoggerFactory.getLogger(CycSubscription.class);
-
+ private static final Logger logger = LoggerFactory.getLogger(CycSubscription.class);
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) throws Exception {
- System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace");
-
+ System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace");
+
try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) {
final PlcSubscriptionRequest.Builder subscription = connection.subscriptionRequestBuilder();
-
+
//subscription.addEventTagAddress("myCYC", "CYC(B01SEC:5):%DB9002.DBB0[1]");
subscription.addEventTagAddress("myCYC", "CYC(B01SEC:5):%MB190:BYTE");
-
+
final PlcSubscriptionRequest sub = subscription.build();
final PlcSubscriptionResponse subresponse = sub.execute().get();
@@ -110,11 +105,11 @@ public class CycSubscription {
System.out.println("Longitud de datos: " + ((byte[]) y).length);
System.out.println(x + ": " + Hex.encodeHexString((byte[]) y));
} else
- System.out.println(x + " : " + y);
+ System.out.println(x + " : " + y);
});
System.out.println("****************************");
});
-
+
System.out.println("Waiting for events");
Thread.sleep(10000);
diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java
index fff303b651..892a0de52f 100644
--- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java
+++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java
@@ -18,21 +18,17 @@
*/
package org.apache.plc4x.examples.plc4j.s7event;
-import java.util.Map;
-
import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.s7.events.S7AlarmEvent;
import org.apache.plc4x.java.s7.events.S7ModeEvent;
-import org.apache.plc4x.java.s7.events.S7SysEvent;
-import org.apache.plc4x.java.s7.events.S7UserEvent;
-import org.apache.plc4x.java.s7.readwrite.protocol.S7ProtocolLogic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.simple.SimpleLogger;
+import java.util.Map;
+
/**
* Example for capturing events generated from a Siemens S7-300, S7-400 or VIPA PLC.
* Support for mode events ("MODE"), system events ("SYS"), user events ("USR")
@@ -42,17 +38,17 @@ import org.slf4j.simple.SimpleLogger;
*/
public class EventSubscription {
- private static final Logger logger = LoggerFactory.getLogger(EventSubscription.class);
-
+ private static final Logger logger = LoggerFactory.getLogger(EventSubscription.class);
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) throws Exception {
- System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace");
-
+ System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace");
+
try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) {
final PlcSubscriptionRequest.Builder subscription = connection.subscriptionRequestBuilder();
-
+
subscription.addEventTagAddress("myMODE", "MODE");
// subscription.addEventTagAddress("mySYS", "SYS");
// subscription.addEventTagAddress("myUSR", "USR");
@@ -109,7 +105,7 @@ public class EventSubscription {
// });
// System.out.println("****************************");
// });
-
+
System.out.println("Waiting for events");
Thread.sleep(5000);
diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java
index 9289d6c3d2..161162dbb7 100644
--- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java
+++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java
@@ -19,24 +19,19 @@
package org.apache.plc4x.examples.plc4j.s7event;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
-import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.simple.SimpleLogger;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.SZL;
-import org.apache.plc4x.java.s7.utils.S7ParamErrorCode;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.simple.SimpleLogger;
+
+import java.util.Collection;
+
import static io.netty.buffer.Unpooled.wrappedBuffer;
/**
@@ -46,42 +41,42 @@ import static io.netty.buffer.Unpooled.wrappedBuffer;
public class SzlRequest {
- private static final Logger logger = LoggerFactory.getLogger(SzlRequest.class);
-
+ private static final Logger logger = LoggerFactory.getLogger(SzlRequest.class);
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) throws Exception {
System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace");
-
+
System.out.println("******************************************************************************************");
System.out.println("Before using, take a look at:");
System.out.println("System Software for S7-300/400.\r\nSystem and Standard Functions - Volume 1/2");
System.out.println("Document: A5E02789976-01");
System.out.println("Chapter 34 System Status Lists (SSL).");
System.out.println("URL: https://cache.industry.siemens.com/dl/files/604/44240604/att_67003/v1/s7sfc_en-EN.pdf");
- System.out.println("******************************************************************************************");
-
+ System.out.println("******************************************************************************************");
+
try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) { //(01)
-
+
final PlcReadRequest.Builder readrequest = connection.readRequestBuilder(); //(02)
-
+
readrequest.addTagAddress("MySZL", "SZL_ID=16#0022;INDEX=16#0000"); //(03)
-
+
final PlcReadRequest rr = readrequest.build(); //(04)
final PlcReadResponse szlresponse = rr.execute().get(); //(05)
- if (szlresponse.getResponseCode("MySZL") == PlcResponseCode.OK){ //(06)
-
- Collection<Byte> data = szlresponse.getAllBytes("MySZL"); //(07)
+ if (szlresponse.getResponseCode("MySZL") == PlcResponseCode.OK) { //(06)
+
+ Collection<Byte> data = szlresponse.getAllBytes("MySZL"); //(07)
byte[] dbytes = ArrayUtils.toPrimitive(data.toArray(new Byte[data.size()])); //(08)
-
+
SZL szl = SZL.valueOf(0x0022); //(09)
ByteBuf wb = wrappedBuffer(dbytes); //(10)
- StringBuilder sb = szl.execute(wb); //(11)
+ StringBuilder sb = szl.execute(wb); //(11)
System.out.println(sb.toString()); //(12)
-
- } else if (szlresponse.getResponseCode("MySZL") == PlcResponseCode.NOT_FOUND){ //(13)
+
+ } else if (szlresponse.getResponseCode("MySZL") == PlcResponseCode.NOT_FOUND) { //(13)
System.out.println("SZL is not supported.");
}
diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java
index 80a5a289e0..0ebdc3a791 100644
--- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java
+++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java
@@ -18,8 +18,13 @@
*/
package org.apache.plc4x.simulator.server.s7.protocol;
-import io.netty.channel.*;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
import org.apache.plc4x.java.s7.readwrite.*;
+import org.apache.plc4x.java.spi.generation.ReadBuffer;
+import org.apache.plc4x.java.spi.generation.ReadBufferByteBased;
+import org.apache.plc4x.java.spi.generation.WriteBuffer;
+import org.apache.plc4x.java.spi.generation.WriteBufferByteBased;
import org.apache.plc4x.simulator.model.Context;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,10 +33,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
import java.util.List;
-import org.apache.plc4x.java.spi.generation.ReadBuffer;
-import org.apache.plc4x.java.spi.generation.ReadBufferByteBased;
-import org.apache.plc4x.java.spi.generation.WriteBuffer;
-import org.apache.plc4x.java.spi.generation.WriteBufferByteBased;
public class S7Step7ServerAdapter extends ChannelInboundHandlerAdapter {
@@ -194,9 +195,9 @@ public class S7Step7ServerAdapter extends ChannelInboundHandlerAdapter {
List<SzlDataTreeItem> items = new ArrayList<>();
items.add(new SzlDataTreeItem((short) 0x0001,
"6ES7 212-1BD30-0XB0 ".getBytes(), 0x2020, 0x0001, 0x2020));
-
+
WriteBuffer writeBuffer = new WriteBufferByteBased(items.get(0).getLengthInBytes());
- ReadBuffer readBuffer = new ReadBufferByteBased(new byte[items.get(0).getLengthInBytes()]);
+ ReadBuffer readBuffer = new ReadBufferByteBased(new byte[items.get(0).getLengthInBytes()]);
items.get(0).serialize(writeBuffer);
//TODO: Fix this section. Fail!!!
@@ -205,7 +206,7 @@ public class S7Step7ServerAdapter extends ChannelInboundHandlerAdapter {
// DataTransportErrorCode.OK, DataTransportSize.OCTET_STRING, szlId,
// readSzlRequestPayload.getSzlIndex(), items);
new S7PayloadUserDataItemCpuFunctionReadSzlResponse(
- DataTransportErrorCode.OK, DataTransportSize.OCTET_STRING, items.get(0).getLengthInBytes(), readBuffer.readByteArray(items.get(0).getLengthInBytes()));
+ DataTransportErrorCode.OK, DataTransportSize.OCTET_STRING, items.get(0).getLengthInBytes(), readBuffer.readByteArray(items.get(0).getLengthInBytes()));
List<S7ParameterUserDataItem> responseParameterItems = new ArrayList<>();
responseParameterItems.add(readSzlResponseParameter);