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 2021/04/06 12:13:48 UTC
[plc4x] branch refactoring/singular_xml_element_names updated
(826b610 -> 983b488)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch refactoring/singular_xml_element_names
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
discard 826b610 plc4x: use singular xml element names
new 983b488 plc4x: use singular xml element names
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (826b610)
\
N -- N -- N refs/heads/refactoring/singular_xml_element_names (983b488)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[plc4x] 01/01: plc4x: use singular xml element names
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch refactoring/singular_xml_element_names
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 983b488df988b9f673235cd37dea073ca366cf74
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Apr 6 14:12:32 2021 +0200
plc4x: use singular xml element names
- Currently doesn't work as org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java:54 for example uses @JsonCreator which doesn't work with @JacksonXmlElementWrapper. See https://github.com/FasterXML/jackson-dataformat-xml/issues/149
---
.../BaseFreemarkerLanguageTemplateHelper.java | 20 +++
.../language/java/JavaLanguageTemplateHelper.java | 3 -
.../templates/java/pojo-template.java.ftlh | 10 ++
go.mod | 2 +-
go.sum | 2 +
plc4go/cmd/main/drivers/tests/ads_driver_test.go | 4 +-
plc4j/drivers/ab-eth/pom.xml | 6 +
plc4j/drivers/ads/pom.xml | 5 +
plc4j/drivers/canopen/pom.xml | 6 +
plc4j/drivers/eip/pom.xml | 5 +
plc4j/drivers/firmata/pom.xml | 6 +
plc4j/drivers/knxnetip/pom.xml | 2 +-
plc4j/drivers/modbus/pom.xml | 5 +
plc4j/drivers/s7/pom.xml | 5 +
.../s7/src/test/resources/tests/PLC4X-272.xml | 66 ++++----
.../resources/protocols/ads/DriverTestsuite.xml | 14 +-
.../protocols/ads/ParserSerializerTestsuite.xml | 2 +-
.../knxnetip/ParserSerializerTestsuite.xml | 24 +--
.../protocols/modbus/ParserSerializerTestsuite.xml | 28 ++--
.../resources/protocols/s7/DriverTestsuite.xml | 92 ++++++------
.../protocols/s7/ParserSerializerTestsuite.xml | 166 ++++++++++-----------
21 files changed, 267 insertions(+), 206 deletions(-)
diff --git a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
index 413f5fa..5a7aafc 100644
--- a/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
+++ b/build-utils/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -20,6 +20,8 @@ package org.apache.plc4x.plugins.codegenerator.protocol.freemarker;
import net.objecthunter.exp4j.Expression;
import net.objecthunter.exp4j.ExpressionBuilder;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultTypeDefinition;
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
@@ -965,4 +967,22 @@ public abstract class BaseFreemarkerLanguageTemplateHelper implements Freemarker
return null;
}
+ /**
+ * Replaces plural words with english singular words (e.g. entries -> entry, items -> item)
+ * @param fieldName
+ * @return
+ */
+ public String toSingularFieldName(String fieldName) {
+ return StringUtils.removeEnd(RegExUtils.replaceAll(fieldName, "ies","y"),"s");
+ }
+
+ /**
+ * Can be used to debug templates by putting a breakpoint onto the line
+ * @param o a random object
+ * @return always true
+ */
+ public boolean breakPoint(Object o) {
+ return true;
+ }
+
}
diff --git a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index 5b9f9d3..4666c6a 100644
--- a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -19,17 +19,14 @@
package org.apache.plc4x.language.java;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.text.WordUtils;
-import org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.DefaultTypeDefinition;
import org.apache.plc4x.plugins.codegenerator.protocol.freemarker.BaseFreemarkerLanguageTemplateHelper;
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
import org.apache.plc4x.plugins.codegenerator.types.fields.*;
import org.apache.plc4x.plugins.codegenerator.types.references.*;
import org.apache.plc4x.plugins.codegenerator.types.terms.*;
-import java.util.List;
import java.util.Map;
import java.util.function.Function;
diff --git a/build-utils/language-java/src/main/resources/templates/java/pojo-template.java.ftlh b/build-utils/language-java/src/main/resources/templates/java/pojo-template.java.ftlh
index ee64ef5..e470da3 100644
--- a/build-utils/language-java/src/main/resources/templates/java/pojo-template.java.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/pojo-template.java.ftlh
@@ -68,6 +68,7 @@ import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
import ${helper.packageName(protocolName, languageName, outputFlavor)}.io.*;
import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
import com.fasterxml.jackson.annotation.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -132,6 +133,11 @@ public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${
// Properties.
<#list type.propertyFields as field>
+ <#if helper.breakPoint(field)></#if>
+ <#if field.loopType?? && helper.isComplexTypeReference(field.type)>
+ @JacksonXmlProperty(localName = "${helper.toSingularFieldName(field.name)}")
+ @JacksonXmlElementWrapper(localName = "${field.name}")
+ </#if>
private final ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> ${field.name};
</#list>
</#if>
@@ -148,6 +154,10 @@ public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${
}
<#list type.propertyFields as field>
+ <#if field.loopType?? && helper.isComplexTypeReference(field.type)>
+ @JacksonXmlProperty(localName = "${helper.toSingularFieldName(field.name)}")
+ @JacksonXmlElementWrapper(localName = "${field.name}")
+ </#if>
<#if helper.isAbstractField(field)>
public ${helper.getLanguageTypeNameForField(field)}<#if field.loopType??>[]</#if> abstract get${field.name?cap_first}();
<#else>
diff --git a/go.mod b/go.mod
index cb0c6dc..781d1b0 100644
--- a/go.mod
+++ b/go.mod
@@ -21,6 +21,6 @@ module github.com/apache/plc4x
go 1.15
require (
- github.com/apache/plc4x/plc4go v0.0.0-20210402100047-03565df6b9ee // indirect
+ github.com/apache/plc4x/plc4go v0.0.0-20210406075115-c8da58aed173 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
)
diff --git a/go.sum b/go.sum
index 891c3fa..0f88888 100644
--- a/go.sum
+++ b/go.sum
@@ -24,6 +24,8 @@ github.com/apache/plc4x/plc4go v0.0.0-20210402084608-9a035163ef03 h1:xg93Ig6/8Oq
github.com/apache/plc4x/plc4go v0.0.0-20210402084608-9a035163ef03/go.mod h1:NfO8uGKPGwDxn1GqOb4oNhAtPF7St1A9LRk1J/qSlWU=
github.com/apache/plc4x/plc4go v0.0.0-20210402100047-03565df6b9ee h1:+kli9AXi60YFkLQRcQ9CCG4b/QZAc+oZAcD3j0WlJf4=
github.com/apache/plc4x/plc4go v0.0.0-20210402100047-03565df6b9ee/go.mod h1:NfO8uGKPGwDxn1GqOb4oNhAtPF7St1A9LRk1J/qSlWU=
+github.com/apache/plc4x/plc4go v0.0.0-20210406075115-c8da58aed173 h1:NmxMscNlndwBbTasud0+7nmUVGXxVidGuq5pKtzHhZc=
+github.com/apache/plc4x/plc4go v0.0.0-20210406075115-c8da58aed173/go.mod h1:NfO8uGKPGwDxn1GqOb4oNhAtPF7St1A9LRk1J/qSlWU=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
diff --git a/plc4go/cmd/main/drivers/tests/ads_driver_test.go b/plc4go/cmd/main/drivers/tests/ads_driver_test.go
index b71f23d..94f0e89 100644
--- a/plc4go/cmd/main/drivers/tests/ads_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/ads_driver_test.go
@@ -27,7 +27,7 @@ import (
func TestAdsDriver(t *testing.T) {
testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/ads/DriverTestsuite.xml",
- // TODO: currently there seem to be issues with the generated code
+ // TODO: currently there seem to be issues with the generated code. Xml lists can't be parsed as of now
"Multi-element direct read request",
)
-}
+}
\ No newline at end of file
diff --git a/plc4j/drivers/ab-eth/pom.xml b/plc4j/drivers/ab-eth/pom.xml
index 4913da2..740b990 100644
--- a/plc4j/drivers/ab-eth/pom.xml
+++ b/plc4j/drivers/ab-eth/pom.xml
@@ -91,6 +91,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.abeth.AbEthDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -104,6 +105,7 @@
<usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
<usedDependency>org.apache.plc4x:plc4x-protocols-ab-eth</usedDependency>
+ <usedDependency>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -133,6 +135,10 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</dependency>
diff --git a/plc4j/drivers/ads/pom.xml b/plc4j/drivers/ads/pom.xml
index f1e450c..0aba640 100644
--- a/plc4j/drivers/ads/pom.xml
+++ b/plc4j/drivers/ads/pom.xml
@@ -103,6 +103,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.ads.ADSPlcDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -159,6 +160,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<!-- Logging -->
<dependency>
diff --git a/plc4j/drivers/canopen/pom.xml b/plc4j/drivers/canopen/pom.xml
index 94971a6..0010e4f 100644
--- a/plc4j/drivers/canopen/pom.xml
+++ b/plc4j/drivers/canopen/pom.xml
@@ -108,6 +108,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.canopen.CANOpenPlcDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -121,6 +122,7 @@
<usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
<usedDependency>org.apache.plc4x:plc4x-protocols-canopen</usedDependency>
+ <usedDependency>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -163,6 +165,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<!-- Logging -->
<dependency>
diff --git a/plc4j/drivers/eip/pom.xml b/plc4j/drivers/eip/pom.xml
index d2e18b2..0269c79 100644
--- a/plc4j/drivers/eip/pom.xml
+++ b/plc4j/drivers/eip/pom.xml
@@ -93,6 +93,7 @@
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.eip.readwrite.EIPDriver
</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -144,6 +145,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/drivers/firmata/pom.xml b/plc4j/drivers/firmata/pom.xml
index e477b41..64092d5 100644
--- a/plc4j/drivers/firmata/pom.xml
+++ b/plc4j/drivers/firmata/pom.xml
@@ -90,6 +90,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.firmata.readwrite.FirmataDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -104,6 +105,7 @@
<usedDependency>com.github.purejavacomm:purejavacomm</usedDependency>
<usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
<usedDependency>org.apache.plc4x:plc4x-protocols-firmata</usedDependency>
+ <usedDependency>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -136,6 +138,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/plc4j/drivers/knxnetip/pom.xml b/plc4j/drivers/knxnetip/pom.xml
index 5e2b948..9c339c2 100644
--- a/plc4j/drivers/knxnetip/pom.xml
+++ b/plc4j/drivers/knxnetip/pom.xml
@@ -90,6 +90,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.knxnetip.KnxNetIpDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -188,7 +189,6 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/plc4j/drivers/modbus/pom.xml b/plc4j/drivers/modbus/pom.xml
index a6e81fb..9d1d991 100644
--- a/plc4j/drivers/modbus/pom.xml
+++ b/plc4j/drivers/modbus/pom.xml
@@ -91,6 +91,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.modbus.ModbusDriver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -149,6 +150,10 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index bb539b6..93c0716 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -91,6 +91,7 @@
<Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
<Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.s7.readwrite.S7Driver</Export-Service>
<Import-Package>
+ com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.annotation;resolution:=optional,
*
</Import-Package>
@@ -133,6 +134,10 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git a/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml b/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
index 4fd7500..16d94b6 100644
--- a/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
+++ b/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
@@ -43,21 +43,21 @@
<outgoing-plc-message name="Send COTP Connection Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionRequest">
+ <payload/>
+ <destinationReference>0</destinationReference>
+ <sourceReference>15</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>0</destinationReference>
- <sourceReference>15</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -65,21 +65,21 @@
<incoming-plc-message name="Receive COTP Connection Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionResponse">
+ <payload/>
+ <destinationReference>15</destinationReference>
+ <sourceReference>11</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>15</destinationReference>
- <sourceReference>11</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -87,7 +87,6 @@
<outgoing-plc-message name="Send S7 Connection Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -99,6 +98,7 @@
</payload>
<eot>true</eot>
<tpduRef>1</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -106,7 +106,6 @@
<incoming-plc-message name="Receive S7 Connection Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -120,6 +119,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -127,12 +127,11 @@
<outgoing-plc-message name="Send S7 Identification Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>17</method>
<cpuFunctionType>4</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -141,12 +140,12 @@
<dataUnitReferenceNumber/>
<lastDataUnit/>
<errorCode/>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
<returnCode>OK</returnCode>
<transportSize>OCTET_STRING</transportSize>
<szlId className="org.apache.plc4x.java.s7.readwrite.SzlId">
@@ -155,12 +154,13 @@
<sublistList>MODULE_IDENTIFICATION</sublistList>
</szlId>
<szlIndex>0</szlIndex>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>2</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -168,12 +168,11 @@
<incoming-plc-message name="Receive S7 Identification Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>18</method>
<cpuFunctionType>8</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -182,7 +181,7 @@
<dataUnitReferenceNumber>0</dataUnitReferenceNumber>
<lastDataUnit>0</lastDataUnit>
<errorCode>0</errorCode>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
@@ -225,6 +224,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -642,7 +642,6 @@
<!--outgoing-plc-message name="Send first part of the S7 Read Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>10</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
@@ -1049,7 +1048,6 @@
<outgoing-plc-message name="Send second part of the S7 Read Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>11</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
@@ -1456,7 +1454,6 @@
<incoming-plc-message name="Receive first part S7 Read Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>10</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarResponse">
@@ -1672,7 +1669,6 @@
<outgoing-plc-message name="Send second part of the S7 Read Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>12</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
@@ -1909,7 +1905,6 @@
<incoming-plc-message name="Receive second part S7 Read Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>11</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarResponse">
@@ -2125,7 +2120,6 @@
<incoming-plc-message name="Receive third part S7 Read Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>12</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarResponse">
diff --git a/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml b/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
index 39c2fa0..ab9e990 100644
--- a/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
+++ b/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
@@ -229,19 +229,19 @@
<indexGroup>61568</indexGroup>
<indexOffset>2</indexOffset>
<readLength>10</readLength>
+ <data></data>
<items>
- <items className="org.apache.plc4x.java.ads.readwrite.AdsMultiRequestItemRead">
+ <item className="org.apache.plc4x.java.ads.readwrite.AdsMultiRequestItemRead">
<itemIndexGroup>4040</itemIndexGroup>
<itemIndexOffset>8</itemIndexOffset>
<itemReadLength>1</itemReadLength>
- </items>
- <items className="org.apache.plc4x.java.ads.readwrite.AdsMultiRequestItemRead">
+ </item>
+ <item className="org.apache.plc4x.java.ads.readwrite.AdsMultiRequestItemRead">
<itemIndexGroup>4040</itemIndexGroup>
<itemIndexOffset>12</itemIndexOffset>
<itemReadLength>1</itemReadLength>
- </items>
+ </item>
</items>
- <data></data>
</data>
</userdata>
</AmsTCPPacket>
@@ -381,8 +381,8 @@
<indexGroup>61443</indexGroup>
<indexOffset>0</indexOffset>
<readLength>4</readLength>
- <items/>
<data>6D61696E2E665F74726967446174656947656C6573656E2E4D00</data>
+ <items/>
</data>
</userdata>
</AmsTCPPacket>
@@ -594,8 +594,8 @@
<indexGroup>61443</indexGroup>
<indexOffset>0</indexOffset>
<readLength>4</readLength>
- <items/>
<data>6D61696E2E665F74726967446174656947656C6573656E2E4D00</data>
+ <items/>
</data>
</userdata>
</AmsTCPPacket>
diff --git a/protocols/ads/src/test/resources/protocols/ads/ParserSerializerTestsuite.xml b/protocols/ads/src/test/resources/protocols/ads/ParserSerializerTestsuite.xml
index c1a9f49..72679d7 100644
--- a/protocols/ads/src/test/resources/protocols/ads/ParserSerializerTestsuite.xml
+++ b/protocols/ads/src/test/resources/protocols/ads/ParserSerializerTestsuite.xml
@@ -162,8 +162,8 @@
<indexGroup>61443</indexGroup>
<indexOffset>0</indexOffset>
<readLength>4</readLength>
- <items/>
<data>6D61696E2E665F74726967446174656947656C6573656E2E4D00</data>
+ <items/>
</data>
</userdata>
</AmsTCPPacket>
diff --git a/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml b/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
index 9e954a3..3115644 100644
--- a/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
+++ b/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
@@ -171,15 +171,15 @@
<dibSuppSvcFamilies className="org.apache.plc4x.java.knxnetip.readwrite.DIBSuppSvcFamilies">
<descriptionType>2</descriptionType>
<serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
<version>1</version>
- </serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
+ </serviceId>
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
<version>1</version>
- </serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
+ </serviceId>
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
<version>1</version>
- </serviceIds>
+ </serviceId>
</serviceIds>
</dibSuppSvcFamilies>
</SearchResponse>
@@ -236,15 +236,15 @@
<dibSuppSvcFamilies className="org.apache.plc4x.java.knxnetip.readwrite.DIBSuppSvcFamilies">
<descriptionType>2</descriptionType>
<serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpCore">
<version>1</version>
- </serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
+ </serviceId>
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpDeviceManagement">
<version>1</version>
- </serviceIds>
- <serviceIds className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
+ </serviceId>
+ <serviceId className="org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpTunneling">
<version>1</version>
- </serviceIds>
+ </serviceId>
</serviceIds>
</dibSuppSvcFamilies>
</DescriptionResponse>
diff --git a/protocols/modbus/src/test/resources/protocols/modbus/ParserSerializerTestsuite.xml b/protocols/modbus/src/test/resources/protocols/modbus/ParserSerializerTestsuite.xml
index e33dd17..96e12b5 100644
--- a/protocols/modbus/src/test/resources/protocols/modbus/ParserSerializerTestsuite.xml
+++ b/protocols/modbus/src/test/resources/protocols/modbus/ParserSerializerTestsuite.xml
@@ -73,18 +73,18 @@
<unitIdentifier>1</unitIdentifier>
<pdu className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordRequest">
<items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordRequestItem">
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordRequestItem">
<referenceType>6</referenceType>
<fileNumber>3</fileNumber>
<recordNumber>9998</recordNumber>
<recordLength>2</recordLength>
- </items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordRequestItem">
+ </item>
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordRequestItem">
<referenceType>6</referenceType>
<fileNumber>4</fileNumber>
<recordNumber>0</recordNumber>
<recordLength>8</recordLength>
- </items>
+ </item>
</items>
</pdu>
</ModbusTcpADU>
@@ -104,14 +104,14 @@
<unitIdentifier>1</unitIdentifier>
<pdu className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordResponse">
<items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordResponseItem">
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordResponseItem">
<referenceType>6</referenceType>
<data>00000000</data>
- </items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordResponseItem">
+ </item>
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUReadFileRecordResponseItem">
<referenceType>6</referenceType>
<data>00000000000000000000000000000000</data>
- </items>
+ </item>
</items>
</pdu>
</ModbusTcpADU>
@@ -132,12 +132,12 @@
<unitIdentifier>1</unitIdentifier>
<pdu className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequest">
<items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
<referenceType>6</referenceType>
<fileNumber>2</fileNumber>
<recordNumber>0</recordNumber>
<recordData>0008</recordData>
- </items>
+ </item>
</items>
</pdu>
</ModbusTcpADU>
@@ -157,18 +157,18 @@
<unitIdentifier>1</unitIdentifier>
<pdu className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequest">
<items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
<referenceType>6</referenceType>
<fileNumber>1</fileNumber>
<recordNumber>9999</recordNumber>
<recordData>0000</recordData>
- </items>
- <items className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
+ </item>
+ <item className="org.apache.plc4x.java.modbus.readwrite.ModbusPDUWriteFileRecordRequestItem">
<referenceType>6</referenceType>
<fileNumber>2</fileNumber>
<recordNumber>0</recordNumber>
<recordData>0000</recordData>
- </items>
+ </item>
</items>
</pdu>
</ModbusTcpADU>
diff --git a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
index 47b2052..e6e2761 100644
--- a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
+++ b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
@@ -29,21 +29,21 @@
<outgoing-plc-message name="Send COTP Connection Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionRequest">
+ <payload/>
+ <destinationReference>0</destinationReference>
+ <sourceReference>15</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>0</destinationReference>
- <sourceReference>15</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -51,21 +51,21 @@
<incoming-plc-message name="Receive COTP Connection Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionResponse">
+ <payload/>
+ <destinationReference>15</destinationReference>
+ <sourceReference>11</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>15</destinationReference>
- <sourceReference>11</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -73,7 +73,6 @@
<outgoing-plc-message name="Send S7 Connection Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -85,6 +84,7 @@
</payload>
<eot>true</eot>
<tpduRef>1</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -92,7 +92,6 @@
<incoming-plc-message name="Receive S7 Connection Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -106,6 +105,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -113,12 +113,11 @@
<outgoing-plc-message name="Send S7 Identification Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>17</method>
<cpuFunctionType>4</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -127,12 +126,12 @@
<dataUnitReferenceNumber/>
<lastDataUnit/>
<errorCode/>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
<returnCode>OK</returnCode>
<transportSize>OCTET_STRING</transportSize>
<szlId className="org.apache.plc4x.java.s7.readwrite.SzlId">
@@ -141,12 +140,13 @@
<sublistList>MODULE_IDENTIFICATION</sublistList>
</szlId>
<szlIndex>0</szlIndex>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>2</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -154,12 +154,11 @@
<incoming-plc-message name="Receive S7 Identification Response">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>18</method>
<cpuFunctionType>8</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -168,12 +167,12 @@
<dataUnitReferenceNumber>0</dataUnitReferenceNumber>
<lastDataUnit>0</lastDataUnit>
<errorCode>0</errorCode>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlResponse">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlResponse">
<returnCode>OK</returnCode>
<transportSize>OCTET_STRING</transportSize>
<szlId className="org.apache.plc4x.java.s7.readwrite.SzlId">
@@ -183,34 +182,35 @@
</szlId>
<szlIndex>0</szlIndex>
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>1</itemIndex>
<mlfb>36455337203231322d31424433302d3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>1</ausbg>
<ausbe>8224</ausbe>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>6</itemIndex>
<mlfb>36455337203231322d31424433302d3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>1</ausbg>
<ausbe>8224</ausbe>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>7</itemIndex>
<mlfb>36455337203231322d31424433302d3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>22018</ausbg>
<ausbe>2</ausbe>
- </items>
+ </item>
</items>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</incoming-plc-message>
@@ -232,12 +232,11 @@
<outgoing-plc-message name="Send S7 Read Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>10</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -246,13 +245,14 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
+ </item>
</items>
</parameter>
<payload/>
</payload>
<eot>true</eot>
<tpduRef>10</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</outgoing-plc-message>
@@ -267,11 +267,11 @@
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadReadVarResponse">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
+ </item>
</items>
</payload>
<errorClass>0</errorClass>
@@ -324,12 +324,11 @@
<outgoing-plc-message name="Send S7 Read Request">
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>10</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -338,10 +337,11 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
+ </item>
</items>
</parameter>
<payload/>
+ <parameters/>
</payload>
<eot>true</eot>
<tpduRef>10</tpduRef>
diff --git a/protocols/s7/src/test/resources/protocols/s7/ParserSerializerTestsuite.xml b/protocols/s7/src/test/resources/protocols/s7/ParserSerializerTestsuite.xml
index 01e1381..16a7fc0 100644
--- a/protocols/s7/src/test/resources/protocols/s7/ParserSerializerTestsuite.xml
+++ b/protocols/s7/src/test/resources/protocols/s7/ParserSerializerTestsuite.xml
@@ -28,21 +28,21 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionRequest">
+ <payload/>
+ <destinationReference>0</destinationReference>
+ <sourceReference>15</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>0</destinationReference>
- <sourceReference>15</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</xml>
@@ -55,21 +55,21 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketConnectionResponse">
+ <payload/>
+ <destinationReference>15</destinationReference>
+ <sourceReference>11</sourceReference>
+ <protocolClass>CLASS_0</protocolClass>
<parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterTpduSize">
<tpduSize>SIZE_1024</tpduSize>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCallingTsap">
<tsapId>785</tsapId>
- </parameters>
- <parameters className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
+ </parameter>
+ <parameter className="org.apache.plc4x.java.s7.readwrite.COTPParameterCalledTsap">
<tsapId>256</tsapId>
- </parameters>
+ </parameter>
</parameters>
- <payload/>
- <destinationReference>15</destinationReference>
- <sourceReference>11</sourceReference>
- <protocolClass>CLASS_0</protocolClass>
</payload>
</TPKTPacket>
</xml>
@@ -82,7 +82,6 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -94,6 +93,7 @@
</payload>
<eot>true</eot>
<tpduRef>1</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -106,7 +106,6 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>0</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterSetupCommunication">
@@ -120,6 +119,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -132,12 +132,11 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>17</method>
<cpuFunctionType>4</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -146,12 +145,12 @@
<dataUnitReferenceNumber/>
<lastDataUnit/>
<errorCode/>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlRequest">
<returnCode>OK</returnCode>
<transportSize>OCTET_STRING</transportSize>
<szlId className="org.apache.plc4x.java.s7.readwrite.SzlId">
@@ -160,12 +159,13 @@
<sublistList>MODULE_IDENTIFICATION</sublistList>
</szlId>
<szlIndex>0</szlIndex>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>2</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -178,12 +178,11 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageUserData">
<tpduReference>1</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7ParameterUserDataItemCPUFunctions">
<method>18</method>
<cpuFunctionType>8</cpuFunctionType>
<cpuFunctionGroup>4</cpuFunctionGroup>
@@ -192,12 +191,12 @@
<dataUnitReferenceNumber>0</dataUnitReferenceNumber>
<lastDataUnit>0</lastDataUnit>
<errorCode>0</errorCode>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserData">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlResponse">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCpuFunctionReadSzlResponse">
<returnCode>OK</returnCode>
<transportSize>OCTET_STRING</transportSize>
<szlId className="org.apache.plc4x.java.s7.readwrite.SzlId">
@@ -207,34 +206,35 @@
</szlId>
<szlIndex>0</szlIndex>
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>1</itemIndex>
<mlfb>36455337203231322D31424433302D3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>1</ausbg>
<ausbe>8224</ausbe>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>6</itemIndex>
<mlfb>36455337203231322D31424433302D3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>1</ausbg>
<ausbe>8224</ausbe>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.SzlDataTreeItem">
<itemIndex>7</itemIndex>
<mlfb>36455337203231322D31424433302D3058423020</mlfb>
<moduleTypeId>8224</moduleTypeId>
<ausbg>22018</ausbg>
<ausbe>2</ausbe>
- </items>
+ </item>
</items>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -247,12 +247,11 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>11</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarRequest">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -261,8 +260,8 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -271,8 +270,8 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -281,8 +280,8 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -291,13 +290,14 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
+ </item>
</items>
</parameter>
<payload/>
</payload>
<eot>true</eot>
<tpduRef>11</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -311,7 +311,6 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>11</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterReadVarResponse">
@@ -319,26 +318,26 @@
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadReadVarResponse">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
+ </item>
</items>
</payload>
<errorClass>0</errorClass>
@@ -346,6 +345,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -358,7 +358,6 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponse">
<tpduReference>10</tpduReference>
<parameter/>
@@ -368,6 +367,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -380,12 +380,11 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageRequest">
<tpduReference>14</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterWriteVarRequest">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -394,8 +393,8 @@
<byteAddress>0</byteAddress>
<bitAddress>0</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -404,8 +403,8 @@
<byteAddress>0</byteAddress>
<bitAddress>1</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -414,8 +413,8 @@
<byteAddress>0</byteAddress>
<bitAddress>2</bitAddress>
</address>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarRequestParameterItemAddress">
<address className="org.apache.plc4x.java.s7.readwrite.S7AddressAny">
<transportSize>BOOL</transportSize>
<numberOfElements>1</numberOfElements>
@@ -424,36 +423,37 @@
<byteAddress>0</byteAddress>
<bitAddress>3</bitAddress>
</address>
- </items>
+ </item>
</items>
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadWriteVarRequest">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadDataItem">
<returnCode>OK</returnCode>
<transportSize>BIT</transportSize>
<data>01</data>
- </items>
+ </item>
</items>
</payload>
</payload>
<eot>true</eot>
<tpduRef>14</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>
@@ -466,7 +466,6 @@
<xml>
<TPKTPacket className="org.apache.plc4x.java.s7.readwrite.TPKTPacket">
<payload className="org.apache.plc4x.java.s7.readwrite.COTPPacketData">
- <parameters/>
<payload className="org.apache.plc4x.java.s7.readwrite.S7MessageResponseData">
<tpduReference>14</tpduReference>
<parameter className="org.apache.plc4x.java.s7.readwrite.S7ParameterWriteVarResponse">
@@ -474,18 +473,18 @@
</parameter>
<payload className="org.apache.plc4x.java.s7.readwrite.S7PayloadWriteVarResponse">
<items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
<returnCode>OK</returnCode>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
<returnCode>OK</returnCode>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
<returnCode>OK</returnCode>
- </items>
- <items className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
+ </item>
+ <item className="org.apache.plc4x.java.s7.readwrite.S7VarPayloadStatusItem">
<returnCode>OK</returnCode>
- </items>
+ </item>
</items>
</payload>
<errorClass>0</errorClass>
@@ -493,6 +492,7 @@
</payload>
<eot>true</eot>
<tpduRef>0</tpduRef>
+ <parameters/>
</payload>
</TPKTPacket>
</xml>