Skip to content

Feat/improved s7 opcua support #2463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisdutz merged 3 commits into from
Feb 23, 2026
Merged

Feat/improved s7 opcua support #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dc0976
chore: Added a test for my S7-1500 opcua setup and did some minor twe…
chrisdutz Feb 22, 2026
4f19acf
chore: Fixed the build
chrisdutz Feb 22, 2026
44a9064
chore: Ported the initial fix for the reading of arrays.
chrisdutz Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plc4go/assets/testing/protocols/opcua/DriverTestsuite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@
<tags isList="true">
<tag className="org.apache.plc4x.test.driver.internal.api.TestTag">
<name>time</name>
<address>ns=0;i=2258</address>
<address>ns=0;i=2258;DATE_AND_TIME</address>
</tag>
</tags>
</TestReadRequest>
Expand Down Expand Up @@ -1681,7 +1681,7 @@
<OpcuaTag>
<nodeId dataType="string" bitLength="88" encoding="UTF-8">ns=0;i=2258</nodeId>
<attributeId dataType="string" bitLength="40" encoding="UTF-8">Value</attributeId>
<dataType dataType="string" bitLength="32" encoding="UTF-8">NULL</dataType>
<dataType dataType="string" bitLength="104" encoding="UTF-8">DATE_AND_TIME</dataType>
</OpcuaTag>
</tag>
</PlcTagItem>
Expand Down
1 change: 1 addition & 0 deletions plc4j/drivers/opcua/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<haltOnFailure>false</haltOnFailure>
<excludes>
<exclude>org/eclipse/**/*</exclude>
</excludes>
Expand Down
16 changes: 8 additions & 8 deletions plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ public abstract class Variant implements Message {
protected final boolean arrayLengthSpecified;
protected final boolean arrayDimensionsSpecified;
protected final Integer noOfArrayDimensions;
protected final List<Boolean> arrayDimensions;
protected final List<Integer> arrayDimensions;

public Variant(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
super();
this.arrayLengthSpecified = arrayLengthSpecified;
this.arrayDimensionsSpecified = arrayDimensionsSpecified;
Expand All @@ -70,7 +70,7 @@ public Integer getNoOfArrayDimensions() {
return noOfArrayDimensions;
}

public List<Boolean> getArrayDimensions() {
public List<Integer> getArrayDimensions() {
return arrayDimensions;
}

Expand Down Expand Up @@ -99,7 +99,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
writeOptionalField("noOfArrayDimensions", noOfArrayDimensions, writeSignedInt(writeBuffer, 32));

// Array Field (arrayDimensions)
writeSimpleTypeArrayField("arrayDimensions", arrayDimensions, writeBoolean(writeBuffer));
writeSimpleTypeArrayField("arrayDimensions", arrayDimensions, writeSignedInt(writeBuffer, 32));

writeBuffer.popContext("Variant");
}
Expand Down Expand Up @@ -133,7 +133,7 @@ public int getLengthInBits() {

// Array field
if (arrayDimensions != null) {
lengthInBits += 1 * arrayDimensions.size();
lengthInBits += 32 * arrayDimensions.size();
}

return lengthInBits;
Expand Down Expand Up @@ -222,10 +222,10 @@ public static Variant staticParse(ReadBuffer readBuffer) throws ParseException {
readOptionalField(
"noOfArrayDimensions", readSignedInt(readBuffer, 32), arrayDimensionsSpecified);

List<Boolean> arrayDimensions =
List<Integer> arrayDimensions =
readCountArrayField(
"arrayDimensions",
readBoolean(readBuffer),
readSignedInt(readBuffer, 32),
(((noOfArrayDimensions) == (null)) ? 0 : noOfArrayDimensions));

readBuffer.closeContext("Variant");
Expand All @@ -241,7 +241,7 @@ Variant build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions);
List<Integer> arrayDimensions);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...rivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantBoolean(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
byte[] value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantBoolean build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantBoolean variantBoolean =
new VariantBoolean(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantByte(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Short> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -138,7 +138,7 @@ public VariantByte build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantByte variantByte =
new VariantByte(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...ers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantByteString(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ByteStringArray> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantByteString build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantByteString variantByteString =
new VariantByteString(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...vers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDataValue(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<DataValue> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantDataValue build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDataValue variantDataValue =
new VariantDataValue(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...ivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDateTime(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Long> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantDateTime build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDateTime variantDateTime =
new VariantDateTime(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDiagnosticInfo(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<DiagnosticInfo> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantDiagnosticInfo build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDiagnosticInfo variantDiagnosticInfo =
new VariantDiagnosticInfo(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDouble(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Double> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantDouble build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDouble variantDouble =
new VariantDouble(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantExpandedNodeId(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ExpandedNodeId> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantExpandedNodeId build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantExpandedNodeId variantExpandedNodeId =
new VariantExpandedNodeId(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...pcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantExtensionObject(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ExtensionObject> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -143,7 +143,7 @@ public VariantExtensionObject build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantExtensionObject variantExtensionObject =
new VariantExtensionObject(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions .../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantFloat(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Float> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantFloat build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantFloat variantFloat =
new VariantFloat(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantGuid(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<GuidValue> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantGuid build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantGuid variantGuid =
new VariantGuid(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions .../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantInt16(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Short> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -138,7 +138,7 @@ public VariantInt16 build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantInt16 variantInt16 =
new VariantInt16(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions .../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantInt32(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Integer> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantInt32 build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantInt32 variantInt32 =
new VariantInt32(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions .../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantInt64(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Long> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantInt64 build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantInt64 variantInt64 =
new VariantInt64(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions .../opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantLocalizedText(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<LocalizedText> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantLocalizedText build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantLocalizedText variantLocalizedText =
new VariantLocalizedText(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantNodeId(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<NodeId> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantNodeId build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantNodeId variantNodeId =
new VariantNodeId(
arrayLengthSpecified,
Expand Down
4 changes: 2 additions & 2 deletions ...j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public VariantNull(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
}

Expand Down Expand Up @@ -92,7 +92,7 @@ public VariantNull build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantNull variantNull =
new VariantNull(
arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down
Loading
Loading