You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/02/20 19:16:23 UTC
[plc4x] branch fix/cdutz/reenable-golang-driver-testsuites updated (3bbd414e2a -> e536f652f3)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch fix/cdutz/reenable-golang-driver-testsuites
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 3bbd414e2a chore(driver/eip): Started porting the Go version of the EIP driver and started documenting the state-machine of the driver itself, based on the Java implementation.
new b6b3361224 chore(driver/eip): Minor updates to the Java version of the EIP driver
new e536f652f3 chore(driver/eip): Refactored the mspec and java driver to work without parser argument properties.
The 2 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:
.../testing/protocols/eip/DriverTestsuite.xml | 20 +-
plc4go/protocols/eip/readwrite/ParserHelper.go | 46 +--
plc4go/protocols/eip/readwrite/XmlParserHelper.go | 47 +--
.../readwrite/model/AnsiExtendedSymbolSegment.go | 21 +-
.../eip/readwrite/model/CIPDataConnected.go | 28 +-
.../eip/readwrite/model/CipConnectedRequest.go | 14 +-
.../eip/readwrite/model/CipConnectedResponse.go | 16 +-
.../model/CipConnectionManagerCloseRequest.go | 34 +-
.../model/CipConnectionManagerCloseResponse.go | 14 +-
.../readwrite/model/CipConnectionManagerRequest.go | 34 +-
.../model/CipConnectionManagerResponse.go | 16 +-
plc4go/protocols/eip/readwrite/model/CipRRData.go | 19 +-
.../eip/readwrite/model/CipReadRequest.go | 20 +-
.../eip/readwrite/model/CipReadResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/CipService.go | 45 ++-
.../eip/readwrite/model/CipUnconnectedRequest.go | 26 +-
.../eip/readwrite/model/CipWriteRequest.go | 20 +-
.../eip/readwrite/model/CipWriteResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/ClassID.go | 21 +-
.../protocols/eip/readwrite/model/ClassSegment.go | 27 +-
.../eip/readwrite/model/ConnectedAddressItem.go | 17 +-
.../eip/readwrite/model/ConnectedDataItem.go | 19 +-
.../protocols/eip/readwrite/model/DataSegment.go | 21 +-
.../eip/readwrite/model/DataSegmentType.go | 26 +-
.../eip/readwrite/model/EipConnectionRequest.go | 17 +-
.../eip/readwrite/model/EipConnectionResponse.go | 17 +-
.../eip/readwrite/model/EipDisconnectRequest.go | 17 +-
plc4go/protocols/eip/readwrite/model/EipPacket.go | 46 +--
.../eip/readwrite/model/GetAttributeAllRequest.go | 24 +-
.../eip/readwrite/model/GetAttributeAllResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/InstanceID.go | 21 +-
.../eip/readwrite/model/InstanceSegment.go | 27 +-
.../eip/readwrite/model/ListServicesRequest.go | 17 +-
.../eip/readwrite/model/ListServicesResponse.go | 23 +-
.../eip/readwrite/model/LogicalSegment.go | 21 +-
.../eip/readwrite/model/LogicalSegmentType.go | 30 +-
plc4go/protocols/eip/readwrite/model/MemberID.go | 21 +-
.../eip/readwrite/model/MultipleServiceRequest.go | 24 +-
.../eip/readwrite/model/MultipleServiceResponse.go | 14 +-
.../readwrite/model/NetworkConnectionParameters.go | 27 +-
.../eip/readwrite/model/NullAddressItem.go | 17 +-
.../eip/readwrite/model/NullCommandRequest.go | 17 +-
.../eip/readwrite/model/NullCommandResponse.go | 17 +-
.../readwrite/model/NullEipConnectionResponse.go | 17 +-
.../readwrite/model/NullListServicesResponse.go | 17 +-
.../protocols/eip/readwrite/model/PathSegment.go | 30 +-
.../protocols/eip/readwrite/model/PortSegment.go | 21 +-
.../eip/readwrite/model/PortSegmentExtended.go | 20 +-
.../eip/readwrite/model/PortSegmentNormal.go | 18 +-
.../eip/readwrite/model/PortSegmentType.go | 27 +-
.../protocols/eip/readwrite/model/SendUnitData.go | 25 +-
plc4go/protocols/eip/readwrite/model/Services.go | 20 +-
.../eip/readwrite/model/ServicesResponse.go | 17 +-
.../protocols/eip/readwrite/model/TransportType.go | 27 +-
plc4go/protocols/eip/readwrite/model/TypeId.go | 34 +-
.../eip/readwrite/model/UnConnectedDataItem.go | 19 +-
plc4j/drivers/eip/pom.xml | 4 +-
.../eip/readwrite/AnsiExtendedSymbolSegment.java | 79 +----
.../plc4x/java/eip/readwrite/CIPAttributes.java | 13 +-
.../apache/plc4x/java/eip/readwrite/CIPData.java | 8 +-
.../plc4x/java/eip/readwrite/CIPDataConnected.java | 27 +-
.../java/eip/readwrite/CipConnectedRequest.java | 99 +-----
.../java/eip/readwrite/CipConnectedResponse.java | 108 +-----
.../CipConnectionManagerCloseRequest.java | 261 +++-----------
.../CipConnectionManagerCloseResponse.java | 174 ++-------
.../eip/readwrite/CipConnectionManagerRequest.java | 390 +++------------------
.../readwrite/CipConnectionManagerResponse.java | 224 ++----------
.../apache/plc4x/java/eip/readwrite/CipRRData.java | 107 +-----
.../plc4x/java/eip/readwrite/CipReadRequest.java | 87 +----
.../plc4x/java/eip/readwrite/CipReadResponse.java | 103 +-----
.../plc4x/java/eip/readwrite/CipService.java | 111 ++----
.../java/eip/readwrite/CipUnconnectedRequest.java | 206 ++---------
.../plc4x/java/eip/readwrite/CipWriteRequest.java | 127 ++-----
.../plc4x/java/eip/readwrite/CipWriteResponse.java | 87 +----
.../apache/plc4x/java/eip/readwrite/ClassID.java | 59 +---
.../plc4x/java/eip/readwrite/ClassSegment.java | 101 +-----
.../java/eip/readwrite/ConnectedAddressItem.java | 59 +---
.../java/eip/readwrite/ConnectedDataItem.java | 78 +----
.../plc4x/java/eip/readwrite/DataSegment.java | 39 +--
.../plc4x/java/eip/readwrite/DataSegmentType.java | 49 +--
.../java/eip/readwrite/EipConnectionRequest.java | 59 +---
.../java/eip/readwrite/EipConnectionResponse.java | 58 +--
.../java/eip/readwrite/EipDisconnectRequest.java | 26 +-
.../apache/plc4x/java/eip/readwrite/EipPacket.java | 183 +++-------
.../java/eip/readwrite/GetAttributeAllRequest.java | 86 +----
.../eip/readwrite/GetAttributeAllResponse.java | 109 +-----
.../plc4x/java/eip/readwrite/InstanceID.java | 59 +---
.../plc4x/java/eip/readwrite/InstanceSegment.java | 104 +-----
.../plc4x/java/eip/readwrite/IntegerEncoding.java | 55 ---
.../java/eip/readwrite/ListServicesRequest.java | 26 +-
.../java/eip/readwrite/ListServicesResponse.java | 62 +---
.../plc4x/java/eip/readwrite/LogicalSegment.java | 39 +--
.../java/eip/readwrite/LogicalSegmentType.java | 53 +--
.../apache/plc4x/java/eip/readwrite/MemberID.java | 59 +---
.../java/eip/readwrite/MultipleServiceRequest.java | 86 +----
.../eip/readwrite/MultipleServiceResponse.java | 151 ++------
.../eip/readwrite/NetworkConnectionParameters.java | 182 ++--------
.../plc4x/java/eip/readwrite/NullAddressItem.java | 41 +--
.../java/eip/readwrite/NullCommandRequest.java | 26 +-
.../java/eip/readwrite/NullCommandResponse.java | 26 +-
.../eip/readwrite/NullEipConnectionResponse.java | 25 +-
.../eip/readwrite/NullListServicesResponse.java | 25 +-
.../plc4x/java/eip/readwrite/PathSegment.java | 55 +--
.../plc4x/java/eip/readwrite/PortSegment.java | 39 +--
.../java/eip/readwrite/PortSegmentExtended.java | 25 +-
.../java/eip/readwrite/PortSegmentNormal.java | 23 +-
.../plc4x/java/eip/readwrite/PortSegmentType.java | 35 +-
.../plc4x/java/eip/readwrite/SendUnitData.java | 102 +-----
.../apache/plc4x/java/eip/readwrite/Services.java | 91 +----
.../plc4x/java/eip/readwrite/ServicesResponse.java | 150 ++------
.../plc4x/java/eip/readwrite/TransportType.java | 87 +----
.../apache/plc4x/java/eip/readwrite/TypeId.java | 59 +---
.../java/eip/readwrite/UnConnectedDataItem.java | 61 +---
.../org/apache/plc4x/java/eip/base/EIPDriver.java | 45 ++-
.../eip/base/configuration/EIPConfiguration.java | 10 +-
.../java/eip/base/protocol/EipProtocolLogic.java | 293 ++++++----------
.../apache/plc4x/java/eip/logix/LogixDriver.java | 13 +-
.../logix/configuration/LogixConfiguration.java | 11 -
.../java/eip/readwrite/utils/StaticHelper.java | 12 +-
....java => EIPParserSerializerBigEndianTest.java} | 6 +-
...va => EIPParserSerializerLittleEndianTest.java} | 6 +-
.../eip/src/main/resources/protocols/eip/eip.mspec | 377 ++++++++++----------
.../resources/protocols/eip/DriverTestsuite.xml | 20 +-
....xml => ParserSerializerTestsuiteBigEndian.xml} | 13 +-
...l => ParserSerializerTestsuiteLittleEndian.xml} | 38 +-
125 files changed, 1674 insertions(+), 5319 deletions(-)
delete mode 100644 plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/IntegerEncoding.java
rename plc4j/drivers/eip/src/test/java/org/apache/plc4x/java/eip/readwrite/{EIPParserSerializerLittleTest.java => EIPParserSerializerBigEndianTest.java} (81%)
rename plc4j/drivers/eip/src/test/java/org/apache/plc4x/java/eip/readwrite/{EIPParserSerializerTest.java => EIPParserSerializerLittleEndianTest.java} (81%)
rename protocols/eip/src/test/resources/protocols/eip/{ParserSerializerTestsuite.xml => ParserSerializerTestsuiteBigEndian.xml} (96%)
rename protocols/eip/src/test/resources/protocols/eip/{ParserSerializerTestsuiteLittle.xml => ParserSerializerTestsuiteLittleEndian.xml} (98%)
[plc4x] 01/02: chore(driver/eip): Minor updates to the Java version of the EIP driver
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch fix/cdutz/reenable-golang-driver-testsuites
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b6b336122408203b98c9ed85b4cd516d2c5667df
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Feb 20 08:07:32 2023 +0100
chore(driver/eip): Minor updates to the Java version of the EIP driver
---
.../org/apache/plc4x/java/eip/base/EIPDriver.java | 14 ++---
.../java/eip/base/protocol/EipProtocolLogic.java | 61 ++++++++--------------
2 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/EIPDriver.java b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/EIPDriver.java
index 26904599e1..6859e87df1 100644
--- a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/EIPDriver.java
+++ b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/EIPDriver.java
@@ -25,7 +25,6 @@ import org.apache.plc4x.java.eip.base.configuration.EIPConfiguration;
import org.apache.plc4x.java.eip.base.tag.EipTag;
import org.apache.plc4x.java.eip.base.protocol.EipProtocolLogic;
import org.apache.plc4x.java.eip.base.tag.EipTagHandler;
-import org.apache.plc4x.java.eip.logix.LogixDriver;
import org.apache.plc4x.java.eip.readwrite.EipPacket;
import org.apache.plc4x.java.eip.readwrite.IntegerEncoding;
import org.apache.plc4x.java.spi.configuration.ConfigurationFactory;
@@ -106,7 +105,7 @@ public class EIPDriver extends GeneratedDriverBase<EipPacket> {
.withProtocol(EipProtocolLogic.class)
.withPacketSizeEstimator(ByteLengthEstimator.class)
.withParserArgs(IntegerEncoding.BIG_ENDIAN, true)
- .withCorruptPacketRemover(LogixDriver.CorruptPackageCleaner.class)
+ .withCorruptPacketRemover(CorruptPackageCleaner.class)
.bigEndian()
.build();
} else {
@@ -114,7 +113,7 @@ public class EIPDriver extends GeneratedDriverBase<EipPacket> {
.withProtocol(EipProtocolLogic.class)
.withPacketSizeEstimator(ByteLengthEstimator.class)
.withParserArgs(IntegerEncoding.LITTLE_ENDIAN, true)
- .withCorruptPacketRemover(LogixDriver.CorruptPackageCleaner.class)
+ .withCorruptPacketRemover(CorruptPackageCleaner.class)
.littleEndian()
.build();
}
@@ -209,13 +208,16 @@ public class EIPDriver extends GeneratedDriverBase<EipPacket> {
}
/** Estimate the Length of a Packet */
- public static class ByteLengthEstimator implements ToIntFunction<ByteBuf> {
+ public class ByteLengthEstimator implements ToIntFunction<ByteBuf> {
@Override
public int applyAsInt(ByteBuf byteBuf) {
if (byteBuf.readableBytes() >= 4) {
//Second byte for the size and then add the header size 24
- int size = byteBuf.getUnsignedShort(byteBuf.readerIndex()+2)+24;
- return size;
+ if (configuration.getByteOrder() == IntegerEncoding.BIG_ENDIAN) {
+ return byteBuf.getUnsignedShort(byteBuf.readerIndex() + 2) + 24;
+ } else {
+ return byteBuf.getUnsignedShortLE(byteBuf.readerIndex() + 2) + 24;
+ }
}
return -1;
}
diff --git a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/protocol/EipProtocolLogic.java b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/protocol/EipProtocolLogic.java
index 9cf8021d10..f53cde2fc2 100644
--- a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/protocol/EipProtocolLogic.java
+++ b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/base/protocol/EipProtocolLogic.java
@@ -74,7 +74,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
private boolean useMessageRouter = false;
- private List<PathSegment> routingAddress = new ArrayList<>();
+ private final List<PathSegment> routingAddress = new ArrayList<>();
short connectionPathSize = 0;
private final int connectionSerialNumber = ThreadLocalRandom.current().nextInt();
@@ -164,6 +164,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
private void listServices(ConversationContext<EipPacket> context) {
logger.debug("Sending List Services packet to confirm CIP Encapsulation is available");
+ // TODO: It seems that we're only doing this request in order to find out, if we can do CIP encapsulation, however this value is never really used anywhere.
ListServicesRequest listServicesRequest = new ListServicesRequest(
EMPTY_SESSION_HANDLE,
CIPStatus.Success.getValue(),
@@ -253,7 +254,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
} else {
throw new PlcRuntimeException("Got status code while polling for supported CIP services [" + p.getStatus() + "]");
}
-
});
}
@@ -319,7 +319,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
true,
this.configuration.getByteOrder()
),
- (long) 2113537,
+ 2113537L,
new NetworkConnectionParameters(
4002,
false,
@@ -331,7 +331,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
new TransportType(true, (byte) 2, (byte) 3, this.configuration.getByteOrder()),
this.connectionPathSize,
this.routingAddress,
- (int) 0,
+ 0,
this.configuration.getByteOrder()
),
this.configuration.getByteOrder()
@@ -524,6 +524,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
}
}
+ // TODO: This seems to be blocking here ... we should probably do this asynchronously
PlcReadResponse readResponse = new DefaultPlcReadResponse(readRequest, values);
future.complete(readResponse);
@@ -656,7 +657,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
}
Services services = new Services(offsets, requests, -1, this.configuration.getByteOrder());
MultipleServiceRequest serviceRequest = new MultipleServiceRequest(services, services.getLengthInBytes(), this.configuration.getByteOrder());
- int ss = serviceRequest.getLengthInBytes();
typeIds.add(new ConnectedDataItem(this.sequenceCount, serviceRequest, this.configuration.getByteOrder()));
}
@@ -712,7 +712,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
final Pattern RESOURCE_ADDRESS_PATTERN = Pattern.compile("([.\\[\\]])*([A-Za-z_0-9]+){1}");
Matcher matcher = RESOURCE_ADDRESS_PATTERN.matcher(tag);
List<PathSegment> segments = new LinkedList<>();
- String tagWithoutQualifiers = "";
int lengthBytes = 0;
while (matcher.find()) {
String identifier = matcher.group(2);
@@ -728,12 +727,10 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
default:
newSegment = new DataSegment(new AnsiExtendedSymbolSegment(identifier, (short) 0, order), order);
segments.add(newSegment);
- tagWithoutQualifiers += identifier;
}
} else {
newSegment = new DataSegment(new AnsiExtendedSymbolSegment(identifier, (short) 0, order), order);
segments.add(newSegment);
- tagWithoutQualifiers += identifier;
}
lengthBytes += newSegment.getLengthInBytes();
@@ -743,7 +740,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
for (PathSegment segment : segments) {
segment.serialize(buffer);
}
- return buffer.getData();
+ return buffer.getBytes();
}
private PlcReadResponse decodeReadResponse(CipService p, PlcReadRequest readRequest) {
@@ -769,7 +766,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
int nb = responses.getServiceNb();
List<CipService> arr = new ArrayList<>(nb);
ReadBufferByteBased read = new ReadBufferByteBased(responses.getServicesData(), org.apache.plc4x.java.spi.generation.ByteOrder.LITTLE_ENDIAN);
- int total = (int) read.getTotalBytes();
+ int total = read.getTotalBytes();
for (int i = 0; i < nb; i++) {
int length = 0;
int offset = responses.getOffsets().get(i) - responses.getOffsets().get(0); //Substract first offset as we only have the service in the buffer (not servicesNb and offsets)
@@ -778,8 +775,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
} else {
length = responses.getOffsets().get(i + 1) - offset - responses.getOffsets().get(0); //Calculate length with offsets (substracting first offset)
}
- ReadBuffer serviceBuf = new ReadBufferByteBased(read.getBytes(offset, offset + length), org.apache.plc4x.java.spi.generation.ByteOrder.LITTLE_ENDIAN);
- CipService service = null;
+ CipService service;
try {
service = CipService.staticParse(read, false, length, this.configuration.getByteOrder());
arr.add(service);
@@ -862,8 +858,8 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
index += type.getSize();
break;
case STRUCTURED: {
- Short structuredType = Short.reverseBytes(data.getShort(0));
- Short structuredLen = Short.reverseBytes(data.getShort(STRING_LEN_OFFSET));
+ short structuredType = Short.reverseBytes(data.getShort(0));
+ short structuredLen = Short.reverseBytes(data.getShort(STRING_LEN_OFFSET));
if (structuredType == CIPStructTypeCode.STRING.getValue()) {
// Length offset is 2, data offset is 6
list.add(new PlcSTRING(StandardCharsets
@@ -875,6 +871,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
// TODO: return as type STRUCT with structuredType to let user
// apps/progs handle it.
}
+ // TODO: This will fall-though to "default"
}
default:
return null;
@@ -898,8 +895,8 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
case STRING36:
case STRING:
case STRUCTURED: {
- Short structuredType = Short.reverseBytes(data.getShort(0));
- Short structuredLen = Short.reverseBytes(data.getShort(STRING_LEN_OFFSET));
+ short structuredType = Short.reverseBytes(data.getShort(0));
+ short structuredLen = Short.reverseBytes(data.getShort(STRING_LEN_OFFSET));
if (structuredType == CIPStructTypeCode.STRING.getValue()) {
// Length offset is 2, data offset is 6
return new PlcSTRING(StandardCharsets
@@ -908,6 +905,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
else {
// This is a different type of STRUCTURED data
}
+ // TODO: This will fall-though to "default"
}
default:
return null;
@@ -936,10 +934,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
final EipTag field = (EipTag) request.getTag(fieldName);
final PlcValue value = request.getPlcValue(fieldName);
String tag = field.getTag();
- int elements = 1;
- if (field.getElementNb() > 1) {
- elements = field.getElementNb();
- }
+ int elements = Math.max(field.getElementNb(), 1);
byte[] data = encodeValue(value, field.getType(), (short) elements);
CipWriteRequest writeReq = null;
@@ -1008,6 +1003,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
}
}
+ // TODO: This seems to be blocking here ... we should probably do this asynchronously
PlcWriteResponse response = new DefaultPlcWriteResponse(writeRequest, values);
future.complete(response);
return future;
@@ -1021,10 +1017,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
final EipTag field = (EipTag) request.getTag(fieldName);
final PlcValue value = request.getPlcValue(fieldName);
String tag = field.getTag();
- int elements = 1;
- if (field.getElementNb() > 1) {
- elements = field.getElementNb();
- }
+ int elements = Math.max(field.getElementNb(), 1);
byte[] data = encodeValue(value, field.getType(), (short) elements);
try {
@@ -1170,10 +1163,7 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
final EipTag field = (EipTag) request.getTag(fieldName);
final PlcValue value = request.getPlcValue(fieldName);
String tag = field.getTag();
- int elements = 1;
- if (field.getElementNb() > 1) {
- elements = field.getElementNb();
- }
+ int elements = Math.max(field.getElementNb(), 1);
byte[] data = encodeValue(value, field.getType(), (short) elements);
try {
@@ -1245,9 +1235,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
Services data = new Services(offsets, serviceArr, -1, this.configuration.getByteOrder());
//Encapsulate the data
- PathSegment classSegment = new LogicalSegment(new ClassID((byte) 0, (short) 6, this.configuration.getByteOrder()), this.configuration.getByteOrder());
- PathSegment instanceSegment = new LogicalSegment(new InstanceID((byte) 0, (short) 1, this.configuration.getByteOrder()), this.configuration.getByteOrder());
-
ConnectedDataItem exchange = new ConnectedDataItem(
this.sequenceCount,
new MultipleServiceRequest(data, -1, this.configuration.getByteOrder()),
@@ -1317,7 +1304,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
if (p instanceof CipWriteResponse) {
CipWriteResponse resp = (CipWriteResponse) p;
String fieldName = writeRequest.getTagNames().iterator().next();
- EipTag field = (EipTag) writeRequest.getTag(fieldName);
responses.put(fieldName, decodeResponseCode(resp.getStatus()));
return new DefaultPlcWriteResponse(writeRequest, responses);
} else if (p instanceof MultipleServiceResponse) {
@@ -1325,17 +1311,16 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
int nb = resp.getServiceNb();
List<CipService> arr = new ArrayList<>(nb);
ReadBufferByteBased read = new ReadBufferByteBased(resp.getServicesData());
- int total = (int) read.getTotalBytes();
+ int total = read.getTotalBytes();
for (int i = 0; i < nb; i++) {
- int length = 0;
+ int length;
int offset = resp.getOffsets().get(i);
if (offset == nb - 1) {
length = total - offset; //Get the rest if last
} else {
length = resp.getOffsets().get(i + 1) - offset; //Calculate length with offsets
}
- ReadBuffer serviceBuf = new ReadBufferByteBased(read.getBytes(offset, length), org.apache.plc4x.java.spi.generation.ByteOrder.LITTLE_ENDIAN);
- CipService service = null;
+ CipService service;
try {
service = CipService.staticParse(read, false, length, this.configuration.getByteOrder());
arr.add(service);
@@ -1347,8 +1332,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
Iterator<String> it = writeRequest.getTagNames().iterator();
for (int i = 0; i < nb && it.hasNext(); i++) {
String fieldName = it.next();
- EipTag field = (EipTag) writeRequest.getTag(fieldName);
- PlcValue plcValue = null;
if (services.getServices().get(i) instanceof CipWriteResponse) {
CipWriteResponse writeResponse = (CipWriteResponse) services.getServices().get(i);
PlcResponseCode code = decodeResponseCode(writeResponse.getStatus());
@@ -1409,6 +1392,6 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
@Override
public void close(ConversationContext<EipPacket> context) {
- return;
}
+
}
[plc4x] 02/02: chore(driver/eip): Refactored the mspec and java driver to work without parser argument properties.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch fix/cdutz/reenable-golang-driver-testsuites
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit e536f652f3b2ebde1202f55b6679cfffa9839390
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Feb 20 20:14:38 2023 +0100
chore(driver/eip): Refactored the mspec and java driver to work without parser argument properties.
---
.../testing/protocols/eip/DriverTestsuite.xml | 20 +-
plc4go/protocols/eip/readwrite/ParserHelper.go | 46 +--
plc4go/protocols/eip/readwrite/XmlParserHelper.go | 47 +--
.../readwrite/model/AnsiExtendedSymbolSegment.go | 21 +-
.../eip/readwrite/model/CIPDataConnected.go | 28 +-
.../eip/readwrite/model/CipConnectedRequest.go | 14 +-
.../eip/readwrite/model/CipConnectedResponse.go | 16 +-
.../model/CipConnectionManagerCloseRequest.go | 34 +-
.../model/CipConnectionManagerCloseResponse.go | 14 +-
.../readwrite/model/CipConnectionManagerRequest.go | 34 +-
.../model/CipConnectionManagerResponse.go | 16 +-
plc4go/protocols/eip/readwrite/model/CipRRData.go | 19 +-
.../eip/readwrite/model/CipReadRequest.go | 20 +-
.../eip/readwrite/model/CipReadResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/CipService.go | 45 ++-
.../eip/readwrite/model/CipUnconnectedRequest.go | 26 +-
.../eip/readwrite/model/CipWriteRequest.go | 20 +-
.../eip/readwrite/model/CipWriteResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/ClassID.go | 21 +-
.../protocols/eip/readwrite/model/ClassSegment.go | 27 +-
.../eip/readwrite/model/ConnectedAddressItem.go | 17 +-
.../eip/readwrite/model/ConnectedDataItem.go | 19 +-
.../protocols/eip/readwrite/model/DataSegment.go | 21 +-
.../eip/readwrite/model/DataSegmentType.go | 26 +-
.../eip/readwrite/model/EipConnectionRequest.go | 17 +-
.../eip/readwrite/model/EipConnectionResponse.go | 17 +-
.../eip/readwrite/model/EipDisconnectRequest.go | 17 +-
plc4go/protocols/eip/readwrite/model/EipPacket.go | 46 +--
.../eip/readwrite/model/GetAttributeAllRequest.go | 24 +-
.../eip/readwrite/model/GetAttributeAllResponse.go | 14 +-
plc4go/protocols/eip/readwrite/model/InstanceID.go | 21 +-
.../eip/readwrite/model/InstanceSegment.go | 27 +-
.../eip/readwrite/model/ListServicesRequest.go | 17 +-
.../eip/readwrite/model/ListServicesResponse.go | 23 +-
.../eip/readwrite/model/LogicalSegment.go | 21 +-
.../eip/readwrite/model/LogicalSegmentType.go | 30 +-
plc4go/protocols/eip/readwrite/model/MemberID.go | 21 +-
.../eip/readwrite/model/MultipleServiceRequest.go | 24 +-
.../eip/readwrite/model/MultipleServiceResponse.go | 14 +-
.../readwrite/model/NetworkConnectionParameters.go | 27 +-
.../eip/readwrite/model/NullAddressItem.go | 17 +-
.../eip/readwrite/model/NullCommandRequest.go | 17 +-
.../eip/readwrite/model/NullCommandResponse.go | 17 +-
.../readwrite/model/NullEipConnectionResponse.go | 17 +-
.../readwrite/model/NullListServicesResponse.go | 17 +-
.../protocols/eip/readwrite/model/PathSegment.go | 30 +-
.../protocols/eip/readwrite/model/PortSegment.go | 21 +-
.../eip/readwrite/model/PortSegmentExtended.go | 20 +-
.../eip/readwrite/model/PortSegmentNormal.go | 18 +-
.../eip/readwrite/model/PortSegmentType.go | 27 +-
.../protocols/eip/readwrite/model/SendUnitData.go | 25 +-
plc4go/protocols/eip/readwrite/model/Services.go | 20 +-
.../eip/readwrite/model/ServicesResponse.go | 17 +-
.../protocols/eip/readwrite/model/TransportType.go | 27 +-
plc4go/protocols/eip/readwrite/model/TypeId.go | 34 +-
.../eip/readwrite/model/UnConnectedDataItem.go | 19 +-
plc4j/drivers/eip/pom.xml | 4 +-
.../eip/readwrite/AnsiExtendedSymbolSegment.java | 79 +----
.../plc4x/java/eip/readwrite/CIPAttributes.java | 13 +-
.../apache/plc4x/java/eip/readwrite/CIPData.java | 8 +-
.../plc4x/java/eip/readwrite/CIPDataConnected.java | 27 +-
.../java/eip/readwrite/CipConnectedRequest.java | 99 +-----
.../java/eip/readwrite/CipConnectedResponse.java | 108 +-----
.../CipConnectionManagerCloseRequest.java | 261 +++-----------
.../CipConnectionManagerCloseResponse.java | 174 ++-------
.../eip/readwrite/CipConnectionManagerRequest.java | 390 +++------------------
.../readwrite/CipConnectionManagerResponse.java | 224 ++----------
.../apache/plc4x/java/eip/readwrite/CipRRData.java | 107 +-----
.../plc4x/java/eip/readwrite/CipReadRequest.java | 87 +----
.../plc4x/java/eip/readwrite/CipReadResponse.java | 103 +-----
.../plc4x/java/eip/readwrite/CipService.java | 111 ++----
.../java/eip/readwrite/CipUnconnectedRequest.java | 206 ++---------
.../plc4x/java/eip/readwrite/CipWriteRequest.java | 127 ++-----
.../plc4x/java/eip/readwrite/CipWriteResponse.java | 87 +----
.../apache/plc4x/java/eip/readwrite/ClassID.java | 59 +---
.../plc4x/java/eip/readwrite/ClassSegment.java | 101 +-----
.../java/eip/readwrite/ConnectedAddressItem.java | 59 +---
.../java/eip/readwrite/ConnectedDataItem.java | 78 +----
.../plc4x/java/eip/readwrite/DataSegment.java | 39 +--
.../plc4x/java/eip/readwrite/DataSegmentType.java | 49 +--
.../java/eip/readwrite/EipConnectionRequest.java | 59 +---
.../java/eip/readwrite/EipConnectionResponse.java | 58 +--
.../java/eip/readwrite/EipDisconnectRequest.java | 26 +-
.../apache/plc4x/java/eip/readwrite/EipPacket.java | 183 +++-------
.../java/eip/readwrite/GetAttributeAllRequest.java | 86 +----
.../eip/readwrite/GetAttributeAllResponse.java | 109 +-----
.../plc4x/java/eip/readwrite/InstanceID.java | 59 +---
.../plc4x/java/eip/readwrite/InstanceSegment.java | 104 +-----
.../plc4x/java/eip/readwrite/IntegerEncoding.java | 55 ---
.../java/eip/readwrite/ListServicesRequest.java | 26 +-
.../java/eip/readwrite/ListServicesResponse.java | 62 +---
.../plc4x/java/eip/readwrite/LogicalSegment.java | 39 +--
.../java/eip/readwrite/LogicalSegmentType.java | 53 +--
.../apache/plc4x/java/eip/readwrite/MemberID.java | 59 +---
.../java/eip/readwrite/MultipleServiceRequest.java | 86 +----
.../eip/readwrite/MultipleServiceResponse.java | 151 ++------
.../eip/readwrite/NetworkConnectionParameters.java | 182 ++--------
.../plc4x/java/eip/readwrite/NullAddressItem.java | 41 +--
.../java/eip/readwrite/NullCommandRequest.java | 26 +-
.../java/eip/readwrite/NullCommandResponse.java | 26 +-
.../eip/readwrite/NullEipConnectionResponse.java | 25 +-
.../eip/readwrite/NullListServicesResponse.java | 25 +-
.../plc4x/java/eip/readwrite/PathSegment.java | 55 +--
.../plc4x/java/eip/readwrite/PortSegment.java | 39 +--
.../java/eip/readwrite/PortSegmentExtended.java | 25 +-
.../java/eip/readwrite/PortSegmentNormal.java | 23 +-
.../plc4x/java/eip/readwrite/PortSegmentType.java | 35 +-
.../plc4x/java/eip/readwrite/SendUnitData.java | 102 +-----
.../apache/plc4x/java/eip/readwrite/Services.java | 91 +----
.../plc4x/java/eip/readwrite/ServicesResponse.java | 150 ++------
.../plc4x/java/eip/readwrite/TransportType.java | 87 +----
.../apache/plc4x/java/eip/readwrite/TypeId.java | 59 +---
.../java/eip/readwrite/UnConnectedDataItem.java | 61 +---
.../org/apache/plc4x/java/eip/base/EIPDriver.java | 39 +--
.../eip/base/configuration/EIPConfiguration.java | 10 +-
.../java/eip/base/protocol/EipProtocolLogic.java | 234 +++++--------
.../apache/plc4x/java/eip/logix/LogixDriver.java | 13 +-
.../logix/configuration/LogixConfiguration.java | 11 -
.../java/eip/readwrite/utils/StaticHelper.java | 12 +-
....java => EIPParserSerializerBigEndianTest.java} | 6 +-
...va => EIPParserSerializerLittleEndianTest.java} | 6 +-
.../eip/src/main/resources/protocols/eip/eip.mspec | 377 ++++++++++----------
.../resources/protocols/eip/DriverTestsuite.xml | 20 +-
....xml => ParserSerializerTestsuiteBigEndian.xml} | 13 +-
...l => ParserSerializerTestsuiteLittleEndian.xml} | 38 +-
125 files changed, 1649 insertions(+), 5279 deletions(-)
diff --git a/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml b/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
index a57637bfa2..14f91f78ec 100644
--- a/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
@@ -26,6 +26,12 @@
<outputFlavor>read-write</outputFlavor>
<driver-name>eip</driver-name>
+ <driver-parameters>
+ <parameter>
+ <name>bigEndian</name>
+ <value>false</value>
+ </parameter>
+ </driver-parameters>
<setup>
<!--
@@ -34,7 +40,6 @@
-->
<outgoing-plc-message name="Send list services request">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>false</response>
</parser-arguments>
<EipPacket>
@@ -51,7 +56,6 @@
<!-- The PLC will respond accordingly -->
<incoming-plc-message name="Receive list services response">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>true</response>
</parser-arguments>
<EipPacket>
@@ -82,7 +86,6 @@
</incoming-plc-message>
<outgoing-plc-message name="Send connection request">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>false</response>
</parser-arguments>
<EipPacket>
@@ -100,7 +103,6 @@
</outgoing-plc-message>
<incoming-plc-message name="Receive connection response">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>true</response>
</parser-arguments>
<EipPacket>
@@ -119,7 +121,6 @@
<outgoing-plc-message name="Send get attribute all request">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>false</response>
</parser-arguments>
<EipPacket>
@@ -149,7 +150,7 @@
<response dataType="bit" bitLength="1">false</response>
<service dataType="uint" bitLength="7">1</service>
<GetAttributeAllRequest>
- <requestPathSize dataType="int" bitLength="8">2</requestPathSize>
+ <requestPathSize dataType="uint" bitLength="8">2</requestPathSize>
<classSegment>
<PathSegment>
<pathSegment dataType="uint" bitLength="3">1</pathSegment>
@@ -193,7 +194,6 @@
</outgoing-plc-message>
<incoming-plc-message name="Receive get attribute all response">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>true</response>
</parser-arguments>
<EipPacket>
@@ -252,7 +252,6 @@
</api-request>
<outgoing-plc-message name="Send CipReadRequest to PLC">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>false</response>
</parser-arguments>
<EipPacket>
@@ -282,7 +281,7 @@
<response dataType="bit" bitLength="1">false</response>
<service dataType="uint" bitLength="7">82</service>
<CipUnconnectedRequest>
- <requestPathSize dataType="int" bitLength="8">2</requestPathSize>
+ <requestPathSize dataType="uint" bitLength="8">2</requestPathSize>
<classSegment>
<PathSegment>
<pathSegment dataType="uint" bitLength="3">1</pathSegment>
@@ -322,7 +321,7 @@
<response dataType="bit" bitLength="1">false</response>
<service dataType="uint" bitLength="7">76</service>
<CipReadRequest>
- <requestPathSize dataType="int" bitLength="8">3</requestPathSize>
+ <requestPathSize dataType="uint" bitLength="8">3</requestPathSize>
<tag dataType="byte" bitLength="48">0x910472617465</tag>
<elementNb dataType="uint" bitLength="16">1</elementNb>
</CipReadRequest>
@@ -342,7 +341,6 @@
</outgoing-plc-message>
<incoming-plc-message name="Get CipReadResponse from PLC">
<parser-arguments>
- <byteOrder>BIG_ENDIAN</byteOrder>
<response>true</response>
</parser-arguments>
<EipPacket>
diff --git a/plc4go/protocols/eip/readwrite/ParserHelper.go b/plc4go/protocols/eip/readwrite/ParserHelper.go
index e5844db909..a903044c5b 100644
--- a/plc4go/protocols/eip/readwrite/ParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/ParserHelper.go
@@ -35,23 +35,17 @@ type EipParserHelper struct {
func (m EipParserHelper) Parse(typeName string, arguments []string, io utils.ReadBuffer) (interface{}, error) {
switch typeName {
case "PathSegment":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.PathSegmentParseWithBuffer(context.Background(), io, order)
+ return model.PathSegmentParseWithBuffer(context.Background(), io)
case "TransportType":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.TransportTypeParseWithBuffer(context.Background(), io, order)
+ return model.TransportTypeParseWithBuffer(context.Background(), io)
case "PortSegmentType":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.PortSegmentTypeParseWithBuffer(context.Background(), io, order)
+ return model.PortSegmentTypeParseWithBuffer(context.Background(), io)
case "NetworkConnectionParameters":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.NetworkConnectionParametersParseWithBuffer(context.Background(), io, order)
+ return model.NetworkConnectionParametersParseWithBuffer(context.Background(), io)
case "TypeId":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.TypeIdParseWithBuffer(context.Background(), io, order)
+ return model.TypeIdParseWithBuffer(context.Background(), io)
case "InstanceSegment":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.InstanceSegmentParseWithBuffer(context.Background(), io, order)
+ return model.InstanceSegmentParseWithBuffer(context.Background(), io)
case "CIPData":
packetLength, err := utils.StrToUint16(arguments[0])
if err != nil {
@@ -59,15 +53,13 @@ func (m EipParserHelper) Parse(typeName string, arguments []string, io utils.Rea
}
return model.CIPDataParseWithBuffer(context.Background(), io, packetLength)
case "ClassSegment":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.ClassSegmentParseWithBuffer(context.Background(), io, order)
+ return model.ClassSegmentParseWithBuffer(context.Background(), io)
case "EipPacket":
- order, _ := model.IntegerEncodingByName(arguments[0])
- response, err := utils.StrToBool(arguments[1])
+ response, err := utils.StrToBool(arguments[0])
if err != nil {
return nil, errors.Wrap(err, "Error parsing")
}
- return model.EipPacketParseWithBuffer(context.Background(), io, order, response)
+ return model.EipPacketParseWithBuffer(context.Background(), io, response)
case "CIPAttributes":
packetLength, err := utils.StrToUint16(arguments[0])
if err != nil {
@@ -83,27 +75,19 @@ func (m EipParserHelper) Parse(typeName string, arguments []string, io utils.Rea
if err != nil {
return nil, errors.Wrap(err, "Error parsing")
}
- order, _ := model.IntegerEncodingByName(arguments[2])
- return model.CipServiceParseWithBuffer(context.Background(), io, connected, serviceLen, order)
+ return model.CipServiceParseWithBuffer(context.Background(), io, connected, serviceLen)
case "Services":
servicesLen, err := utils.StrToUint16(arguments[0])
if err != nil {
return nil, errors.Wrap(err, "Error parsing")
}
- order, _ := model.IntegerEncodingByName(arguments[1])
- return model.ServicesParseWithBuffer(context.Background(), io, servicesLen, order)
+ return model.ServicesParseWithBuffer(context.Background(), io, servicesLen)
case "LogicalSegmentType":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.LogicalSegmentTypeParseWithBuffer(context.Background(), io, order)
- case "CIPDataConnected":
- packetLength, err := utils.StrToUint16(arguments[0])
- if err != nil {
- return nil, errors.Wrap(err, "Error parsing")
- }
- return model.CIPDataConnectedParseWithBuffer(context.Background(), io, packetLength)
+ return model.LogicalSegmentTypeParseWithBuffer(context.Background(), io)
case "DataSegmentType":
- order, _ := model.IntegerEncodingByName(arguments[0])
- return model.DataSegmentTypeParseWithBuffer(context.Background(), io, order)
+ return model.DataSegmentTypeParseWithBuffer(context.Background(), io)
+ case "CIPDataConnected":
+ return model.CIPDataConnectedParseWithBuffer(context.Background(), io)
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/protocols/eip/readwrite/XmlParserHelper.go b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
index 2e609591b0..d5f55d76d0 100644
--- a/plc4go/protocols/eip/readwrite/XmlParserHelper.go
+++ b/plc4go/protocols/eip/readwrite/XmlParserHelper.go
@@ -45,23 +45,17 @@ func init() {
func (m EipXmlParserHelper) Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error) {
switch typeName {
case "PathSegment":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.PathSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.PathSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "TransportType":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.TransportTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.TransportTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "PortSegmentType":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.PortSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.PortSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "NetworkConnectionParameters":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.NetworkConnectionParametersParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.NetworkConnectionParametersParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "TypeId":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.TypeIdParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.TypeIdParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "InstanceSegment":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.InstanceSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.InstanceSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "CIPData":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
if err != nil {
@@ -70,12 +64,10 @@ func (m EipXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
packetLength := uint16(parsedUint0)
return model.CIPDataParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), packetLength)
case "ClassSegment":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.ClassSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.ClassSegmentParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "EipPacket":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- response := parserArguments[1] == "true"
- return model.EipPacketParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order, response)
+ response := parserArguments[0] == "true"
+ return model.EipPacketParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), response)
case "CIPAttributes":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
if err != nil {
@@ -90,29 +82,20 @@ func (m EipXmlParserHelper) Parse(typeName string, xmlString string, parserArgum
return nil, err
}
serviceLen := uint16(parsedUint1)
- order, _ := model.IntegerEncodingByName(parserArguments[2])
- return model.CipServiceParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), connected, serviceLen, order)
+ return model.CipServiceParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), connected, serviceLen)
case "Services":
parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
if err != nil {
return nil, err
}
servicesLen := uint16(parsedUint0)
- order, _ := model.IntegerEncodingByName(parserArguments[1])
- return model.ServicesParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), servicesLen, order)
+ return model.ServicesParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), servicesLen)
case "LogicalSegmentType":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.LogicalSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
- case "CIPDataConnected":
- parsedUint0, err := strconv.ParseUint(parserArguments[0], 10, 16)
- if err != nil {
- return nil, err
- }
- packetLength := uint16(parsedUint0)
- return model.CIPDataConnectedParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), packetLength)
+ return model.LogicalSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
case "DataSegmentType":
- order, _ := model.IntegerEncodingByName(parserArguments[0])
- return model.DataSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)), order)
+ return model.DataSegmentTypeParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
+ case "CIPDataConnected":
+ return model.CIPDataConnectedParseWithBuffer(context.Background(), utils.NewXmlReadBuffer(strings.NewReader(xmlString)))
}
return nil, errors.Errorf("Unsupported type %s", typeName)
}
diff --git a/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go b/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
index 5f524935bf..1a942b3b02 100644
--- a/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/AnsiExtendedSymbolSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -92,11 +91,11 @@ func (m *_AnsiExtendedSymbolSegment) GetPad() *uint8 {
///////////////////////////////////////////////////////////
// NewAnsiExtendedSymbolSegment factory function for _AnsiExtendedSymbolSegment
-func NewAnsiExtendedSymbolSegment(symbol string, pad *uint8, order IntegerEncoding) *_AnsiExtendedSymbolSegment {
+func NewAnsiExtendedSymbolSegment(symbol string, pad *uint8) *_AnsiExtendedSymbolSegment {
_result := &_AnsiExtendedSymbolSegment{
Symbol: symbol,
Pad: pad,
- _DataSegmentType: NewDataSegmentType(order),
+ _DataSegmentType: NewDataSegmentType(),
}
_result._DataSegmentType._DataSegmentTypeChildRequirements = _result
return _result
@@ -138,11 +137,11 @@ func (m *_AnsiExtendedSymbolSegment) GetLengthInBytes(ctx context.Context) uint1
return m.GetLengthInBits(ctx) / 8
}
-func AnsiExtendedSymbolSegmentParse(theBytes []byte, order IntegerEncoding) (AnsiExtendedSymbolSegment, error) {
- return AnsiExtendedSymbolSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func AnsiExtendedSymbolSegmentParse(theBytes []byte) (AnsiExtendedSymbolSegment, error) {
+ return AnsiExtendedSymbolSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func AnsiExtendedSymbolSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (AnsiExtendedSymbolSegment, error) {
+func AnsiExtendedSymbolSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (AnsiExtendedSymbolSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("AnsiExtendedSymbolSegment"); pullErr != nil {
@@ -181,18 +180,16 @@ func AnsiExtendedSymbolSegmentParseWithBuffer(ctx context.Context, readBuffer ut
// Create a partially initialized instance
_child := &_AnsiExtendedSymbolSegment{
- _DataSegmentType: &_DataSegmentType{
- Order: order,
- },
- Symbol: symbol,
- Pad: pad,
+ _DataSegmentType: &_DataSegmentType{},
+ Symbol: symbol,
+ Pad: pad,
}
_child._DataSegmentType._DataSegmentTypeChildRequirements = _child
return _child, nil
}
func (m *_AnsiExtendedSymbolSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
index 47f3fb9b7c..b6b5c1e84c 100644
--- a/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
+++ b/plc4go/protocols/eip/readwrite/model/CIPDataConnected.go
@@ -48,9 +48,6 @@ type CIPDataConnectedExactly interface {
type _CIPDataConnected struct {
Value uint32
TagStatus uint16
-
- // Arguments.
- PacketLength uint16
}
///////////////////////////////////////////////////////////
@@ -72,8 +69,8 @@ func (m *_CIPDataConnected) GetTagStatus() uint16 {
///////////////////////////////////////////////////////////
// NewCIPDataConnected factory function for _CIPDataConnected
-func NewCIPDataConnected(value uint32, tagStatus uint16, packetLength uint16) *_CIPDataConnected {
- return &_CIPDataConnected{Value: value, TagStatus: tagStatus, PacketLength: packetLength}
+func NewCIPDataConnected(value uint32, tagStatus uint16) *_CIPDataConnected {
+ return &_CIPDataConnected{Value: value, TagStatus: tagStatus}
}
// Deprecated: use the interface for direct cast
@@ -107,11 +104,11 @@ func (m *_CIPDataConnected) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CIPDataConnectedParse(theBytes []byte, packetLength uint16) (CIPDataConnected, error) {
- return CIPDataConnectedParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), packetLength)
+func CIPDataConnectedParse(theBytes []byte) (CIPDataConnected, error) {
+ return CIPDataConnectedParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func CIPDataConnectedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, packetLength uint16) (CIPDataConnected, error) {
+func CIPDataConnectedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (CIPDataConnected, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CIPDataConnected"); pullErr != nil {
@@ -140,9 +137,8 @@ func CIPDataConnectedParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
// Create the instance
return &_CIPDataConnected{
- PacketLength: packetLength,
- Value: value,
- TagStatus: tagStatus,
+ Value: value,
+ TagStatus: tagStatus,
}, nil
}
@@ -181,16 +177,6 @@ func (m *_CIPDataConnected) SerializeWithWriteBuffer(ctx context.Context, writeB
return nil
}
-////
-// Arguments Getter
-
-func (m *_CIPDataConnected) GetPacketLength() uint16 {
- return m.PacketLength
-}
-
-//
-////
-
func (m *_CIPDataConnected) isCIPDataConnected() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
index 400dc1e6b2..ff8515a359 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -96,10 +95,10 @@ func (m *_CipConnectedRequest) GetPathSegments() []byte {
///////////////////////////////////////////////////////////
// NewCipConnectedRequest factory function for _CipConnectedRequest
-func NewCipConnectedRequest(pathSegments []byte, serviceLen uint16, order IntegerEncoding) *_CipConnectedRequest {
+func NewCipConnectedRequest(pathSegments []byte, serviceLen uint16) *_CipConnectedRequest {
_result := &_CipConnectedRequest{
PathSegments: pathSegments,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -144,11 +143,11 @@ func (m *_CipConnectedRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectedRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectedRequest, error) {
- return CipConnectedRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectedRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectedRequest, error) {
+ return CipConnectedRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectedRequest, error) {
+func CipConnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectedRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectedRequest"); pullErr != nil {
@@ -212,7 +211,6 @@ func CipConnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.Re
_child := &_CipConnectedRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
PathSegments: pathSegments,
reservedField0: reservedField0,
@@ -223,7 +221,7 @@ func CipConnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.Re
}
func (m *_CipConnectedRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
index b45025a59f..b55897fbd0 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectedResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
"io"
@@ -110,12 +109,12 @@ func (m *_CipConnectedResponse) GetData() CIPDataConnected {
///////////////////////////////////////////////////////////
// NewCipConnectedResponse factory function for _CipConnectedResponse
-func NewCipConnectedResponse(status uint8, additionalStatusWords uint8, data CIPDataConnected, serviceLen uint16, order IntegerEncoding) *_CipConnectedResponse {
+func NewCipConnectedResponse(status uint8, additionalStatusWords uint8, data CIPDataConnected, serviceLen uint16) *_CipConnectedResponse {
_result := &_CipConnectedResponse{
Status: status,
AdditionalStatusWords: additionalStatusWords,
Data: data,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -160,11 +159,11 @@ func (m *_CipConnectedResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectedResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectedResponse, error) {
- return CipConnectedResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectedResponseParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectedResponse, error) {
+ return CipConnectedResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectedResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectedResponse, error) {
+func CipConnectedResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectedResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectedResponse"); pullErr != nil {
@@ -211,7 +210,7 @@ func CipConnectedResponseParseWithBuffer(ctx context.Context, readBuffer utils.R
if pullErr := readBuffer.PullContext("data"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for data")
}
- _val, _err := CIPDataConnectedParseWithBuffer(ctx, readBuffer, serviceLen)
+ _val, _err := CIPDataConnectedParseWithBuffer(ctx, readBuffer)
switch {
case errors.Is(_err, utils.ParseAssertError{}) || errors.Is(_err, io.EOF):
Plc4xModelLog.Debug().Err(_err).Msg("Resetting position because optional threw an error")
@@ -234,7 +233,6 @@ func CipConnectedResponseParseWithBuffer(ctx context.Context, readBuffer utils.R
_child := &_CipConnectedResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
AdditionalStatusWords: additionalStatusWords,
@@ -246,7 +244,7 @@ func CipConnectedResponseParseWithBuffer(ctx context.Context, readBuffer utils.R
}
func (m *_CipConnectedResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
index d788d5c521..83cc264609 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -35,7 +34,7 @@ type CipConnectionManagerCloseRequest interface {
utils.Serializable
CipService
// GetRequestPathSize returns RequestPathSize (property field)
- GetRequestPathSize() int8
+ GetRequestPathSize() uint8
// GetClassSegment returns ClassSegment (property field)
GetClassSegment() PathSegment
// GetInstanceSegment returns InstanceSegment (property field)
@@ -68,7 +67,7 @@ type CipConnectionManagerCloseRequestExactly interface {
// _CipConnectionManagerCloseRequest is the data-structure of this message
type _CipConnectionManagerCloseRequest struct {
*_CipService
- RequestPathSize int8
+ RequestPathSize uint8
ClassSegment PathSegment
InstanceSegment PathSegment
Priority uint8
@@ -116,7 +115,7 @@ func (m *_CipConnectionManagerCloseRequest) GetParent() CipService {
/////////////////////// Accessors for property fields.
///////////////////////
-func (m *_CipConnectionManagerCloseRequest) GetRequestPathSize() int8 {
+func (m *_CipConnectionManagerCloseRequest) GetRequestPathSize() uint8 {
return m.RequestPathSize
}
@@ -166,7 +165,7 @@ func (m *_CipConnectionManagerCloseRequest) GetConnectionPaths() []PathSegment {
///////////////////////////////////////////////////////////
// NewCipConnectionManagerCloseRequest factory function for _CipConnectionManagerCloseRequest
-func NewCipConnectionManagerCloseRequest(requestPathSize int8, classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, connectionPathSize uint8, connectionPaths []PathSegment, serviceLen uint16, order IntegerEncoding) *_CipConnectionManagerCloseRequest {
+func NewCipConnectionManagerCloseRequest(requestPathSize uint8, classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, connectionPathSize uint8, connectionPaths []PathSegment, serviceLen uint16) *_CipConnectionManagerCloseRequest {
_result := &_CipConnectionManagerCloseRequest{
RequestPathSize: requestPathSize,
ClassSegment: classSegment,
@@ -179,7 +178,7 @@ func NewCipConnectionManagerCloseRequest(requestPathSize int8, classSegment Path
OriginatorSerialNumber: originatorSerialNumber,
ConnectionPathSize: connectionPathSize,
ConnectionPaths: connectionPaths,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -250,11 +249,11 @@ func (m *_CipConnectionManagerCloseRequest) GetLengthInBytes(ctx context.Context
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectionManagerCloseRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerCloseRequest, error) {
- return CipConnectionManagerCloseRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectionManagerCloseRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectionManagerCloseRequest, error) {
+ return CipConnectionManagerCloseRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerCloseRequest, error) {
+func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectionManagerCloseRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectionManagerCloseRequest"); pullErr != nil {
@@ -264,7 +263,7 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
_ = currentPos
// Simple Field (requestPathSize)
- _requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ _requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of CipConnectionManagerCloseRequest")
}
@@ -274,7 +273,7 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
if pullErr := readBuffer.PullContext("classSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for classSegment")
}
- _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _classSegmentErr != nil {
return nil, errors.Wrap(_classSegmentErr, "Error parsing 'classSegment' field of CipConnectionManagerCloseRequest")
}
@@ -287,7 +286,7 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
if pullErr := readBuffer.PullContext("instanceSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for instanceSegment")
}
- _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _instanceSegmentErr != nil {
return nil, errors.Wrap(_instanceSegmentErr, "Error parsing 'instanceSegment' field of CipConnectionManagerCloseRequest")
}
@@ -369,8 +368,8 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
// Terminated array
var connectionPaths []PathSegment
{
- for !bool(NoMorePathSegments(readBuffer, order)) {
- _item, _err := PathSegmentParseWithBuffer(ctx, readBuffer, order)
+ for !bool(NoMorePathSegments(readBuffer)) {
+ _item, _err := PathSegmentParseWithBuffer(ctx, readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'connectionPaths' field of CipConnectionManagerCloseRequest")
}
@@ -389,7 +388,6 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
_child := &_CipConnectionManagerCloseRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
RequestPathSize: requestPathSize,
ClassSegment: classSegment,
@@ -409,7 +407,7 @@ func CipConnectionManagerCloseRequestParseWithBuffer(ctx context.Context, readBu
}
func (m *_CipConnectionManagerCloseRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -425,8 +423,8 @@ func (m *_CipConnectionManagerCloseRequest) SerializeWithWriteBuffer(ctx context
}
// Simple Field (requestPathSize)
- requestPathSize := int8(m.GetRequestPathSize())
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(m.GetRequestPathSize())
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
index 73038c95f8..371ad4e1d9 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerCloseResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -131,7 +130,7 @@ func (m *_CipConnectionManagerCloseResponse) GetApplicationReplySize() uint8 {
///////////////////////////////////////////////////////////
// NewCipConnectionManagerCloseResponse factory function for _CipConnectionManagerCloseResponse
-func NewCipConnectionManagerCloseResponse(status uint8, additionalStatusWords uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, applicationReplySize uint8, serviceLen uint16, order IntegerEncoding) *_CipConnectionManagerCloseResponse {
+func NewCipConnectionManagerCloseResponse(status uint8, additionalStatusWords uint8, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, applicationReplySize uint8, serviceLen uint16) *_CipConnectionManagerCloseResponse {
_result := &_CipConnectionManagerCloseResponse{
Status: status,
AdditionalStatusWords: additionalStatusWords,
@@ -139,7 +138,7 @@ func NewCipConnectionManagerCloseResponse(status uint8, additionalStatusWords ui
OriginatorVendorId: originatorVendorId,
OriginatorSerialNumber: originatorSerialNumber,
ApplicationReplySize: applicationReplySize,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -194,11 +193,11 @@ func (m *_CipConnectionManagerCloseResponse) GetLengthInBytes(ctx context.Contex
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectionManagerCloseResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerCloseResponse, error) {
- return CipConnectionManagerCloseResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectionManagerCloseResponseParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectionManagerCloseResponse, error) {
+ return CipConnectionManagerCloseResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectionManagerCloseResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerCloseResponse, error) {
+func CipConnectionManagerCloseResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectionManagerCloseResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectionManagerCloseResponse"); pullErr != nil {
@@ -291,7 +290,6 @@ func CipConnectionManagerCloseResponseParseWithBuffer(ctx context.Context, readB
_child := &_CipConnectionManagerCloseResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
AdditionalStatusWords: additionalStatusWords,
@@ -307,7 +305,7 @@ func CipConnectionManagerCloseResponseParseWithBuffer(ctx context.Context, readB
}
func (m *_CipConnectionManagerCloseResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
index 187d04dea8..45e565cfe7 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -215,7 +214,7 @@ func (m *_CipConnectionManagerRequest) GetConnectionPaths() []PathSegment {
///////////////////////////////////////////////////////////
// NewCipConnectionManagerRequest factory function for _CipConnectionManagerRequest
-func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, timeoutMultiplier uint8, otRpi uint32, otConnectionParameters NetworkConnectionParameters, toRpi uint32, toConnectionParameters NetworkConnectionParameters, transportType TransportType, connectionPathSize uint8, co [...]
+func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment PathSegment, priority uint8, tickTime uint8, timeoutTicks uint8, otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, timeoutMultiplier uint8, otRpi uint32, otConnectionParameters NetworkConnectionParameters, toRpi uint32, toConnectionParameters NetworkConnectionParameters, transportType TransportType, connectionPathSize uint8, co [...]
_result := &_CipConnectionManagerRequest{
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
@@ -235,7 +234,7 @@ func NewCipConnectionManagerRequest(classSegment PathSegment, instanceSegment Pa
TransportType: transportType,
ConnectionPathSize: connectionPathSize,
ConnectionPaths: connectionPaths,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -330,11 +329,11 @@ func (m *_CipConnectionManagerRequest) GetLengthInBytes(ctx context.Context) uin
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectionManagerRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerRequest, error) {
- return CipConnectionManagerRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectionManagerRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectionManagerRequest, error) {
+ return CipConnectionManagerRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerRequest, error) {
+func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectionManagerRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectionManagerRequest"); pullErr != nil {
@@ -344,7 +343,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
_ = currentPos
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's implicitly given by the objects content)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
_ = requestPathSize
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of CipConnectionManagerRequest")
@@ -354,7 +353,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
if pullErr := readBuffer.PullContext("classSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for classSegment")
}
- _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _classSegmentErr != nil {
return nil, errors.Wrap(_classSegmentErr, "Error parsing 'classSegment' field of CipConnectionManagerRequest")
}
@@ -367,7 +366,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
if pullErr := readBuffer.PullContext("instanceSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for instanceSegment")
}
- _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _instanceSegmentErr != nil {
return nil, errors.Wrap(_instanceSegmentErr, "Error parsing 'instanceSegment' field of CipConnectionManagerRequest")
}
@@ -467,7 +466,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
if pullErr := readBuffer.PullContext("otConnectionParameters"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for otConnectionParameters")
}
- _otConnectionParameters, _otConnectionParametersErr := NetworkConnectionParametersParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _otConnectionParameters, _otConnectionParametersErr := NetworkConnectionParametersParseWithBuffer(ctx, readBuffer)
if _otConnectionParametersErr != nil {
return nil, errors.Wrap(_otConnectionParametersErr, "Error parsing 'otConnectionParameters' field of CipConnectionManagerRequest")
}
@@ -487,7 +486,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
if pullErr := readBuffer.PullContext("toConnectionParameters"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for toConnectionParameters")
}
- _toConnectionParameters, _toConnectionParametersErr := NetworkConnectionParametersParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _toConnectionParameters, _toConnectionParametersErr := NetworkConnectionParametersParseWithBuffer(ctx, readBuffer)
if _toConnectionParametersErr != nil {
return nil, errors.Wrap(_toConnectionParametersErr, "Error parsing 'toConnectionParameters' field of CipConnectionManagerRequest")
}
@@ -500,7 +499,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
if pullErr := readBuffer.PullContext("transportType"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for transportType")
}
- _transportType, _transportTypeErr := TransportTypeParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _transportType, _transportTypeErr := TransportTypeParseWithBuffer(ctx, readBuffer)
if _transportTypeErr != nil {
return nil, errors.Wrap(_transportTypeErr, "Error parsing 'transportType' field of CipConnectionManagerRequest")
}
@@ -523,8 +522,8 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
// Terminated array
var connectionPaths []PathSegment
{
- for !bool(NoMorePathSegments(readBuffer, order)) {
- _item, _err := PathSegmentParseWithBuffer(ctx, readBuffer, order)
+ for !bool(NoMorePathSegments(readBuffer)) {
+ _item, _err := PathSegmentParseWithBuffer(ctx, readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'connectionPaths' field of CipConnectionManagerRequest")
}
@@ -543,7 +542,6 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
_child := &_CipConnectionManagerRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
@@ -570,7 +568,7 @@ func CipConnectionManagerRequestParseWithBuffer(ctx context.Context, readBuffer
}
func (m *_CipConnectionManagerRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -586,8 +584,8 @@ func (m *_CipConnectionManagerRequest) SerializeWithWriteBuffer(ctx context.Cont
}
// Implicit Field (requestPathSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- requestPathSize := int8(int8((int8(m.GetClassSegment().GetLengthInBytes(ctx)) + int8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / int8(int8(2)))
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(uint8((uint8(m.GetClassSegment().GetLengthInBytes(ctx)) + uint8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / uint8(uint8(2)))
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
index 5c27f0df58..9870067d42 100644
--- a/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipConnectionManagerResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -138,7 +137,7 @@ func (m *_CipConnectionManagerResponse) GetToApi() uint32 {
///////////////////////////////////////////////////////////
// NewCipConnectionManagerResponse factory function for _CipConnectionManagerResponse
-func NewCipConnectionManagerResponse(otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, otApi uint32, toApi uint32, serviceLen uint16, order IntegerEncoding) *_CipConnectionManagerResponse {
+func NewCipConnectionManagerResponse(otConnectionId uint32, toConnectionId uint32, connectionSerialNumber uint16, originatorVendorId uint16, originatorSerialNumber uint32, otApi uint32, toApi uint32, serviceLen uint16) *_CipConnectionManagerResponse {
_result := &_CipConnectionManagerResponse{
OtConnectionId: otConnectionId,
ToConnectionId: toConnectionId,
@@ -147,7 +146,7 @@ func NewCipConnectionManagerResponse(otConnectionId uint32, toConnectionId uint3
OriginatorSerialNumber: originatorSerialNumber,
OtApi: otApi,
ToApi: toApi,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -208,11 +207,11 @@ func (m *_CipConnectionManagerResponse) GetLengthInBytes(ctx context.Context) ui
return m.GetLengthInBits(ctx) / 8
}
-func CipConnectionManagerResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerResponse, error) {
- return CipConnectionManagerResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipConnectionManagerResponseParse(theBytes []byte, connected bool, serviceLen uint16) (CipConnectionManagerResponse, error) {
+ return CipConnectionManagerResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipConnectionManagerResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipConnectionManagerResponse, error) {
+func CipConnectionManagerResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipConnectionManagerResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipConnectionManagerResponse"); pullErr != nil {
@@ -319,7 +318,6 @@ func CipConnectionManagerResponseParseWithBuffer(ctx context.Context, readBuffer
_child := &_CipConnectionManagerResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
OtConnectionId: otConnectionId,
ToConnectionId: toConnectionId,
@@ -336,7 +334,7 @@ func CipConnectionManagerResponseParseWithBuffer(ctx context.Context, readBuffer
}
func (m *_CipConnectionManagerResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -417,7 +415,7 @@ func (m *_CipConnectionManagerResponse) SerializeWithWriteBuffer(ctx context.Con
}
// Implicit Field (replySize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- replySize := uint8(uint8(m.ServiceLen) - uint8(uint8(30)))
+ replySize := uint8(uint8(uint8(m.GetLengthInBytes(ctx))) - uint8(uint8(30)))
_replySizeErr := writeBuffer.WriteUint8("replySize", 8, (replySize))
if _replySizeErr != nil {
return errors.Wrap(_replySizeErr, "Error serializing 'replySize' field")
diff --git a/plc4go/protocols/eip/readwrite/model/CipRRData.go b/plc4go/protocols/eip/readwrite/model/CipRRData.go
index d9f03a6400..28bcce2870 100644
--- a/plc4go/protocols/eip/readwrite/model/CipRRData.go
+++ b/plc4go/protocols/eip/readwrite/model/CipRRData.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -120,13 +119,13 @@ func (m *_CipRRData) GetTypeId() []TypeId {
///////////////////////////////////////////////////////////
// NewCipRRData factory function for _CipRRData
-func NewCipRRData(interfaceHandle uint32, timeout uint16, itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_CipRRData {
+func NewCipRRData(interfaceHandle uint32, timeout uint16, itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_CipRRData {
_result := &_CipRRData{
InterfaceHandle: interfaceHandle,
Timeout: timeout,
ItemCount: itemCount,
TypeId: typeId,
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -176,11 +175,11 @@ func (m *_CipRRData) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipRRDataParse(theBytes []byte, order IntegerEncoding, response bool) (CipRRData, error) {
- return CipRRDataParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func CipRRDataParse(theBytes []byte, response bool) (CipRRData, error) {
+ return CipRRDataParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func CipRRDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (CipRRData, error) {
+func CipRRDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (CipRRData, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipRRData"); pullErr != nil {
@@ -226,7 +225,7 @@ func CipRRDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
arrayCtx := spiContext.CreateArrayContext(ctx, int(_numItems), int(_curItem))
_ = arrayCtx
_ = _curItem
- _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer, order)
+ _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'typeId' field of CipRRData")
}
@@ -243,9 +242,7 @@ func CipRRDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
// Create a partially initialized instance
_child := &_CipRRData{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
InterfaceHandle: interfaceHandle,
Timeout: timeout,
ItemCount: itemCount,
@@ -256,7 +253,7 @@ func CipRRDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
}
func (m *_CipRRData) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
index 756805dcac..01ddf4de0d 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -100,11 +99,11 @@ func (m *_CipReadRequest) GetElementNb() uint16 {
///////////////////////////////////////////////////////////
// NewCipReadRequest factory function for _CipReadRequest
-func NewCipReadRequest(tag []byte, elementNb uint16, serviceLen uint16, order IntegerEncoding) *_CipReadRequest {
+func NewCipReadRequest(tag []byte, elementNb uint16, serviceLen uint16) *_CipReadRequest {
_result := &_CipReadRequest{
Tag: tag,
ElementNb: elementNb,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -146,11 +145,11 @@ func (m *_CipReadRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipReadRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipReadRequest, error) {
- return CipReadRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipReadRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipReadRequest, error) {
+ return CipReadRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipReadRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipReadRequest, error) {
+func CipReadRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipReadRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipReadRequest"); pullErr != nil {
@@ -160,7 +159,7 @@ func CipReadRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuf
_ = currentPos
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's implicitly given by the objects content)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
_ = requestPathSize
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of CipReadRequest")
@@ -187,7 +186,6 @@ func CipReadRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuf
_child := &_CipReadRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Tag: tag,
ElementNb: elementNb,
@@ -197,7 +195,7 @@ func CipReadRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuf
}
func (m *_CipReadRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -213,8 +211,8 @@ func (m *_CipReadRequest) SerializeWithWriteBuffer(ctx context.Context, writeBuf
}
// Implicit Field (requestPathSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- requestPathSize := int8(int8(int8(len(m.GetTag()))) / int8(int8(2)))
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(uint8(uint8(len(m.GetTag()))) / uint8(uint8(2)))
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
index 5b5417a103..5340310480 100644
--- a/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipReadResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
"io"
@@ -110,12 +109,12 @@ func (m *_CipReadResponse) GetData() CIPData {
///////////////////////////////////////////////////////////
// NewCipReadResponse factory function for _CipReadResponse
-func NewCipReadResponse(status uint8, extStatus uint8, data CIPData, serviceLen uint16, order IntegerEncoding) *_CipReadResponse {
+func NewCipReadResponse(status uint8, extStatus uint8, data CIPData, serviceLen uint16) *_CipReadResponse {
_result := &_CipReadResponse{
Status: status,
ExtStatus: extStatus,
Data: data,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -160,11 +159,11 @@ func (m *_CipReadResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipReadResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipReadResponse, error) {
- return CipReadResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipReadResponseParse(theBytes []byte, connected bool, serviceLen uint16) (CipReadResponse, error) {
+ return CipReadResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipReadResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipReadResponse, error) {
+func CipReadResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipReadResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipReadResponse"); pullErr != nil {
@@ -234,7 +233,6 @@ func CipReadResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
_child := &_CipReadResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
ExtStatus: extStatus,
@@ -246,7 +244,7 @@ func CipReadResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
}
func (m *_CipReadResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipService.go b/plc4go/protocols/eip/readwrite/model/CipService.go
index 8e205be0b4..4b84cfe8bf 100644
--- a/plc4go/protocols/eip/readwrite/model/CipService.go
+++ b/plc4go/protocols/eip/readwrite/model/CipService.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -53,7 +52,6 @@ type _CipService struct {
// Arguments.
ServiceLen uint16
- Order IntegerEncoding
}
type _CipServiceChildRequirements interface {
@@ -79,8 +77,8 @@ type CipServiceChild interface {
}
// NewCipService factory function for _CipService
-func NewCipService(serviceLen uint16, order IntegerEncoding) *_CipService {
- return &_CipService{ServiceLen: serviceLen, Order: order}
+func NewCipService(serviceLen uint16) *_CipService {
+ return &_CipService{ServiceLen: serviceLen}
}
// Deprecated: use the interface for direct cast
@@ -112,11 +110,11 @@ func (m *_CipService) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipServiceParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipService, error) {
- return CipServiceParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipServiceParse(theBytes []byte, connected bool, serviceLen uint16) (CipService, error) {
+ return CipServiceParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipServiceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipService, error) {
+func CipServiceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipService, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipService"); pullErr != nil {
@@ -148,35 +146,35 @@ func CipServiceParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
var typeSwitchError error
switch {
case service == 0x01 && response == bool(false): // GetAttributeAllRequest
- _childTemp, typeSwitchError = GetAttributeAllRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = GetAttributeAllRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x01 && response == bool(true): // GetAttributeAllResponse
- _childTemp, typeSwitchError = GetAttributeAllResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = GetAttributeAllResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4C && response == bool(false): // CipReadRequest
- _childTemp, typeSwitchError = CipReadRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipReadRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4C && response == bool(true): // CipReadResponse
- _childTemp, typeSwitchError = CipReadResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipReadResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4D && response == bool(false): // CipWriteRequest
- _childTemp, typeSwitchError = CipWriteRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipWriteRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4D && response == bool(true): // CipWriteResponse
- _childTemp, typeSwitchError = CipWriteResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipWriteResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4E && response == bool(false): // CipConnectionManagerCloseRequest
- _childTemp, typeSwitchError = CipConnectionManagerCloseRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectionManagerCloseRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x4E && response == bool(true): // CipConnectionManagerCloseResponse
- _childTemp, typeSwitchError = CipConnectionManagerCloseResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectionManagerCloseResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x0A && response == bool(false): // MultipleServiceRequest
- _childTemp, typeSwitchError = MultipleServiceRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = MultipleServiceRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x0A && response == bool(true): // MultipleServiceResponse
- _childTemp, typeSwitchError = MultipleServiceResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = MultipleServiceResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x52 && response == bool(false) && connected == bool(false): // CipUnconnectedRequest
- _childTemp, typeSwitchError = CipUnconnectedRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipUnconnectedRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x52 && response == bool(false) && connected == bool(true): // CipConnectedRequest
- _childTemp, typeSwitchError = CipConnectedRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectedRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x52 && response == bool(true): // CipConnectedResponse
- _childTemp, typeSwitchError = CipConnectedResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectedResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x5B && response == bool(false): // CipConnectionManagerRequest
- _childTemp, typeSwitchError = CipConnectionManagerRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectionManagerRequestParseWithBuffer(ctx, readBuffer, connected, serviceLen)
case service == 0x5B && response == bool(true): // CipConnectionManagerResponse
- _childTemp, typeSwitchError = CipConnectionManagerResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen, order)
+ _childTemp, typeSwitchError = CipConnectionManagerResponseParseWithBuffer(ctx, readBuffer, connected, serviceLen)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [service=%v, response=%v, connected=%v]", service, response, connected)
}
@@ -237,9 +235,6 @@ func (pm *_CipService) SerializeParent(ctx context.Context, writeBuffer utils.Wr
func (m *_CipService) GetServiceLen() uint16 {
return m.ServiceLen
}
-func (m *_CipService) GetOrder() IntegerEncoding {
- return m.Order
-}
//
////
diff --git a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
index 9f3f83bdb6..860d0e5289 100644
--- a/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipUnconnectedRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"fmt"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -140,14 +139,14 @@ func (m *_CipUnconnectedRequest) GetRoute() uint16 {
///////////////////////////////////////////////////////////
// NewCipUnconnectedRequest factory function for _CipUnconnectedRequest
-func NewCipUnconnectedRequest(classSegment PathSegment, instanceSegment PathSegment, unconnectedService CipService, backPlane int8, slot int8, serviceLen uint16, order IntegerEncoding) *_CipUnconnectedRequest {
+func NewCipUnconnectedRequest(classSegment PathSegment, instanceSegment PathSegment, unconnectedService CipService, backPlane int8, slot int8, serviceLen uint16) *_CipUnconnectedRequest {
_result := &_CipUnconnectedRequest{
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
UnconnectedService: unconnectedService,
BackPlane: backPlane,
Slot: slot,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -205,11 +204,11 @@ func (m *_CipUnconnectedRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipUnconnectedRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipUnconnectedRequest, error) {
- return CipUnconnectedRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipUnconnectedRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipUnconnectedRequest, error) {
+ return CipUnconnectedRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipUnconnectedRequest, error) {
+func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipUnconnectedRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipUnconnectedRequest"); pullErr != nil {
@@ -219,7 +218,7 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
_ = currentPos
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's implicitly given by the objects content)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
_ = requestPathSize
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of CipUnconnectedRequest")
@@ -229,7 +228,7 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
if pullErr := readBuffer.PullContext("classSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for classSegment")
}
- _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _classSegmentErr != nil {
return nil, errors.Wrap(_classSegmentErr, "Error parsing 'classSegment' field of CipUnconnectedRequest")
}
@@ -242,7 +241,7 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
if pullErr := readBuffer.PullContext("instanceSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for instanceSegment")
}
- _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _instanceSegmentErr != nil {
return nil, errors.Wrap(_instanceSegmentErr, "Error parsing 'instanceSegment' field of CipUnconnectedRequest")
}
@@ -279,7 +278,7 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
if pullErr := readBuffer.PullContext("unconnectedService"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for unconnectedService")
}
- _unconnectedService, _unconnectedServiceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(false)), uint16(messageSize), IntegerEncoding(order))
+ _unconnectedService, _unconnectedServiceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(false)), uint16(messageSize))
if _unconnectedServiceErr != nil {
return nil, errors.Wrap(_unconnectedServiceErr, "Error parsing 'unconnectedService' field of CipUnconnectedRequest")
}
@@ -319,7 +318,6 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
_child := &_CipUnconnectedRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
@@ -333,7 +331,7 @@ func CipUnconnectedRequestParseWithBuffer(ctx context.Context, readBuffer utils.
}
func (m *_CipUnconnectedRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -349,8 +347,8 @@ func (m *_CipUnconnectedRequest) SerializeWithWriteBuffer(ctx context.Context, w
}
// Implicit Field (requestPathSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- requestPathSize := int8(int8((int8(m.GetClassSegment().GetLengthInBytes(ctx)) + int8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / int8(int8(2)))
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(uint8((uint8(m.GetClassSegment().GetLengthInBytes(ctx)) + uint8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / uint8(uint8(2)))
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
index 0905d46c76..dd02fc8f7e 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -114,13 +113,13 @@ func (m *_CipWriteRequest) GetData() []byte {
///////////////////////////////////////////////////////////
// NewCipWriteRequest factory function for _CipWriteRequest
-func NewCipWriteRequest(tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte, serviceLen uint16, order IntegerEncoding) *_CipWriteRequest {
+func NewCipWriteRequest(tag []byte, dataType CIPDataTypeCode, elementNb uint16, data []byte, serviceLen uint16) *_CipWriteRequest {
_result := &_CipWriteRequest{
Tag: tag,
DataType: dataType,
ElementNb: elementNb,
Data: data,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -170,11 +169,11 @@ func (m *_CipWriteRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipWriteRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipWriteRequest, error) {
- return CipWriteRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipWriteRequestParse(theBytes []byte, connected bool, serviceLen uint16) (CipWriteRequest, error) {
+ return CipWriteRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipWriteRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipWriteRequest, error) {
+func CipWriteRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipWriteRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipWriteRequest"); pullErr != nil {
@@ -184,7 +183,7 @@ func CipWriteRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
_ = currentPos
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's implicitly given by the objects content)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
_ = requestPathSize
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of CipWriteRequest")
@@ -230,7 +229,6 @@ func CipWriteRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
_child := &_CipWriteRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Tag: tag,
DataType: dataType,
@@ -242,7 +240,7 @@ func CipWriteRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
}
func (m *_CipWriteRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -258,8 +256,8 @@ func (m *_CipWriteRequest) SerializeWithWriteBuffer(ctx context.Context, writeBu
}
// Implicit Field (requestPathSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- requestPathSize := int8(int8(int8(len(m.GetTag()))) / int8(int8(2)))
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(uint8(uint8(len(m.GetTag()))) / uint8(uint8(2)))
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
index 0a13056046..883a025da5 100644
--- a/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/CipWriteResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -102,11 +101,11 @@ func (m *_CipWriteResponse) GetExtStatus() uint8 {
///////////////////////////////////////////////////////////
// NewCipWriteResponse factory function for _CipWriteResponse
-func NewCipWriteResponse(status uint8, extStatus uint8, serviceLen uint16, order IntegerEncoding) *_CipWriteResponse {
+func NewCipWriteResponse(status uint8, extStatus uint8, serviceLen uint16) *_CipWriteResponse {
_result := &_CipWriteResponse{
Status: status,
ExtStatus: extStatus,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -146,11 +145,11 @@ func (m *_CipWriteResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func CipWriteResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (CipWriteResponse, error) {
- return CipWriteResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func CipWriteResponseParse(theBytes []byte, connected bool, serviceLen uint16) (CipWriteResponse, error) {
+ return CipWriteResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func CipWriteResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (CipWriteResponse, error) {
+func CipWriteResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (CipWriteResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("CipWriteResponse"); pullErr != nil {
@@ -198,7 +197,6 @@ func CipWriteResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
_child := &_CipWriteResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
ExtStatus: extStatus,
@@ -209,7 +207,7 @@ func CipWriteResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
}
func (m *_CipWriteResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/ClassID.go b/plc4go/protocols/eip/readwrite/model/ClassID.go
index 128140c388..378ec5a3e3 100644
--- a/plc4go/protocols/eip/readwrite/model/ClassID.go
+++ b/plc4go/protocols/eip/readwrite/model/ClassID.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -92,11 +91,11 @@ func (m *_ClassID) GetSegmentClass() uint8 {
///////////////////////////////////////////////////////////
// NewClassID factory function for _ClassID
-func NewClassID(format uint8, segmentClass uint8, order IntegerEncoding) *_ClassID {
+func NewClassID(format uint8, segmentClass uint8) *_ClassID {
_result := &_ClassID{
Format: format,
SegmentClass: segmentClass,
- _LogicalSegmentType: NewLogicalSegmentType(order),
+ _LogicalSegmentType: NewLogicalSegmentType(),
}
_result._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _result
return _result
@@ -133,11 +132,11 @@ func (m *_ClassID) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ClassIDParse(theBytes []byte, order IntegerEncoding) (ClassID, error) {
- return ClassIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func ClassIDParse(theBytes []byte) (ClassID, error) {
+ return ClassIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func ClassIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (ClassID, error) {
+func ClassIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ClassID, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ClassID"); pullErr != nil {
@@ -166,18 +165,16 @@ func ClassIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, or
// Create a partially initialized instance
_child := &_ClassID{
- _LogicalSegmentType: &_LogicalSegmentType{
- Order: order,
- },
- Format: format,
- SegmentClass: segmentClass,
+ _LogicalSegmentType: &_LogicalSegmentType{},
+ Format: format,
+ SegmentClass: segmentClass,
}
_child._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _child
return _child, nil
}
func (m *_ClassID) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/ClassSegment.go b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
index f824fffead..59063fef5d 100644
--- a/plc4go/protocols/eip/readwrite/model/ClassSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/ClassSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -55,9 +54,6 @@ type _ClassSegment struct {
LogicalSegmentType uint8
LogicalSegmentFormat uint8
ClassSegment uint8
-
- // Arguments.
- Order IntegerEncoding
}
///////////////////////////////////////////////////////////
@@ -87,8 +83,8 @@ func (m *_ClassSegment) GetClassSegment() uint8 {
///////////////////////////////////////////////////////////
// NewClassSegment factory function for _ClassSegment
-func NewClassSegment(pathSegmentType uint8, logicalSegmentType uint8, logicalSegmentFormat uint8, classSegment uint8, order IntegerEncoding) *_ClassSegment {
- return &_ClassSegment{PathSegmentType: pathSegmentType, LogicalSegmentType: logicalSegmentType, LogicalSegmentFormat: logicalSegmentFormat, ClassSegment: classSegment, Order: order}
+func NewClassSegment(pathSegmentType uint8, logicalSegmentType uint8, logicalSegmentFormat uint8, classSegment uint8) *_ClassSegment {
+ return &_ClassSegment{PathSegmentType: pathSegmentType, LogicalSegmentType: logicalSegmentType, LogicalSegmentFormat: logicalSegmentFormat, ClassSegment: classSegment}
}
// Deprecated: use the interface for direct cast
@@ -128,11 +124,11 @@ func (m *_ClassSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ClassSegmentParse(theBytes []byte, order IntegerEncoding) (ClassSegment, error) {
- return ClassSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func ClassSegmentParse(theBytes []byte) (ClassSegment, error) {
+ return ClassSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func ClassSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (ClassSegment, error) {
+func ClassSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ClassSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ClassSegment"); pullErr != nil {
@@ -175,7 +171,6 @@ func ClassSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
// Create the instance
return &_ClassSegment{
- Order: order,
PathSegmentType: pathSegmentType,
LogicalSegmentType: logicalSegmentType,
LogicalSegmentFormat: logicalSegmentFormat,
@@ -184,7 +179,7 @@ func ClassSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
}
func (m *_ClassSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -232,16 +227,6 @@ func (m *_ClassSegment) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
return nil
}
-////
-// Arguments Getter
-
-func (m *_ClassSegment) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_ClassSegment) isClassSegment() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go b/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
index ec9954a16b..ef73eee174 100644
--- a/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
+++ b/plc4go/protocols/eip/readwrite/model/ConnectedAddressItem.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -87,10 +86,10 @@ func (m *_ConnectedAddressItem) GetConnectionId() uint32 {
///////////////////////////////////////////////////////////
// NewConnectedAddressItem factory function for _ConnectedAddressItem
-func NewConnectedAddressItem(connectionId uint32, order IntegerEncoding) *_ConnectedAddressItem {
+func NewConnectedAddressItem(connectionId uint32) *_ConnectedAddressItem {
_result := &_ConnectedAddressItem{
ConnectionId: connectionId,
- _TypeId: NewTypeId(order),
+ _TypeId: NewTypeId(),
}
_result._TypeId._TypeIdChildRequirements = _result
return _result
@@ -127,11 +126,11 @@ func (m *_ConnectedAddressItem) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ConnectedAddressItemParse(theBytes []byte, order IntegerEncoding) (ConnectedAddressItem, error) {
- return ConnectedAddressItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func ConnectedAddressItemParse(theBytes []byte) (ConnectedAddressItem, error) {
+ return ConnectedAddressItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func ConnectedAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (ConnectedAddressItem, error) {
+func ConnectedAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ConnectedAddressItem, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ConnectedAddressItem"); pullErr != nil {
@@ -170,9 +169,7 @@ func ConnectedAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.R
// Create a partially initialized instance
_child := &_ConnectedAddressItem{
- _TypeId: &_TypeId{
- Order: order,
- },
+ _TypeId: &_TypeId{},
ConnectionId: connectionId,
reservedField0: reservedField0,
}
@@ -181,7 +178,7 @@ func ConnectedAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.R
}
func (m *_ConnectedAddressItem) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go b/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
index 972a09b64b..8b77bd9d20 100644
--- a/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/ConnectedDataItem.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -92,11 +91,11 @@ func (m *_ConnectedDataItem) GetService() CipService {
///////////////////////////////////////////////////////////
// NewConnectedDataItem factory function for _ConnectedDataItem
-func NewConnectedDataItem(sequenceCount uint16, service CipService, order IntegerEncoding) *_ConnectedDataItem {
+func NewConnectedDataItem(sequenceCount uint16, service CipService) *_ConnectedDataItem {
_result := &_ConnectedDataItem{
SequenceCount: sequenceCount,
Service: service,
- _TypeId: NewTypeId(order),
+ _TypeId: NewTypeId(),
}
_result._TypeId._TypeIdChildRequirements = _result
return _result
@@ -136,11 +135,11 @@ func (m *_ConnectedDataItem) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ConnectedDataItemParse(theBytes []byte, order IntegerEncoding) (ConnectedDataItem, error) {
- return ConnectedDataItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func ConnectedDataItemParse(theBytes []byte) (ConnectedDataItem, error) {
+ return ConnectedDataItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func ConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (ConnectedDataItem, error) {
+func ConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ConnectedDataItem, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ConnectedDataItem"); pullErr != nil {
@@ -167,7 +166,7 @@ func ConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Read
if pullErr := readBuffer.PullContext("service"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for service")
}
- _service, _serviceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(true)), uint16(uint16(packetSize)-uint16(uint16(2))), IntegerEncoding(order))
+ _service, _serviceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(true)), uint16(uint16(packetSize)-uint16(uint16(2))))
if _serviceErr != nil {
return nil, errors.Wrap(_serviceErr, "Error parsing 'service' field of ConnectedDataItem")
}
@@ -182,9 +181,7 @@ func ConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Read
// Create a partially initialized instance
_child := &_ConnectedDataItem{
- _TypeId: &_TypeId{
- Order: order,
- },
+ _TypeId: &_TypeId{},
SequenceCount: sequenceCount,
Service: service,
}
@@ -193,7 +190,7 @@ func ConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Read
}
func (m *_ConnectedDataItem) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/DataSegment.go b/plc4go/protocols/eip/readwrite/model/DataSegment.go
index 092ef73262..dbf2830234 100644
--- a/plc4go/protocols/eip/readwrite/model/DataSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/DataSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -85,10 +84,10 @@ func (m *_DataSegment) GetSegmentType() DataSegmentType {
///////////////////////////////////////////////////////////
// NewDataSegment factory function for _DataSegment
-func NewDataSegment(segmentType DataSegmentType, order IntegerEncoding) *_DataSegment {
+func NewDataSegment(segmentType DataSegmentType) *_DataSegment {
_result := &_DataSegment{
SegmentType: segmentType,
- _PathSegment: NewPathSegment(order),
+ _PathSegment: NewPathSegment(),
}
_result._PathSegment._PathSegmentChildRequirements = _result
return _result
@@ -122,11 +121,11 @@ func (m *_DataSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func DataSegmentParse(theBytes []byte, order IntegerEncoding) (DataSegment, error) {
- return DataSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func DataSegmentParse(theBytes []byte) (DataSegment, error) {
+ return DataSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func DataSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (DataSegment, error) {
+func DataSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DataSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("DataSegment"); pullErr != nil {
@@ -139,7 +138,7 @@ func DataSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
if pullErr := readBuffer.PullContext("segmentType"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for segmentType")
}
- _segmentType, _segmentTypeErr := DataSegmentTypeParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _segmentType, _segmentTypeErr := DataSegmentTypeParseWithBuffer(ctx, readBuffer)
if _segmentTypeErr != nil {
return nil, errors.Wrap(_segmentTypeErr, "Error parsing 'segmentType' field of DataSegment")
}
@@ -154,17 +153,15 @@ func DataSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
// Create a partially initialized instance
_child := &_DataSegment{
- _PathSegment: &_PathSegment{
- Order: order,
- },
- SegmentType: segmentType,
+ _PathSegment: &_PathSegment{},
+ SegmentType: segmentType,
}
_child._PathSegment._PathSegmentChildRequirements = _child
return _child, nil
}
func (m *_DataSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
index dba51bd79d..77ba6c7f2a 100644
--- a/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/DataSegmentType.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -46,9 +45,6 @@ type DataSegmentTypeExactly interface {
// _DataSegmentType is the data-structure of this message
type _DataSegmentType struct {
_DataSegmentTypeChildRequirements
-
- // Arguments.
- Order IntegerEncoding
}
type _DataSegmentTypeChildRequirements interface {
@@ -72,8 +68,8 @@ type DataSegmentTypeChild interface {
}
// NewDataSegmentType factory function for _DataSegmentType
-func NewDataSegmentType(order IntegerEncoding) *_DataSegmentType {
- return &_DataSegmentType{Order: order}
+func NewDataSegmentType() *_DataSegmentType {
+ return &_DataSegmentType{}
}
// Deprecated: use the interface for direct cast
@@ -103,11 +99,11 @@ func (m *_DataSegmentType) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func DataSegmentTypeParse(theBytes []byte, order IntegerEncoding) (DataSegmentType, error) {
- return DataSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func DataSegmentTypeParse(theBytes []byte) (DataSegmentType, error) {
+ return DataSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func DataSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (DataSegmentType, error) {
+func DataSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (DataSegmentType, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("DataSegmentType"); pullErr != nil {
@@ -133,7 +129,7 @@ func DataSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
var typeSwitchError error
switch {
case dataSegmentType == 0x11: // AnsiExtendedSymbolSegment
- _childTemp, typeSwitchError = AnsiExtendedSymbolSegmentParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = AnsiExtendedSymbolSegmentParseWithBuffer(ctx, readBuffer)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [dataSegmentType=%v]", dataSegmentType)
}
@@ -180,16 +176,6 @@ func (pm *_DataSegmentType) SerializeParent(ctx context.Context, writeBuffer uti
return nil
}
-////
-// Arguments Getter
-
-func (m *_DataSegmentType) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_DataSegmentType) isDataSegmentType() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go b/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
index e44ff06a49..4e17f9b2e5 100644
--- a/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/EipConnectionRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"fmt"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -104,9 +103,9 @@ func (m *_EipConnectionRequest) GetFlags() uint16 {
///////////////////////////////////////////////////////////
// NewEipConnectionRequest factory function for _EipConnectionRequest
-func NewEipConnectionRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_EipConnectionRequest {
+func NewEipConnectionRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_EipConnectionRequest {
_result := &_EipConnectionRequest{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -143,11 +142,11 @@ func (m *_EipConnectionRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func EipConnectionRequestParse(theBytes []byte, order IntegerEncoding, response bool) (EipConnectionRequest, error) {
- return EipConnectionRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func EipConnectionRequestParse(theBytes []byte, response bool) (EipConnectionRequest, error) {
+ return EipConnectionRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func EipConnectionRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (EipConnectionRequest, error) {
+func EipConnectionRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (EipConnectionRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("EipConnectionRequest"); pullErr != nil {
@@ -180,16 +179,14 @@ func EipConnectionRequestParseWithBuffer(ctx context.Context, readBuffer utils.R
// Create a partially initialized instance
_child := &_EipConnectionRequest{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_EipConnectionRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go b/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
index 037c406e74..3f884360f8 100644
--- a/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/EipConnectionResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"fmt"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -104,9 +103,9 @@ func (m *_EipConnectionResponse) GetFlags() uint16 {
///////////////////////////////////////////////////////////
// NewEipConnectionResponse factory function for _EipConnectionResponse
-func NewEipConnectionResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_EipConnectionResponse {
+func NewEipConnectionResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_EipConnectionResponse {
_result := &_EipConnectionResponse{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -143,11 +142,11 @@ func (m *_EipConnectionResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func EipConnectionResponseParse(theBytes []byte, order IntegerEncoding, response bool) (EipConnectionResponse, error) {
- return EipConnectionResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func EipConnectionResponseParse(theBytes []byte, response bool) (EipConnectionResponse, error) {
+ return EipConnectionResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func EipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (EipConnectionResponse, error) {
+func EipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (EipConnectionResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("EipConnectionResponse"); pullErr != nil {
@@ -180,16 +179,14 @@ func EipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer utils.
// Create a partially initialized instance
_child := &_EipConnectionResponse{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_EipConnectionResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go b/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
index 590cb2cf06..e737989044 100644
--- a/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/EipDisconnectRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_EipDisconnectRequest) GetParent() EipPacket {
}
// NewEipDisconnectRequest factory function for _EipDisconnectRequest
-func NewEipDisconnectRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_EipDisconnectRequest {
+func NewEipDisconnectRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_EipDisconnectRequest {
_result := &_EipDisconnectRequest{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_EipDisconnectRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func EipDisconnectRequestParse(theBytes []byte, order IntegerEncoding, response bool) (EipDisconnectRequest, error) {
- return EipDisconnectRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func EipDisconnectRequestParse(theBytes []byte, response bool) (EipDisconnectRequest, error) {
+ return EipDisconnectRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func EipDisconnectRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (EipDisconnectRequest, error) {
+func EipDisconnectRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (EipDisconnectRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("EipDisconnectRequest"); pullErr != nil {
@@ -133,16 +132,14 @@ func EipDisconnectRequestParseWithBuffer(ctx context.Context, readBuffer utils.R
// Create a partially initialized instance
_child := &_EipDisconnectRequest{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_EipDisconnectRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/EipPacket.go b/plc4go/protocols/eip/readwrite/model/EipPacket.go
index 6a99b090f5..c5961ab639 100644
--- a/plc4go/protocols/eip/readwrite/model/EipPacket.go
+++ b/plc4go/protocols/eip/readwrite/model/EipPacket.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -62,9 +61,6 @@ type _EipPacket struct {
Status uint32
SenderContext []byte
Options uint32
-
- // Arguments.
- Order IntegerEncoding
}
type _EipPacketChildRequirements interface {
@@ -116,8 +112,8 @@ func (m *_EipPacket) GetOptions() uint32 {
///////////////////////////////////////////////////////////
// NewEipPacket factory function for _EipPacket
-func NewEipPacket(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_EipPacket {
- return &_EipPacket{SessionHandle: sessionHandle, Status: status, SenderContext: senderContext, Options: options, Order: order}
+func NewEipPacket(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_EipPacket {
+ return &_EipPacket{SessionHandle: sessionHandle, Status: status, SenderContext: senderContext, Options: options}
}
// Deprecated: use the interface for direct cast
@@ -164,11 +160,11 @@ func (m *_EipPacket) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func EipPacketParse(theBytes []byte, order IntegerEncoding, response bool) (EipPacket, error) {
- return EipPacketParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func EipPacketParse(theBytes []byte, response bool) (EipPacket, error) {
+ return EipPacketParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func EipPacketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (EipPacket, error) {
+func EipPacketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (EipPacket, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("EipPacket"); pullErr != nil {
@@ -228,27 +224,27 @@ func EipPacketParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
var typeSwitchError error
switch {
case command == 0x0001 && response == bool(false): // NullCommandRequest
- _childTemp, typeSwitchError = NullCommandRequestParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = NullCommandRequestParseWithBuffer(ctx, readBuffer, response)
case command == 0x0001 && response == bool(true): // NullCommandResponse
- _childTemp, typeSwitchError = NullCommandResponseParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = NullCommandResponseParseWithBuffer(ctx, readBuffer, response)
case command == 0x0004 && response == bool(false): // ListServicesRequest
- _childTemp, typeSwitchError = ListServicesRequestParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = ListServicesRequestParseWithBuffer(ctx, readBuffer, response)
case command == 0x0004 && response == bool(true) && packetLength == uint16(0): // NullListServicesResponse
- _childTemp, typeSwitchError = NullListServicesResponseParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = NullListServicesResponseParseWithBuffer(ctx, readBuffer, response)
case command == 0x0004 && response == bool(true): // ListServicesResponse
- _childTemp, typeSwitchError = ListServicesResponseParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = ListServicesResponseParseWithBuffer(ctx, readBuffer, response)
case command == 0x0065 && response == bool(false): // EipConnectionRequest
- _childTemp, typeSwitchError = EipConnectionRequestParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = EipConnectionRequestParseWithBuffer(ctx, readBuffer, response)
case command == 0x0065 && response == bool(true) && packetLength == uint16(0): // NullEipConnectionResponse
- _childTemp, typeSwitchError = NullEipConnectionResponseParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = NullEipConnectionResponseParseWithBuffer(ctx, readBuffer, response)
case command == 0x0065 && response == bool(true): // EipConnectionResponse
- _childTemp, typeSwitchError = EipConnectionResponseParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = EipConnectionResponseParseWithBuffer(ctx, readBuffer, response)
case command == 0x0066: // EipDisconnectRequest
- _childTemp, typeSwitchError = EipDisconnectRequestParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = EipDisconnectRequestParseWithBuffer(ctx, readBuffer, response)
case command == 0x006F: // CipRRData
- _childTemp, typeSwitchError = CipRRDataParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = CipRRDataParseWithBuffer(ctx, readBuffer, response)
case command == 0x0070: // SendUnitData
- _childTemp, typeSwitchError = SendUnitDataParseWithBuffer(ctx, readBuffer, order, response)
+ _childTemp, typeSwitchError = SendUnitDataParseWithBuffer(ctx, readBuffer, response)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [command=%v, response=%v, packetLength=%v]", command, response, packetLength)
}
@@ -329,16 +325,6 @@ func (pm *_EipPacket) SerializeParent(ctx context.Context, writeBuffer utils.Wri
return nil
}
-////
-// Arguments Getter
-
-func (m *_EipPacket) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_EipPacket) isEipPacket() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
index ef3beff8df..05b779e4dc 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -100,11 +99,11 @@ func (m *_GetAttributeAllRequest) GetInstanceSegment() PathSegment {
///////////////////////////////////////////////////////////
// NewGetAttributeAllRequest factory function for _GetAttributeAllRequest
-func NewGetAttributeAllRequest(classSegment PathSegment, instanceSegment PathSegment, serviceLen uint16, order IntegerEncoding) *_GetAttributeAllRequest {
+func NewGetAttributeAllRequest(classSegment PathSegment, instanceSegment PathSegment, serviceLen uint16) *_GetAttributeAllRequest {
_result := &_GetAttributeAllRequest{
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -144,11 +143,11 @@ func (m *_GetAttributeAllRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func GetAttributeAllRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (GetAttributeAllRequest, error) {
- return GetAttributeAllRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func GetAttributeAllRequestParse(theBytes []byte, connected bool, serviceLen uint16) (GetAttributeAllRequest, error) {
+ return GetAttributeAllRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (GetAttributeAllRequest, error) {
+func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (GetAttributeAllRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("GetAttributeAllRequest"); pullErr != nil {
@@ -158,7 +157,7 @@ func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils
_ = currentPos
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's implicitly given by the objects content)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
_ = requestPathSize
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of GetAttributeAllRequest")
@@ -168,7 +167,7 @@ func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils
if pullErr := readBuffer.PullContext("classSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for classSegment")
}
- _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _classSegment, _classSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _classSegmentErr != nil {
return nil, errors.Wrap(_classSegmentErr, "Error parsing 'classSegment' field of GetAttributeAllRequest")
}
@@ -181,7 +180,7 @@ func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils
if pullErr := readBuffer.PullContext("instanceSegment"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for instanceSegment")
}
- _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _instanceSegment, _instanceSegmentErr := PathSegmentParseWithBuffer(ctx, readBuffer)
if _instanceSegmentErr != nil {
return nil, errors.Wrap(_instanceSegmentErr, "Error parsing 'instanceSegment' field of GetAttributeAllRequest")
}
@@ -198,7 +197,6 @@ func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils
_child := &_GetAttributeAllRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
ClassSegment: classSegment,
InstanceSegment: instanceSegment,
@@ -208,7 +206,7 @@ func GetAttributeAllRequestParseWithBuffer(ctx context.Context, readBuffer utils
}
func (m *_GetAttributeAllRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -224,8 +222,8 @@ func (m *_GetAttributeAllRequest) SerializeWithWriteBuffer(ctx context.Context,
}
// Implicit Field (requestPathSize) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- requestPathSize := int8(int8((int8(m.GetClassSegment().GetLengthInBytes(ctx)) + int8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / int8(int8(2)))
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, (requestPathSize))
+ requestPathSize := uint8(uint8((uint8(m.GetClassSegment().GetLengthInBytes(ctx)) + uint8(m.GetInstanceSegment().GetLengthInBytes(ctx)))) / uint8(uint8(2)))
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, (requestPathSize))
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
index a78655c8aa..a8b6ce214f 100644
--- a/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/GetAttributeAllResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
"io"
@@ -110,12 +109,12 @@ func (m *_GetAttributeAllResponse) GetAttributes() CIPAttributes {
///////////////////////////////////////////////////////////
// NewGetAttributeAllResponse factory function for _GetAttributeAllResponse
-func NewGetAttributeAllResponse(status uint8, extStatus uint8, attributes CIPAttributes, serviceLen uint16, order IntegerEncoding) *_GetAttributeAllResponse {
+func NewGetAttributeAllResponse(status uint8, extStatus uint8, attributes CIPAttributes, serviceLen uint16) *_GetAttributeAllResponse {
_result := &_GetAttributeAllResponse{
Status: status,
ExtStatus: extStatus,
Attributes: attributes,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -160,11 +159,11 @@ func (m *_GetAttributeAllResponse) GetLengthInBytes(ctx context.Context) uint16
return m.GetLengthInBits(ctx) / 8
}
-func GetAttributeAllResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (GetAttributeAllResponse, error) {
- return GetAttributeAllResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func GetAttributeAllResponseParse(theBytes []byte, connected bool, serviceLen uint16) (GetAttributeAllResponse, error) {
+ return GetAttributeAllResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func GetAttributeAllResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (GetAttributeAllResponse, error) {
+func GetAttributeAllResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (GetAttributeAllResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("GetAttributeAllResponse"); pullErr != nil {
@@ -234,7 +233,6 @@ func GetAttributeAllResponseParseWithBuffer(ctx context.Context, readBuffer util
_child := &_GetAttributeAllResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
ExtStatus: extStatus,
@@ -246,7 +244,7 @@ func GetAttributeAllResponseParseWithBuffer(ctx context.Context, readBuffer util
}
func (m *_GetAttributeAllResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/InstanceID.go b/plc4go/protocols/eip/readwrite/model/InstanceID.go
index bf19939e9a..6d56076bfc 100644
--- a/plc4go/protocols/eip/readwrite/model/InstanceID.go
+++ b/plc4go/protocols/eip/readwrite/model/InstanceID.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -92,11 +91,11 @@ func (m *_InstanceID) GetInstance() uint8 {
///////////////////////////////////////////////////////////
// NewInstanceID factory function for _InstanceID
-func NewInstanceID(format uint8, instance uint8, order IntegerEncoding) *_InstanceID {
+func NewInstanceID(format uint8, instance uint8) *_InstanceID {
_result := &_InstanceID{
Format: format,
Instance: instance,
- _LogicalSegmentType: NewLogicalSegmentType(order),
+ _LogicalSegmentType: NewLogicalSegmentType(),
}
_result._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _result
return _result
@@ -133,11 +132,11 @@ func (m *_InstanceID) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func InstanceIDParse(theBytes []byte, order IntegerEncoding) (InstanceID, error) {
- return InstanceIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func InstanceIDParse(theBytes []byte) (InstanceID, error) {
+ return InstanceIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func InstanceIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (InstanceID, error) {
+func InstanceIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InstanceID, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("InstanceID"); pullErr != nil {
@@ -166,18 +165,16 @@ func InstanceIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer,
// Create a partially initialized instance
_child := &_InstanceID{
- _LogicalSegmentType: &_LogicalSegmentType{
- Order: order,
- },
- Format: format,
- Instance: instance,
+ _LogicalSegmentType: &_LogicalSegmentType{},
+ Format: format,
+ Instance: instance,
}
_child._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _child
return _child, nil
}
func (m *_InstanceID) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
index d8a9ce7def..b1b51692fc 100644
--- a/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/InstanceSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -55,9 +54,6 @@ type _InstanceSegment struct {
LogicalSegmentType uint8
LogicalSegmentFormat uint8
Instance uint8
-
- // Arguments.
- Order IntegerEncoding
}
///////////////////////////////////////////////////////////
@@ -87,8 +83,8 @@ func (m *_InstanceSegment) GetInstance() uint8 {
///////////////////////////////////////////////////////////
// NewInstanceSegment factory function for _InstanceSegment
-func NewInstanceSegment(pathSegmentType uint8, logicalSegmentType uint8, logicalSegmentFormat uint8, instance uint8, order IntegerEncoding) *_InstanceSegment {
- return &_InstanceSegment{PathSegmentType: pathSegmentType, LogicalSegmentType: logicalSegmentType, LogicalSegmentFormat: logicalSegmentFormat, Instance: instance, Order: order}
+func NewInstanceSegment(pathSegmentType uint8, logicalSegmentType uint8, logicalSegmentFormat uint8, instance uint8) *_InstanceSegment {
+ return &_InstanceSegment{PathSegmentType: pathSegmentType, LogicalSegmentType: logicalSegmentType, LogicalSegmentFormat: logicalSegmentFormat, Instance: instance}
}
// Deprecated: use the interface for direct cast
@@ -128,11 +124,11 @@ func (m *_InstanceSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func InstanceSegmentParse(theBytes []byte, order IntegerEncoding) (InstanceSegment, error) {
- return InstanceSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func InstanceSegmentParse(theBytes []byte) (InstanceSegment, error) {
+ return InstanceSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func InstanceSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (InstanceSegment, error) {
+func InstanceSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (InstanceSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("InstanceSegment"); pullErr != nil {
@@ -175,7 +171,6 @@ func InstanceSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
// Create the instance
return &_InstanceSegment{
- Order: order,
PathSegmentType: pathSegmentType,
LogicalSegmentType: logicalSegmentType,
LogicalSegmentFormat: logicalSegmentFormat,
@@ -184,7 +179,7 @@ func InstanceSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
}
func (m *_InstanceSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -232,16 +227,6 @@ func (m *_InstanceSegment) SerializeWithWriteBuffer(ctx context.Context, writeBu
return nil
}
-////
-// Arguments Getter
-
-func (m *_InstanceSegment) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_InstanceSegment) isInstanceSegment() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go b/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
index 7c5e5b75ad..811daff222 100644
--- a/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/ListServicesRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_ListServicesRequest) GetParent() EipPacket {
}
// NewListServicesRequest factory function for _ListServicesRequest
-func NewListServicesRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_ListServicesRequest {
+func NewListServicesRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_ListServicesRequest {
_result := &_ListServicesRequest{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_ListServicesRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ListServicesRequestParse(theBytes []byte, order IntegerEncoding, response bool) (ListServicesRequest, error) {
- return ListServicesRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func ListServicesRequestParse(theBytes []byte, response bool) (ListServicesRequest, error) {
+ return ListServicesRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func ListServicesRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (ListServicesRequest, error) {
+func ListServicesRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (ListServicesRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ListServicesRequest"); pullErr != nil {
@@ -133,16 +132,14 @@ func ListServicesRequestParseWithBuffer(ctx context.Context, readBuffer utils.Re
// Create a partially initialized instance
_child := &_ListServicesRequest{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_ListServicesRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go b/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
index 3d314be391..b226eed94f 100644
--- a/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/ListServicesResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -106,11 +105,11 @@ func (m *_ListServicesResponse) GetTypeId() []TypeId {
///////////////////////////////////////////////////////////
// NewListServicesResponse factory function for _ListServicesResponse
-func NewListServicesResponse(itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_ListServicesResponse {
+func NewListServicesResponse(itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_ListServicesResponse {
_result := &_ListServicesResponse{
ItemCount: itemCount,
TypeId: typeId,
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -154,11 +153,11 @@ func (m *_ListServicesResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ListServicesResponseParse(theBytes []byte, order IntegerEncoding, response bool) (ListServicesResponse, error) {
- return ListServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func ListServicesResponseParse(theBytes []byte, response bool) (ListServicesResponse, error) {
+ return ListServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func ListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (ListServicesResponse, error) {
+func ListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (ListServicesResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ListServicesResponse"); pullErr != nil {
@@ -190,7 +189,7 @@ func ListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.R
arrayCtx := spiContext.CreateArrayContext(ctx, int(_numItems), int(_curItem))
_ = arrayCtx
_ = _curItem
- _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer, order)
+ _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'typeId' field of ListServicesResponse")
}
@@ -207,18 +206,16 @@ func ListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.R
// Create a partially initialized instance
_child := &_ListServicesResponse{
- _EipPacket: &_EipPacket{
- Order: order,
- },
- ItemCount: itemCount,
- TypeId: typeId,
+ _EipPacket: &_EipPacket{},
+ ItemCount: itemCount,
+ TypeId: typeId,
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_ListServicesResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/LogicalSegment.go b/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
index 36fa4098f3..83fb7ceccc 100644
--- a/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/LogicalSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -85,10 +84,10 @@ func (m *_LogicalSegment) GetSegmentType() LogicalSegmentType {
///////////////////////////////////////////////////////////
// NewLogicalSegment factory function for _LogicalSegment
-func NewLogicalSegment(segmentType LogicalSegmentType, order IntegerEncoding) *_LogicalSegment {
+func NewLogicalSegment(segmentType LogicalSegmentType) *_LogicalSegment {
_result := &_LogicalSegment{
SegmentType: segmentType,
- _PathSegment: NewPathSegment(order),
+ _PathSegment: NewPathSegment(),
}
_result._PathSegment._PathSegmentChildRequirements = _result
return _result
@@ -122,11 +121,11 @@ func (m *_LogicalSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func LogicalSegmentParse(theBytes []byte, order IntegerEncoding) (LogicalSegment, error) {
- return LogicalSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func LogicalSegmentParse(theBytes []byte) (LogicalSegment, error) {
+ return LogicalSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func LogicalSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (LogicalSegment, error) {
+func LogicalSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LogicalSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("LogicalSegment"); pullErr != nil {
@@ -139,7 +138,7 @@ func LogicalSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuf
if pullErr := readBuffer.PullContext("segmentType"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for segmentType")
}
- _segmentType, _segmentTypeErr := LogicalSegmentTypeParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _segmentType, _segmentTypeErr := LogicalSegmentTypeParseWithBuffer(ctx, readBuffer)
if _segmentTypeErr != nil {
return nil, errors.Wrap(_segmentTypeErr, "Error parsing 'segmentType' field of LogicalSegment")
}
@@ -154,17 +153,15 @@ func LogicalSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuf
// Create a partially initialized instance
_child := &_LogicalSegment{
- _PathSegment: &_PathSegment{
- Order: order,
- },
- SegmentType: segmentType,
+ _PathSegment: &_PathSegment{},
+ SegmentType: segmentType,
}
_child._PathSegment._PathSegmentChildRequirements = _child
return _child, nil
}
func (m *_LogicalSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
index 1240a68d2a..2734573c07 100644
--- a/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/LogicalSegmentType.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -46,9 +45,6 @@ type LogicalSegmentTypeExactly interface {
// _LogicalSegmentType is the data-structure of this message
type _LogicalSegmentType struct {
_LogicalSegmentTypeChildRequirements
-
- // Arguments.
- Order IntegerEncoding
}
type _LogicalSegmentTypeChildRequirements interface {
@@ -72,8 +68,8 @@ type LogicalSegmentTypeChild interface {
}
// NewLogicalSegmentType factory function for _LogicalSegmentType
-func NewLogicalSegmentType(order IntegerEncoding) *_LogicalSegmentType {
- return &_LogicalSegmentType{Order: order}
+func NewLogicalSegmentType() *_LogicalSegmentType {
+ return &_LogicalSegmentType{}
}
// Deprecated: use the interface for direct cast
@@ -103,11 +99,11 @@ func (m *_LogicalSegmentType) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func LogicalSegmentTypeParse(theBytes []byte, order IntegerEncoding) (LogicalSegmentType, error) {
- return LogicalSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func LogicalSegmentTypeParse(theBytes []byte) (LogicalSegmentType, error) {
+ return LogicalSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func LogicalSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (LogicalSegmentType, error) {
+func LogicalSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (LogicalSegmentType, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("LogicalSegmentType"); pullErr != nil {
@@ -133,11 +129,11 @@ func LogicalSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.Rea
var typeSwitchError error
switch {
case logicalSegmentType == 0x00: // ClassID
- _childTemp, typeSwitchError = ClassIDParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = ClassIDParseWithBuffer(ctx, readBuffer)
case logicalSegmentType == 0x01: // InstanceID
- _childTemp, typeSwitchError = InstanceIDParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = InstanceIDParseWithBuffer(ctx, readBuffer)
case logicalSegmentType == 0x02: // MemberID
- _childTemp, typeSwitchError = MemberIDParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = MemberIDParseWithBuffer(ctx, readBuffer)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [logicalSegmentType=%v]", logicalSegmentType)
}
@@ -184,16 +180,6 @@ func (pm *_LogicalSegmentType) SerializeParent(ctx context.Context, writeBuffer
return nil
}
-////
-// Arguments Getter
-
-func (m *_LogicalSegmentType) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_LogicalSegmentType) isLogicalSegmentType() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/MemberID.go b/plc4go/protocols/eip/readwrite/model/MemberID.go
index ab61b18989..8666fa9e6a 100644
--- a/plc4go/protocols/eip/readwrite/model/MemberID.go
+++ b/plc4go/protocols/eip/readwrite/model/MemberID.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -92,11 +91,11 @@ func (m *_MemberID) GetInstance() uint8 {
///////////////////////////////////////////////////////////
// NewMemberID factory function for _MemberID
-func NewMemberID(format uint8, instance uint8, order IntegerEncoding) *_MemberID {
+func NewMemberID(format uint8, instance uint8) *_MemberID {
_result := &_MemberID{
Format: format,
Instance: instance,
- _LogicalSegmentType: NewLogicalSegmentType(order),
+ _LogicalSegmentType: NewLogicalSegmentType(),
}
_result._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _result
return _result
@@ -133,11 +132,11 @@ func (m *_MemberID) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func MemberIDParse(theBytes []byte, order IntegerEncoding) (MemberID, error) {
- return MemberIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func MemberIDParse(theBytes []byte) (MemberID, error) {
+ return MemberIDParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func MemberIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (MemberID, error) {
+func MemberIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (MemberID, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("MemberID"); pullErr != nil {
@@ -166,18 +165,16 @@ func MemberIDParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, o
// Create a partially initialized instance
_child := &_MemberID{
- _LogicalSegmentType: &_LogicalSegmentType{
- Order: order,
- },
- Format: format,
- Instance: instance,
+ _LogicalSegmentType: &_LogicalSegmentType{},
+ Format: format,
+ Instance: instance,
}
_child._LogicalSegmentType._LogicalSegmentTypeChildRequirements = _child
return _child, nil
}
func (m *_MemberID) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
index dcd0dde712..1c4802b525 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"fmt"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -30,7 +29,7 @@ import (
// Code generated by code-generation. DO NOT EDIT.
// Constant values.
-const MultipleServiceRequest_REQUESTPATHSIZE int8 = 0x02
+const MultipleServiceRequest_REQUESTPATHSIZE uint8 = 0x02
const MultipleServiceRequest_REQUESTPATH uint32 = 0x01240220
// MultipleServiceRequest is the corresponding interface of MultipleServiceRequest
@@ -101,7 +100,7 @@ func (m *_MultipleServiceRequest) GetData() Services {
/////////////////////// Accessors for const fields.
///////////////////////
-func (m *_MultipleServiceRequest) GetRequestPathSize() int8 {
+func (m *_MultipleServiceRequest) GetRequestPathSize() uint8 {
return MultipleServiceRequest_REQUESTPATHSIZE
}
@@ -115,10 +114,10 @@ func (m *_MultipleServiceRequest) GetRequestPath() uint32 {
///////////////////////////////////////////////////////////
// NewMultipleServiceRequest factory function for _MultipleServiceRequest
-func NewMultipleServiceRequest(data Services, serviceLen uint16, order IntegerEncoding) *_MultipleServiceRequest {
+func NewMultipleServiceRequest(data Services, serviceLen uint16) *_MultipleServiceRequest {
_result := &_MultipleServiceRequest{
Data: data,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -158,11 +157,11 @@ func (m *_MultipleServiceRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func MultipleServiceRequestParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (MultipleServiceRequest, error) {
- return MultipleServiceRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func MultipleServiceRequestParse(theBytes []byte, connected bool, serviceLen uint16) (MultipleServiceRequest, error) {
+ return MultipleServiceRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (MultipleServiceRequest, error) {
+func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (MultipleServiceRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("MultipleServiceRequest"); pullErr != nil {
@@ -172,7 +171,7 @@ func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils
_ = currentPos
// Const Field (requestPathSize)
- requestPathSize, _requestPathSizeErr := readBuffer.ReadInt8("requestPathSize", 8)
+ requestPathSize, _requestPathSizeErr := readBuffer.ReadUint8("requestPathSize", 8)
if _requestPathSizeErr != nil {
return nil, errors.Wrap(_requestPathSizeErr, "Error parsing 'requestPathSize' field of MultipleServiceRequest")
}
@@ -193,7 +192,7 @@ func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils
if pullErr := readBuffer.PullContext("data"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for data")
}
- _data, _dataErr := ServicesParseWithBuffer(ctx, readBuffer, uint16(uint16(serviceLen)-uint16(uint16(6))), IntegerEncoding(order))
+ _data, _dataErr := ServicesParseWithBuffer(ctx, readBuffer, uint16(uint16(serviceLen)-uint16(uint16(6))))
if _dataErr != nil {
return nil, errors.Wrap(_dataErr, "Error parsing 'data' field of MultipleServiceRequest")
}
@@ -210,7 +209,6 @@ func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils
_child := &_MultipleServiceRequest{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Data: data,
}
@@ -219,7 +217,7 @@ func MultipleServiceRequestParseWithBuffer(ctx context.Context, readBuffer utils
}
func (m *_MultipleServiceRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -235,7 +233,7 @@ func (m *_MultipleServiceRequest) SerializeWithWriteBuffer(ctx context.Context,
}
// Const Field (requestPathSize)
- _requestPathSizeErr := writeBuffer.WriteInt8("requestPathSize", 8, 0x02)
+ _requestPathSizeErr := writeBuffer.WriteUint8("requestPathSize", 8, 0x02)
if _requestPathSizeErr != nil {
return errors.Wrap(_requestPathSizeErr, "Error serializing 'requestPathSize' field")
}
diff --git a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
index fca47de24f..362a3e99dd 100644
--- a/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/MultipleServiceResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -124,14 +123,14 @@ func (m *_MultipleServiceResponse) GetServicesData() []byte {
///////////////////////////////////////////////////////////
// NewMultipleServiceResponse factory function for _MultipleServiceResponse
-func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte, serviceLen uint16, order IntegerEncoding) *_MultipleServiceResponse {
+func NewMultipleServiceResponse(status uint8, extStatus uint8, serviceNb uint16, offsets []uint16, servicesData []byte, serviceLen uint16) *_MultipleServiceResponse {
_result := &_MultipleServiceResponse{
Status: status,
ExtStatus: extStatus,
ServiceNb: serviceNb,
Offsets: offsets,
ServicesData: servicesData,
- _CipService: NewCipService(serviceLen, order),
+ _CipService: NewCipService(serviceLen),
}
_result._CipService._CipServiceChildRequirements = _result
return _result
@@ -184,11 +183,11 @@ func (m *_MultipleServiceResponse) GetLengthInBytes(ctx context.Context) uint16
return m.GetLengthInBits(ctx) / 8
}
-func MultipleServiceResponseParse(theBytes []byte, connected bool, serviceLen uint16, order IntegerEncoding) (MultipleServiceResponse, error) {
- return MultipleServiceResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), connected, serviceLen, order)
+func MultipleServiceResponseParse(theBytes []byte, connected bool, serviceLen uint16) (MultipleServiceResponse, error) {
+ return MultipleServiceResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), connected, serviceLen)
}
-func MultipleServiceResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16, order IntegerEncoding) (MultipleServiceResponse, error) {
+func MultipleServiceResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, connected bool, serviceLen uint16) (MultipleServiceResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("MultipleServiceResponse"); pullErr != nil {
@@ -276,7 +275,6 @@ func MultipleServiceResponseParseWithBuffer(ctx context.Context, readBuffer util
_child := &_MultipleServiceResponse{
_CipService: &_CipService{
ServiceLen: serviceLen,
- Order: order,
},
Status: status,
ExtStatus: extStatus,
@@ -290,7 +288,7 @@ func MultipleServiceResponseParseWithBuffer(ctx context.Context, readBuffer util
}
func (m *_MultipleServiceResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
index c9a3350570..8d3b79a57c 100644
--- a/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
+++ b/plc4go/protocols/eip/readwrite/model/NetworkConnectionParameters.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -58,9 +57,6 @@ type _NetworkConnectionParameters struct {
ConnectionType uint8
Priority uint8
ConnectionSizeType bool
-
- // Arguments.
- Order IntegerEncoding
// Reserved Fields
reservedField0 *uint8
reservedField1 *bool
@@ -98,8 +94,8 @@ func (m *_NetworkConnectionParameters) GetConnectionSizeType() bool {
///////////////////////////////////////////////////////////
// NewNetworkConnectionParameters factory function for _NetworkConnectionParameters
-func NewNetworkConnectionParameters(connectionSize uint16, owner bool, connectionType uint8, priority uint8, connectionSizeType bool, order IntegerEncoding) *_NetworkConnectionParameters {
- return &_NetworkConnectionParameters{ConnectionSize: connectionSize, Owner: owner, ConnectionType: connectionType, Priority: priority, ConnectionSizeType: connectionSizeType, Order: order}
+func NewNetworkConnectionParameters(connectionSize uint16, owner bool, connectionType uint8, priority uint8, connectionSizeType bool) *_NetworkConnectionParameters {
+ return &_NetworkConnectionParameters{ConnectionSize: connectionSize, Owner: owner, ConnectionType: connectionType, Priority: priority, ConnectionSizeType: connectionSizeType}
}
// Deprecated: use the interface for direct cast
@@ -151,11 +147,11 @@ func (m *_NetworkConnectionParameters) GetLengthInBytes(ctx context.Context) uin
return m.GetLengthInBits(ctx) / 8
}
-func NetworkConnectionParametersParse(theBytes []byte, order IntegerEncoding) (NetworkConnectionParameters, error) {
- return NetworkConnectionParametersParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func NetworkConnectionParametersParse(theBytes []byte) (NetworkConnectionParameters, error) {
+ return NetworkConnectionParametersParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func NetworkConnectionParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (NetworkConnectionParameters, error) {
+func NetworkConnectionParametersParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NetworkConnectionParameters, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NetworkConnectionParameters"); pullErr != nil {
@@ -256,7 +252,6 @@ func NetworkConnectionParametersParseWithBuffer(ctx context.Context, readBuffer
// Create the instance
return &_NetworkConnectionParameters{
- Order: order,
ConnectionSize: connectionSize,
Owner: owner,
ConnectionType: connectionType,
@@ -269,7 +264,7 @@ func NetworkConnectionParametersParseWithBuffer(ctx context.Context, readBuffer
}
func (m *_NetworkConnectionParameters) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -372,16 +367,6 @@ func (m *_NetworkConnectionParameters) SerializeWithWriteBuffer(ctx context.Cont
return nil
}
-////
-// Arguments Getter
-
-func (m *_NetworkConnectionParameters) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_NetworkConnectionParameters) isNetworkConnectionParameters() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/NullAddressItem.go b/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
index 007952df4b..afd0b4fbf8 100644
--- a/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
+++ b/plc4go/protocols/eip/readwrite/model/NullAddressItem.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -70,9 +69,9 @@ func (m *_NullAddressItem) GetParent() TypeId {
}
// NewNullAddressItem factory function for _NullAddressItem
-func NewNullAddressItem(order IntegerEncoding) *_NullAddressItem {
+func NewNullAddressItem() *_NullAddressItem {
_result := &_NullAddressItem{
- _TypeId: NewTypeId(order),
+ _TypeId: NewTypeId(),
}
_result._TypeId._TypeIdChildRequirements = _result
return _result
@@ -106,11 +105,11 @@ func (m *_NullAddressItem) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func NullAddressItemParse(theBytes []byte, order IntegerEncoding) (NullAddressItem, error) {
- return NullAddressItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func NullAddressItemParse(theBytes []byte) (NullAddressItem, error) {
+ return NullAddressItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func NullAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (NullAddressItem, error) {
+func NullAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NullAddressItem, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NullAddressItem"); pullErr != nil {
@@ -142,9 +141,7 @@ func NullAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
// Create a partially initialized instance
_child := &_NullAddressItem{
- _TypeId: &_TypeId{
- Order: order,
- },
+ _TypeId: &_TypeId{},
reservedField0: reservedField0,
}
_child._TypeId._TypeIdChildRequirements = _child
@@ -152,7 +149,7 @@ func NullAddressItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
}
func (m *_NullAddressItem) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go b/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
index 71d5aaefcd..0b9290c486 100644
--- a/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
+++ b/plc4go/protocols/eip/readwrite/model/NullCommandRequest.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_NullCommandRequest) GetParent() EipPacket {
}
// NewNullCommandRequest factory function for _NullCommandRequest
-func NewNullCommandRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_NullCommandRequest {
+func NewNullCommandRequest(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_NullCommandRequest {
_result := &_NullCommandRequest{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_NullCommandRequest) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func NullCommandRequestParse(theBytes []byte, order IntegerEncoding, response bool) (NullCommandRequest, error) {
- return NullCommandRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func NullCommandRequestParse(theBytes []byte, response bool) (NullCommandRequest, error) {
+ return NullCommandRequestParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func NullCommandRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (NullCommandRequest, error) {
+func NullCommandRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (NullCommandRequest, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NullCommandRequest"); pullErr != nil {
@@ -133,16 +132,14 @@ func NullCommandRequestParseWithBuffer(ctx context.Context, readBuffer utils.Rea
// Create a partially initialized instance
_child := &_NullCommandRequest{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_NullCommandRequest) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go b/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
index d973ff2056..0792d2b3e2 100644
--- a/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullCommandResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_NullCommandResponse) GetParent() EipPacket {
}
// NewNullCommandResponse factory function for _NullCommandResponse
-func NewNullCommandResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_NullCommandResponse {
+func NewNullCommandResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_NullCommandResponse {
_result := &_NullCommandResponse{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_NullCommandResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func NullCommandResponseParse(theBytes []byte, order IntegerEncoding, response bool) (NullCommandResponse, error) {
- return NullCommandResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func NullCommandResponseParse(theBytes []byte, response bool) (NullCommandResponse, error) {
+ return NullCommandResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func NullCommandResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (NullCommandResponse, error) {
+func NullCommandResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (NullCommandResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NullCommandResponse"); pullErr != nil {
@@ -133,16 +132,14 @@ func NullCommandResponseParseWithBuffer(ctx context.Context, readBuffer utils.Re
// Create a partially initialized instance
_child := &_NullCommandResponse{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_NullCommandResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go b/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
index 6ebebead2f..001966f939 100644
--- a/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullEipConnectionResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_NullEipConnectionResponse) GetParent() EipPacket {
}
// NewNullEipConnectionResponse factory function for _NullEipConnectionResponse
-func NewNullEipConnectionResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_NullEipConnectionResponse {
+func NewNullEipConnectionResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_NullEipConnectionResponse {
_result := &_NullEipConnectionResponse{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_NullEipConnectionResponse) GetLengthInBytes(ctx context.Context) uint1
return m.GetLengthInBits(ctx) / 8
}
-func NullEipConnectionResponseParse(theBytes []byte, order IntegerEncoding, response bool) (NullEipConnectionResponse, error) {
- return NullEipConnectionResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func NullEipConnectionResponseParse(theBytes []byte, response bool) (NullEipConnectionResponse, error) {
+ return NullEipConnectionResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func NullEipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (NullEipConnectionResponse, error) {
+func NullEipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (NullEipConnectionResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NullEipConnectionResponse"); pullErr != nil {
@@ -133,16 +132,14 @@ func NullEipConnectionResponseParseWithBuffer(ctx context.Context, readBuffer ut
// Create a partially initialized instance
_child := &_NullEipConnectionResponse{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_NullEipConnectionResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go b/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
index fd219fcf9d..ee59f13f18 100644
--- a/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/NullListServicesResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -81,9 +80,9 @@ func (m *_NullListServicesResponse) GetParent() EipPacket {
}
// NewNullListServicesResponse factory function for _NullListServicesResponse
-func NewNullListServicesResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_NullListServicesResponse {
+func NewNullListServicesResponse(sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_NullListServicesResponse {
_result := &_NullListServicesResponse{
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -114,11 +113,11 @@ func (m *_NullListServicesResponse) GetLengthInBytes(ctx context.Context) uint16
return m.GetLengthInBits(ctx) / 8
}
-func NullListServicesResponseParse(theBytes []byte, order IntegerEncoding, response bool) (NullListServicesResponse, error) {
- return NullListServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func NullListServicesResponseParse(theBytes []byte, response bool) (NullListServicesResponse, error) {
+ return NullListServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func NullListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (NullListServicesResponse, error) {
+func NullListServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (NullListServicesResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("NullListServicesResponse"); pullErr != nil {
@@ -133,16 +132,14 @@ func NullListServicesResponseParseWithBuffer(ctx context.Context, readBuffer uti
// Create a partially initialized instance
_child := &_NullListServicesResponse{
- _EipPacket: &_EipPacket{
- Order: order,
- },
+ _EipPacket: &_EipPacket{},
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_NullListServicesResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/PathSegment.go b/plc4go/protocols/eip/readwrite/model/PathSegment.go
index 109233eee1..d89682dad3 100644
--- a/plc4go/protocols/eip/readwrite/model/PathSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/PathSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -46,9 +45,6 @@ type PathSegmentExactly interface {
// _PathSegment is the data-structure of this message
type _PathSegment struct {
_PathSegmentChildRequirements
-
- // Arguments.
- Order IntegerEncoding
}
type _PathSegmentChildRequirements interface {
@@ -72,8 +68,8 @@ type PathSegmentChild interface {
}
// NewPathSegment factory function for _PathSegment
-func NewPathSegment(order IntegerEncoding) *_PathSegment {
- return &_PathSegment{Order: order}
+func NewPathSegment() *_PathSegment {
+ return &_PathSegment{}
}
// Deprecated: use the interface for direct cast
@@ -103,11 +99,11 @@ func (m *_PathSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func PathSegmentParse(theBytes []byte, order IntegerEncoding) (PathSegment, error) {
- return PathSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func PathSegmentParse(theBytes []byte) (PathSegment, error) {
+ return PathSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func PathSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (PathSegment, error) {
+func PathSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PathSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("PathSegment"); pullErr != nil {
@@ -133,11 +129,11 @@ func PathSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
var typeSwitchError error
switch {
case pathSegment == 0x00: // PortSegment
- _childTemp, typeSwitchError = PortSegmentParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = PortSegmentParseWithBuffer(ctx, readBuffer)
case pathSegment == 0x01: // LogicalSegment
- _childTemp, typeSwitchError = LogicalSegmentParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = LogicalSegmentParseWithBuffer(ctx, readBuffer)
case pathSegment == 0x04: // DataSegment
- _childTemp, typeSwitchError = DataSegmentParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = DataSegmentParseWithBuffer(ctx, readBuffer)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [pathSegment=%v]", pathSegment)
}
@@ -184,16 +180,6 @@ func (pm *_PathSegment) SerializeParent(ctx context.Context, writeBuffer utils.W
return nil
}
-////
-// Arguments Getter
-
-func (m *_PathSegment) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_PathSegment) isPathSegment() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegment.go b/plc4go/protocols/eip/readwrite/model/PortSegment.go
index 8726f003f3..d36b7ff548 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegment.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegment.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -85,10 +84,10 @@ func (m *_PortSegment) GetSegmentType() PortSegmentType {
///////////////////////////////////////////////////////////
// NewPortSegment factory function for _PortSegment
-func NewPortSegment(segmentType PortSegmentType, order IntegerEncoding) *_PortSegment {
+func NewPortSegment(segmentType PortSegmentType) *_PortSegment {
_result := &_PortSegment{
SegmentType: segmentType,
- _PathSegment: NewPathSegment(order),
+ _PathSegment: NewPathSegment(),
}
_result._PathSegment._PathSegmentChildRequirements = _result
return _result
@@ -122,11 +121,11 @@ func (m *_PortSegment) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func PortSegmentParse(theBytes []byte, order IntegerEncoding) (PortSegment, error) {
- return PortSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func PortSegmentParse(theBytes []byte) (PortSegment, error) {
+ return PortSegmentParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func PortSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (PortSegment, error) {
+func PortSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PortSegment, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("PortSegment"); pullErr != nil {
@@ -139,7 +138,7 @@ func PortSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
if pullErr := readBuffer.PullContext("segmentType"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for segmentType")
}
- _segmentType, _segmentTypeErr := PortSegmentTypeParseWithBuffer(ctx, readBuffer, IntegerEncoding(order))
+ _segmentType, _segmentTypeErr := PortSegmentTypeParseWithBuffer(ctx, readBuffer)
if _segmentTypeErr != nil {
return nil, errors.Wrap(_segmentTypeErr, "Error parsing 'segmentType' field of PortSegment")
}
@@ -154,17 +153,15 @@ func PortSegmentParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
// Create a partially initialized instance
_child := &_PortSegment{
- _PathSegment: &_PathSegment{
- Order: order,
- },
- SegmentType: segmentType,
+ _PathSegment: &_PathSegment{},
+ SegmentType: segmentType,
}
_child._PathSegment._PathSegmentChildRequirements = _child
return _child, nil
}
func (m *_PortSegment) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go b/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
index 0f38b2b0ca..c2f9f2f95f 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentExtended.go
@@ -115,12 +115,12 @@ func (m *_PortSegmentExtended) GetPaddingByte() uint8 {
///////////////////////////////////////////////////////////
// NewPortSegmentExtended factory function for _PortSegmentExtended
-func NewPortSegmentExtended(port uint8, linkAddressSize uint8, address string, order IntegerEncoding) *_PortSegmentExtended {
+func NewPortSegmentExtended(port uint8, linkAddressSize uint8, address string) *_PortSegmentExtended {
_result := &_PortSegmentExtended{
Port: port,
LinkAddressSize: linkAddressSize,
Address: address,
- _PortSegmentType: NewPortSegmentType(order),
+ _PortSegmentType: NewPortSegmentType(),
}
_result._PortSegmentType._PortSegmentTypeChildRequirements = _result
return _result
@@ -162,11 +162,11 @@ func (m *_PortSegmentExtended) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func PortSegmentExtendedParse(theBytes []byte, order IntegerEncoding) (PortSegmentExtended, error) {
- return PortSegmentExtendedParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), order)
+func PortSegmentExtendedParse(theBytes []byte) (PortSegmentExtended, error) {
+ return PortSegmentExtendedParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func PortSegmentExtendedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (PortSegmentExtended, error) {
+func PortSegmentExtendedParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PortSegmentExtended, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("PortSegmentExtended"); pullErr != nil {
@@ -207,12 +207,10 @@ func PortSegmentExtendedParseWithBuffer(ctx context.Context, readBuffer utils.Re
// Create a partially initialized instance
_child := &_PortSegmentExtended{
- _PortSegmentType: &_PortSegmentType{
- Order: order,
- },
- Port: port,
- LinkAddressSize: linkAddressSize,
- Address: address,
+ _PortSegmentType: &_PortSegmentType{},
+ Port: port,
+ LinkAddressSize: linkAddressSize,
+ Address: address,
}
_child._PortSegmentType._PortSegmentTypeChildRequirements = _child
return _child, nil
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go b/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
index bfafbb9801..a81f2a9c93 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentNormal.go
@@ -91,11 +91,11 @@ func (m *_PortSegmentNormal) GetLinkAddress() uint8 {
///////////////////////////////////////////////////////////
// NewPortSegmentNormal factory function for _PortSegmentNormal
-func NewPortSegmentNormal(port uint8, linkAddress uint8, order IntegerEncoding) *_PortSegmentNormal {
+func NewPortSegmentNormal(port uint8, linkAddress uint8) *_PortSegmentNormal {
_result := &_PortSegmentNormal{
Port: port,
LinkAddress: linkAddress,
- _PortSegmentType: NewPortSegmentType(order),
+ _PortSegmentType: NewPortSegmentType(),
}
_result._PortSegmentType._PortSegmentTypeChildRequirements = _result
return _result
@@ -132,11 +132,11 @@ func (m *_PortSegmentNormal) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func PortSegmentNormalParse(theBytes []byte, order IntegerEncoding) (PortSegmentNormal, error) {
- return PortSegmentNormalParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), order)
+func PortSegmentNormalParse(theBytes []byte) (PortSegmentNormal, error) {
+ return PortSegmentNormalParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func PortSegmentNormalParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (PortSegmentNormal, error) {
+func PortSegmentNormalParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PortSegmentNormal, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("PortSegmentNormal"); pullErr != nil {
@@ -165,11 +165,9 @@ func PortSegmentNormalParseWithBuffer(ctx context.Context, readBuffer utils.Read
// Create a partially initialized instance
_child := &_PortSegmentNormal{
- _PortSegmentType: &_PortSegmentType{
- Order: order,
- },
- Port: port,
- LinkAddress: linkAddress,
+ _PortSegmentType: &_PortSegmentType{},
+ Port: port,
+ LinkAddress: linkAddress,
}
_child._PortSegmentType._PortSegmentTypeChildRequirements = _child
return _child, nil
diff --git a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
index 13287d0075..2dfe43802e 100644
--- a/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
+++ b/plc4go/protocols/eip/readwrite/model/PortSegmentType.go
@@ -45,9 +45,6 @@ type PortSegmentTypeExactly interface {
// _PortSegmentType is the data-structure of this message
type _PortSegmentType struct {
_PortSegmentTypeChildRequirements
-
- // Arguments.
- Order IntegerEncoding
}
type _PortSegmentTypeChildRequirements interface {
@@ -71,8 +68,8 @@ type PortSegmentTypeChild interface {
}
// NewPortSegmentType factory function for _PortSegmentType
-func NewPortSegmentType(order IntegerEncoding) *_PortSegmentType {
- return &_PortSegmentType{Order: order}
+func NewPortSegmentType() *_PortSegmentType {
+ return &_PortSegmentType{}
}
// Deprecated: use the interface for direct cast
@@ -102,11 +99,11 @@ func (m *_PortSegmentType) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func PortSegmentTypeParse(theBytes []byte, order IntegerEncoding) (PortSegmentType, error) {
- return PortSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), order)
+func PortSegmentTypeParse(theBytes []byte) (PortSegmentType, error) {
+ return PortSegmentTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func PortSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (PortSegmentType, error) {
+func PortSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (PortSegmentType, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("PortSegmentType"); pullErr != nil {
@@ -132,9 +129,9 @@ func PortSegmentTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
var typeSwitchError error
switch {
case extendedLinkAddress == bool(false): // PortSegmentNormal
- _childTemp, typeSwitchError = PortSegmentNormalParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = PortSegmentNormalParseWithBuffer(ctx, readBuffer)
case extendedLinkAddress == bool(true): // PortSegmentExtended
- _childTemp, typeSwitchError = PortSegmentExtendedParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = PortSegmentExtendedParseWithBuffer(ctx, readBuffer)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [extendedLinkAddress=%v]", extendedLinkAddress)
}
@@ -181,16 +178,6 @@ func (pm *_PortSegmentType) SerializeParent(ctx context.Context, writeBuffer uti
return nil
}
-////
-// Arguments Getter
-
-func (m *_PortSegmentType) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_PortSegmentType) isPortSegmentType() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/SendUnitData.go b/plc4go/protocols/eip/readwrite/model/SendUnitData.go
index 5c9ca2c9c4..8cfaca1e5e 100644
--- a/plc4go/protocols/eip/readwrite/model/SendUnitData.go
+++ b/plc4go/protocols/eip/readwrite/model/SendUnitData.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"fmt"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
@@ -130,12 +129,12 @@ func (m *_SendUnitData) GetInterfaceHandle() uint32 {
///////////////////////////////////////////////////////////
// NewSendUnitData factory function for _SendUnitData
-func NewSendUnitData(timeout uint16, itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32, order IntegerEncoding) *_SendUnitData {
+func NewSendUnitData(timeout uint16, itemCount uint16, typeId []TypeId, sessionHandle uint32, status uint32, senderContext []byte, options uint32) *_SendUnitData {
_result := &_SendUnitData{
Timeout: timeout,
ItemCount: itemCount,
TypeId: typeId,
- _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options, order),
+ _EipPacket: NewEipPacket(sessionHandle, status, senderContext, options),
}
_result._EipPacket._EipPacketChildRequirements = _result
return _result
@@ -185,11 +184,11 @@ func (m *_SendUnitData) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func SendUnitDataParse(theBytes []byte, order IntegerEncoding, response bool) (SendUnitData, error) {
- return SendUnitDataParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order, response)
+func SendUnitDataParse(theBytes []byte, response bool) (SendUnitData, error) {
+ return SendUnitDataParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), response)
}
-func SendUnitDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding, response bool) (SendUnitData, error) {
+func SendUnitDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, response bool) (SendUnitData, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("SendUnitData"); pullErr != nil {
@@ -237,7 +236,7 @@ func SendUnitDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
arrayCtx := spiContext.CreateArrayContext(ctx, int(_numItems), int(_curItem))
_ = arrayCtx
_ = _curItem
- _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer, order)
+ _item, _err := TypeIdParseWithBuffer(arrayCtx, readBuffer)
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'typeId' field of SendUnitData")
}
@@ -254,19 +253,17 @@ func SendUnitDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
// Create a partially initialized instance
_child := &_SendUnitData{
- _EipPacket: &_EipPacket{
- Order: order,
- },
- Timeout: timeout,
- ItemCount: itemCount,
- TypeId: typeId,
+ _EipPacket: &_EipPacket{},
+ Timeout: timeout,
+ ItemCount: itemCount,
+ TypeId: typeId,
}
_child._EipPacket._EipPacketChildRequirements = _child
return _child, nil
}
func (m *_SendUnitData) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/Services.go b/plc4go/protocols/eip/readwrite/model/Services.go
index ef586c756b..29e03e0c30 100644
--- a/plc4go/protocols/eip/readwrite/model/Services.go
+++ b/plc4go/protocols/eip/readwrite/model/Services.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
spiContext "github.com/apache/plc4x/plc4go/spi/context"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
@@ -53,7 +52,6 @@ type _Services struct {
// Arguments.
ServicesLen uint16
- Order IntegerEncoding
}
///////////////////////////////////////////////////////////
@@ -75,8 +73,8 @@ func (m *_Services) GetServices() []CipService {
///////////////////////////////////////////////////////////
// NewServices factory function for _Services
-func NewServices(offsets []uint16, services []CipService, servicesLen uint16, order IntegerEncoding) *_Services {
- return &_Services{Offsets: offsets, Services: services, ServicesLen: servicesLen, Order: order}
+func NewServices(offsets []uint16, services []CipService, servicesLen uint16) *_Services {
+ return &_Services{Offsets: offsets, Services: services, ServicesLen: servicesLen}
}
// Deprecated: use the interface for direct cast
@@ -122,11 +120,11 @@ func (m *_Services) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ServicesParse(theBytes []byte, servicesLen uint16, order IntegerEncoding) (Services, error) {
- return ServicesParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), servicesLen, order)
+func ServicesParse(theBytes []byte, servicesLen uint16) (Services, error) {
+ return ServicesParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes), servicesLen)
}
-func ServicesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, servicesLen uint16, order IntegerEncoding) (Services, error) {
+func ServicesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, servicesLen uint16) (Services, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("Services"); pullErr != nil {
@@ -185,7 +183,7 @@ func ServicesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, s
arrayCtx := spiContext.CreateArrayContext(ctx, int(_numItems), int(_curItem))
_ = arrayCtx
_ = _curItem
- _item, _err := CipServiceParseWithBuffer(arrayCtx, readBuffer, bool(false), uint16(servicesLen)/uint16(serviceNb), order)
+ _item, _err := CipServiceParseWithBuffer(arrayCtx, readBuffer, bool(false), uint16(servicesLen)/uint16(serviceNb))
if _err != nil {
return nil, errors.Wrap(_err, "Error parsing 'services' field of Services")
}
@@ -203,14 +201,13 @@ func ServicesParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, s
// Create the instance
return &_Services{
ServicesLen: servicesLen,
- Order: order,
Offsets: offsets,
Services: services,
}, nil
}
func (m *_Services) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -275,9 +272,6 @@ func (m *_Services) SerializeWithWriteBuffer(ctx context.Context, writeBuffer ut
func (m *_Services) GetServicesLen() uint16 {
return m.ServicesLen
}
-func (m *_Services) GetOrder() IntegerEncoding {
- return m.Order
-}
//
////
diff --git a/plc4go/protocols/eip/readwrite/model/ServicesResponse.go b/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
index 7bb11dc35e..a84ea833d1 100644
--- a/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
+++ b/plc4go/protocols/eip/readwrite/model/ServicesResponse.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -109,13 +108,13 @@ func (m *_ServicesResponse) GetData() []byte {
///////////////////////////////////////////////////////////
// NewServicesResponse factory function for _ServicesResponse
-func NewServicesResponse(encapsulationProtocol uint16, supportsCIPEncapsulation bool, supportsUDP bool, data []byte, order IntegerEncoding) *_ServicesResponse {
+func NewServicesResponse(encapsulationProtocol uint16, supportsCIPEncapsulation bool, supportsUDP bool, data []byte) *_ServicesResponse {
_result := &_ServicesResponse{
EncapsulationProtocol: encapsulationProtocol,
SupportsCIPEncapsulation: supportsCIPEncapsulation,
SupportsUDP: supportsUDP,
Data: data,
- _TypeId: NewTypeId(order),
+ _TypeId: NewTypeId(),
}
_result._TypeId._TypeIdChildRequirements = _result
return _result
@@ -169,11 +168,11 @@ func (m *_ServicesResponse) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func ServicesResponseParse(theBytes []byte, order IntegerEncoding) (ServicesResponse, error) {
- return ServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func ServicesResponseParse(theBytes []byte) (ServicesResponse, error) {
+ return ServicesResponseParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func ServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (ServicesResponse, error) {
+func ServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (ServicesResponse, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("ServicesResponse"); pullErr != nil {
@@ -256,9 +255,7 @@ func ServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
// Create a partially initialized instance
_child := &_ServicesResponse{
- _TypeId: &_TypeId{
- Order: order,
- },
+ _TypeId: &_TypeId{},
EncapsulationProtocol: encapsulationProtocol,
SupportsCIPEncapsulation: supportsCIPEncapsulation,
SupportsUDP: supportsUDP,
@@ -271,7 +268,7 @@ func ServicesResponseParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
}
func (m *_ServicesResponse) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4go/protocols/eip/readwrite/model/TransportType.go b/plc4go/protocols/eip/readwrite/model/TransportType.go
index 3343e91cc0..267c7b2e60 100644
--- a/plc4go/protocols/eip/readwrite/model/TransportType.go
+++ b/plc4go/protocols/eip/readwrite/model/TransportType.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -52,9 +51,6 @@ type _TransportType struct {
Direction bool
Trigger uint8
ClassTransport uint8
-
- // Arguments.
- Order IntegerEncoding
}
///////////////////////////////////////////////////////////
@@ -80,8 +76,8 @@ func (m *_TransportType) GetClassTransport() uint8 {
///////////////////////////////////////////////////////////
// NewTransportType factory function for _TransportType
-func NewTransportType(direction bool, trigger uint8, classTransport uint8, order IntegerEncoding) *_TransportType {
- return &_TransportType{Direction: direction, Trigger: trigger, ClassTransport: classTransport, Order: order}
+func NewTransportType(direction bool, trigger uint8, classTransport uint8) *_TransportType {
+ return &_TransportType{Direction: direction, Trigger: trigger, ClassTransport: classTransport}
}
// Deprecated: use the interface for direct cast
@@ -118,11 +114,11 @@ func (m *_TransportType) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func TransportTypeParse(theBytes []byte, order IntegerEncoding) (TransportType, error) {
- return TransportTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func TransportTypeParse(theBytes []byte) (TransportType, error) {
+ return TransportTypeParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func TransportTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (TransportType, error) {
+func TransportTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TransportType, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("TransportType"); pullErr != nil {
@@ -158,7 +154,6 @@ func TransportTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuff
// Create the instance
return &_TransportType{
- Order: order,
Direction: direction,
Trigger: trigger,
ClassTransport: classTransport,
@@ -166,7 +161,7 @@ func TransportTypeParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuff
}
func (m *_TransportType) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
@@ -207,16 +202,6 @@ func (m *_TransportType) SerializeWithWriteBuffer(ctx context.Context, writeBuff
return nil
}
-////
-// Arguments Getter
-
-func (m *_TransportType) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_TransportType) isTransportType() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/TypeId.go b/plc4go/protocols/eip/readwrite/model/TypeId.go
index 514c808af9..a20067145d 100644
--- a/plc4go/protocols/eip/readwrite/model/TypeId.go
+++ b/plc4go/protocols/eip/readwrite/model/TypeId.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -46,9 +45,6 @@ type TypeIdExactly interface {
// _TypeId is the data-structure of this message
type _TypeId struct {
_TypeIdChildRequirements
-
- // Arguments.
- Order IntegerEncoding
}
type _TypeIdChildRequirements interface {
@@ -72,8 +68,8 @@ type TypeIdChild interface {
}
// NewTypeId factory function for _TypeId
-func NewTypeId(order IntegerEncoding) *_TypeId {
- return &_TypeId{Order: order}
+func NewTypeId() *_TypeId {
+ return &_TypeId{}
}
// Deprecated: use the interface for direct cast
@@ -103,11 +99,11 @@ func (m *_TypeId) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func TypeIdParse(theBytes []byte, order IntegerEncoding) (TypeId, error) {
- return TypeIdParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func TypeIdParse(theBytes []byte) (TypeId, error) {
+ return TypeIdParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func TypeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (TypeId, error) {
+func TypeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (TypeId, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("TypeId"); pullErr != nil {
@@ -133,15 +129,15 @@ func TypeIdParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, ord
var typeSwitchError error
switch {
case id == 0x0000: // NullAddressItem
- _childTemp, typeSwitchError = NullAddressItemParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = NullAddressItemParseWithBuffer(ctx, readBuffer)
case id == 0x0100: // ServicesResponse
- _childTemp, typeSwitchError = ServicesResponseParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = ServicesResponseParseWithBuffer(ctx, readBuffer)
case id == 0x00A1: // ConnectedAddressItem
- _childTemp, typeSwitchError = ConnectedAddressItemParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = ConnectedAddressItemParseWithBuffer(ctx, readBuffer)
case id == 0x00B1: // ConnectedDataItem
- _childTemp, typeSwitchError = ConnectedDataItemParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = ConnectedDataItemParseWithBuffer(ctx, readBuffer)
case id == 0x00B2: // UnConnectedDataItem
- _childTemp, typeSwitchError = UnConnectedDataItemParseWithBuffer(ctx, readBuffer, order)
+ _childTemp, typeSwitchError = UnConnectedDataItemParseWithBuffer(ctx, readBuffer)
default:
typeSwitchError = errors.Errorf("Unmapped type for parameters [id=%v]", id)
}
@@ -188,16 +184,6 @@ func (pm *_TypeId) SerializeParent(ctx context.Context, writeBuffer utils.WriteB
return nil
}
-////
-// Arguments Getter
-
-func (m *_TypeId) GetOrder() IntegerEncoding {
- return m.Order
-}
-
-//
-////
-
func (m *_TypeId) isTypeId() bool {
return true
}
diff --git a/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go b/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
index 82a5efb116..1266b976cb 100644
--- a/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
+++ b/plc4go/protocols/eip/readwrite/model/UnConnectedDataItem.go
@@ -21,7 +21,6 @@ package model
import (
"context"
- "encoding/binary"
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/pkg/errors"
)
@@ -85,10 +84,10 @@ func (m *_UnConnectedDataItem) GetService() CipService {
///////////////////////////////////////////////////////////
// NewUnConnectedDataItem factory function for _UnConnectedDataItem
-func NewUnConnectedDataItem(service CipService, order IntegerEncoding) *_UnConnectedDataItem {
+func NewUnConnectedDataItem(service CipService) *_UnConnectedDataItem {
_result := &_UnConnectedDataItem{
Service: service,
- _TypeId: NewTypeId(order),
+ _TypeId: NewTypeId(),
}
_result._TypeId._TypeIdChildRequirements = _result
return _result
@@ -125,11 +124,11 @@ func (m *_UnConnectedDataItem) GetLengthInBytes(ctx context.Context) uint16 {
return m.GetLengthInBits(ctx) / 8
}
-func UnConnectedDataItemParse(theBytes []byte, order IntegerEncoding) (UnConnectedDataItem, error) {
- return UnConnectedDataItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes, utils.WithByteOrderForReadBufferByteBased((utils.InlineIf(bool((order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder))), order)
+func UnConnectedDataItemParse(theBytes []byte) (UnConnectedDataItem, error) {
+ return UnConnectedDataItemParseWithBuffer(context.Background(), utils.NewReadBufferByteBased(theBytes))
}
-func UnConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, order IntegerEncoding) (UnConnectedDataItem, error) {
+func UnConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (UnConnectedDataItem, error) {
positionAware := readBuffer
_ = positionAware
if pullErr := readBuffer.PullContext("UnConnectedDataItem"); pullErr != nil {
@@ -149,7 +148,7 @@ func UnConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Re
if pullErr := readBuffer.PullContext("service"); pullErr != nil {
return nil, errors.Wrap(pullErr, "Error pulling for service")
}
- _service, _serviceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(false)), uint16(packetSize), IntegerEncoding(order))
+ _service, _serviceErr := CipServiceParseWithBuffer(ctx, readBuffer, bool(bool(false)), uint16(packetSize))
if _serviceErr != nil {
return nil, errors.Wrap(_serviceErr, "Error parsing 'service' field of UnConnectedDataItem")
}
@@ -164,9 +163,7 @@ func UnConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Re
// Create a partially initialized instance
_child := &_UnConnectedDataItem{
- _TypeId: &_TypeId{
- Order: order,
- },
+ _TypeId: &_TypeId{},
Service: service,
}
_child._TypeId._TypeIdChildRequirements = _child
@@ -174,7 +171,7 @@ func UnConnectedDataItemParseWithBuffer(ctx context.Context, readBuffer utils.Re
}
func (m *_UnConnectedDataItem) Serialize() ([]byte, error) {
- wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))), utils.WithByteOrderForByteBasedBuffer((utils.InlineIf(bool((m.Order) == (IntegerEncoding_BIG_ENDIAN)), func() interface{} { return binary.ByteOrder(binary.BigEndian) }, func() interface{} { return binary.ByteOrder(binary.LittleEndian) })).(binary.ByteOrder)))
+ wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background()))))
if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
return nil, err
}
diff --git a/plc4j/drivers/eip/pom.xml b/plc4j/drivers/eip/pom.xml
index bb28db9f97..0a7ab6dc76 100644
--- a/plc4j/drivers/eip/pom.xml
+++ b/plc4j/drivers/eip/pom.xml
@@ -48,9 +48,9 @@
<languageName>java</languageName>
<outputFlavor>read-write</outputFlavor>
<outputDir>src/main/generated</outputDir>
- <options>
+ <!--options>
<generate-properties-for-parser-arguments>true</generate-properties-for-parser-arguments>
- </options>
+ </options-->
</configuration>
</execution>
</executions>
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java
index 49f8836ca2..6ce5a32fab 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java
@@ -46,14 +46,10 @@ public class AnsiExtendedSymbolSegment extends DataSegmentType implements Messag
protected final String symbol;
protected final Short pad;
- // Arguments.
- protected final IntegerEncoding order;
-
- public AnsiExtendedSymbolSegment(String symbol, Short pad, IntegerEncoding order) {
- super(order);
+ public AnsiExtendedSymbolSegment(String symbol, Short pad) {
+ super();
this.symbol = symbol;
this.pad = pad;
- this.order = order;
}
public String getSymbol() {
@@ -75,35 +71,13 @@ public class AnsiExtendedSymbolSegment extends DataSegmentType implements Messag
// Implicit Field (dataSize) (Used for parsing, but its value is not stored as it's implicitly
// given by the objects content)
short dataSize = (short) (STR_LEN(getSymbol()));
- writeImplicitField(
- "dataSize",
- dataSize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("dataSize", dataSize, writeUnsignedShort(writeBuffer, 8));
// Simple Field (symbol)
- writeSimpleField(
- "symbol",
- symbol,
- writeString(writeBuffer, (dataSize) * (8)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("symbol", symbol, writeString(writeBuffer, (dataSize) * (8)));
// Optional Field (pad) (Can be skipped, if the value is null)
- writeOptionalField(
- "pad",
- pad,
- writeUnsignedShort(writeBuffer, 8),
- ((STR_LEN(getSymbol())) % (2)) != (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeOptionalField("pad", pad, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("AnsiExtendedSymbolSegment");
}
@@ -133,63 +107,40 @@ public class AnsiExtendedSymbolSegment extends DataSegmentType implements Messag
return lengthInBits;
}
- public static DataSegmentTypeBuilder staticParseDataSegmentTypeBuilder(
- ReadBuffer readBuffer, IntegerEncoding order) throws ParseException {
+ public static DataSegmentTypeBuilder staticParseDataSegmentTypeBuilder(ReadBuffer readBuffer)
+ throws ParseException {
readBuffer.pullContext("AnsiExtendedSymbolSegment");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- short dataSize =
- readImplicitField(
- "dataSize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- String symbol =
- readSimpleField(
- "symbol",
- readString(readBuffer, (dataSize) * (8)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short dataSize = readImplicitField("dataSize", readUnsignedShort(readBuffer, 8));
+
+ String symbol = readSimpleField("symbol", readString(readBuffer, (dataSize) * (8)));
Short pad =
readOptionalField(
- "pad",
- readUnsignedShort(readBuffer, 8),
- ((STR_LEN(symbol)) % (2)) != (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "pad", readUnsignedShort(readBuffer, 8), ((STR_LEN(symbol)) % (2)) != (0));
readBuffer.closeContext("AnsiExtendedSymbolSegment");
// Create the instance
- return new AnsiExtendedSymbolSegmentBuilderImpl(symbol, pad, order);
+ return new AnsiExtendedSymbolSegmentBuilderImpl(symbol, pad);
}
public static class AnsiExtendedSymbolSegmentBuilderImpl
implements DataSegmentType.DataSegmentTypeBuilder {
private final String symbol;
private final Short pad;
- private final IntegerEncoding order;
- public AnsiExtendedSymbolSegmentBuilderImpl(String symbol, Short pad, IntegerEncoding order) {
+ public AnsiExtendedSymbolSegmentBuilderImpl(String symbol, Short pad) {
this.symbol = symbol;
this.pad = pad;
- this.order = order;
}
- public AnsiExtendedSymbolSegment build(IntegerEncoding order) {
-
+ public AnsiExtendedSymbolSegment build() {
AnsiExtendedSymbolSegment ansiExtendedSymbolSegment =
- new AnsiExtendedSymbolSegment(symbol, pad, order);
+ new AnsiExtendedSymbolSegment(symbol, pad);
return ansiExtendedSymbolSegment;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPAttributes.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPAttributes.java
index 98b5ea0319..dedc3cef98 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPAttributes.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPAttributes.java
@@ -43,21 +43,12 @@ public class CIPAttributes implements Message {
protected final int numberActive;
protected final byte[] data;
- // Arguments.
- protected final Integer packetLength;
-
- public CIPAttributes(
- List<Integer> classId,
- int numberAvailable,
- int numberActive,
- byte[] data,
- Integer packetLength) {
+ public CIPAttributes(List<Integer> classId, int numberAvailable, int numberActive, byte[] data) {
super();
this.classId = classId;
this.numberAvailable = numberAvailable;
this.numberActive = numberActive;
this.data = data;
- this.packetLength = packetLength;
}
public List<Integer> getClassId() {
@@ -179,7 +170,7 @@ public class CIPAttributes implements Message {
readBuffer.closeContext("CIPAttributes");
// Create the instance
CIPAttributes _cIPAttributes;
- _cIPAttributes = new CIPAttributes(classId, numberAvailable, numberActive, data, packetLength);
+ _cIPAttributes = new CIPAttributes(classId, numberAvailable, numberActive, data);
return _cIPAttributes;
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPData.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPData.java
index b66315d4d8..2dc98b722c 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPData.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPData.java
@@ -41,14 +41,10 @@ public class CIPData implements Message {
protected final CIPDataTypeCode dataType;
protected final byte[] data;
- // Arguments.
- protected final Integer packetLength;
-
- public CIPData(CIPDataTypeCode dataType, byte[] data, Integer packetLength) {
+ public CIPData(CIPDataTypeCode dataType, byte[] data) {
super();
this.dataType = dataType;
this.data = data;
- this.packetLength = packetLength;
}
public CIPDataTypeCode getDataType() {
@@ -140,7 +136,7 @@ public class CIPData implements Message {
readBuffer.closeContext("CIPData");
// Create the instance
CIPData _cIPData;
- _cIPData = new CIPData(dataType, data, packetLength);
+ _cIPData = new CIPData(dataType, data);
return _cIPData;
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPDataConnected.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPDataConnected.java
index 1dc7ed144a..870326e60b 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPDataConnected.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CIPDataConnected.java
@@ -41,14 +41,10 @@ public class CIPDataConnected implements Message {
protected final long value;
protected final int tagStatus;
- // Arguments.
- protected final Integer packetLength;
-
- public CIPDataConnected(long value, int tagStatus, Integer packetLength) {
+ public CIPDataConnected(long value, int tagStatus) {
super();
this.value = value;
this.tagStatus = tagStatus;
- this.packetLength = packetLength;
}
public long getValue() {
@@ -97,25 +93,10 @@ public class CIPDataConnected implements Message {
public static CIPDataConnected staticParse(ReadBuffer readBuffer, Object... args)
throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 1)) {
- throw new PlcRuntimeException(
- "Wrong number of arguments, expected 1, but got " + args.length);
- }
- Integer packetLength;
- if (args[0] instanceof Integer) {
- packetLength = (Integer) args[0];
- } else if (args[0] instanceof String) {
- packetLength = Integer.valueOf((String) args[0]);
- } else {
- throw new PlcRuntimeException(
- "Argument 0 expected to be of type Integer or a string which is parseable but was "
- + args[0].getClass().getName());
- }
- return staticParse(readBuffer, packetLength);
+ return staticParse(readBuffer);
}
- public static CIPDataConnected staticParse(ReadBuffer readBuffer, Integer packetLength)
- throws ParseException {
+ public static CIPDataConnected staticParse(ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("CIPDataConnected");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -129,7 +110,7 @@ public class CIPDataConnected implements Message {
readBuffer.closeContext("CIPDataConnected");
// Create the instance
CIPDataConnected _cIPDataConnected;
- _cIPDataConnected = new CIPDataConnected(value, tagStatus, packetLength);
+ _cIPDataConnected = new CIPDataConnected(value, tagStatus);
return _cIPDataConnected;
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java
index 07076e84c4..defd6d8b88 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java
@@ -53,15 +53,9 @@ public class CipConnectedRequest extends CipService implements Message {
// Properties.
protected final byte[] pathSegments;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipConnectedRequest(byte[] pathSegments, Integer serviceLen, IntegerEncoding order) {
- super(serviceLen, order);
+ public CipConnectedRequest(byte[] pathSegments) {
+ super();
this.pathSegments = pathSegments;
- this.serviceLen = serviceLen;
- this.order = order;
}
public byte[] getPathSegments() {
@@ -78,44 +72,16 @@ public class CipConnectedRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
short requestPathSize = (short) ((COUNT(getPathSegments())) / (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Array Field (pathSegments)
- writeByteArrayField(
- "pathSegments",
- pathSegments,
- writeByteArray(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeByteArrayField("pathSegments", pathSegments, writeByteArray(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (int) 0x0001,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (int) 0x0001, writeUnsignedInt(writeBuffer, 16));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (long) 0x00000000,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (long) 0x00000000, writeUnsignedLong(writeBuffer, 32));
writeBuffer.popContext("CipConnectedRequest");
}
@@ -149,73 +115,38 @@ public class CipConnectedRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectedRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- short requestPathSize =
- readImplicitField(
- "requestPathSize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
byte[] pathSegments =
- readBuffer.readByteArray(
- "pathSegments",
- Math.toIntExact((requestPathSize) * (2)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readBuffer.readByteArray("pathSegments", Math.toIntExact((requestPathSize) * (2)));
Integer reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedInt(readBuffer, 16),
- (int) 0x0001,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0001);
Long reservedField1 =
- readReservedField(
- "reserved",
- readUnsignedLong(readBuffer, 32),
- (long) 0x00000000,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedLong(readBuffer, 32), (long) 0x00000000);
readBuffer.closeContext("CipConnectedRequest");
// Create the instance
- return new CipConnectedRequestBuilderImpl(pathSegments, serviceLen, order);
+ return new CipConnectedRequestBuilderImpl(pathSegments);
}
public static class CipConnectedRequestBuilderImpl implements CipService.CipServiceBuilder {
private final byte[] pathSegments;
- private final Integer serviceLen;
- private final IntegerEncoding order;
- public CipConnectedRequestBuilderImpl(
- byte[] pathSegments, Integer serviceLen, IntegerEncoding order) {
+ public CipConnectedRequestBuilderImpl(byte[] pathSegments) {
this.pathSegments = pathSegments;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectedRequest build(Integer serviceLen, IntegerEncoding order) {
-
- CipConnectedRequest cipConnectedRequest =
- new CipConnectedRequest(pathSegments, serviceLen, order);
+ public CipConnectedRequest build() {
+ CipConnectedRequest cipConnectedRequest = new CipConnectedRequest(pathSegments);
return cipConnectedRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java
index d993e4d938..93f7225986 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java
@@ -55,22 +55,11 @@ public class CipConnectedResponse extends CipService implements Message {
protected final short additionalStatusWords;
protected final CIPDataConnected data;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipConnectedResponse(
- short status,
- short additionalStatusWords,
- CIPDataConnected data,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ public CipConnectedResponse(short status, short additionalStatusWords, CIPDataConnected data) {
+ super();
this.status = status;
this.additionalStatusWords = additionalStatusWords;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
public short getStatus() {
@@ -93,45 +82,17 @@ public class CipConnectedResponse extends CipService implements Message {
writeBuffer.pushContext("CipConnectedResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedShort(writeBuffer, 8));
// Simple Field (additionalStatusWords)
writeSimpleField(
- "additionalStatusWords",
- additionalStatusWords,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "additionalStatusWords", additionalStatusWords, writeUnsignedShort(writeBuffer, 8));
// Optional Field (data) (Can be skipped, if the value is null)
- writeOptionalField(
- "data",
- data,
- new DataWriterComplexDefault<>(writeBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeOptionalField("data", data, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("CipConnectedResponse");
}
@@ -165,8 +126,7 @@ public class CipConnectedResponse extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectedResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -174,74 +134,40 @@ public class CipConnectedResponse extends CipService implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Short reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short status =
- readSimpleField(
- "status",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
+
+ short status = readSimpleField("status", readUnsignedShort(readBuffer, 8));
short additionalStatusWords =
- readSimpleField(
- "additionalStatusWords",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("additionalStatusWords", readUnsignedShort(readBuffer, 8));
CIPDataConnected data =
readOptionalField(
"data",
new DataReaderComplexDefault<>(
- () -> CIPDataConnected.staticParse(readBuffer, (int) (serviceLen)), readBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> CIPDataConnected.staticParse(readBuffer), readBuffer),
+ (((serviceLen) - (4))) > (0));
readBuffer.closeContext("CipConnectedResponse");
// Create the instance
- return new CipConnectedResponseBuilderImpl(
- status, additionalStatusWords, data, serviceLen, order);
+ return new CipConnectedResponseBuilderImpl(status, additionalStatusWords, data);
}
public static class CipConnectedResponseBuilderImpl implements CipService.CipServiceBuilder {
private final short status;
private final short additionalStatusWords;
private final CIPDataConnected data;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipConnectedResponseBuilderImpl(
- short status,
- short additionalStatusWords,
- CIPDataConnected data,
- Integer serviceLen,
- IntegerEncoding order) {
+ short status, short additionalStatusWords, CIPDataConnected data) {
this.status = status;
this.additionalStatusWords = additionalStatusWords;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectedResponse build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipConnectedResponse build() {
CipConnectedResponse cipConnectedResponse =
- new CipConnectedResponse(status, additionalStatusWords, data, serviceLen, order);
+ new CipConnectedResponse(status, additionalStatusWords, data);
return cipConnectedResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java
index d3e6ef35cb..2c26e1084c 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java
@@ -51,7 +51,7 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
}
// Properties.
- protected final byte requestPathSize;
+ protected final short requestPathSize;
protected final PathSegment classSegment;
protected final PathSegment instanceSegment;
protected final byte priority;
@@ -63,12 +63,8 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
protected final short connectionPathSize;
protected final List<PathSegment> connectionPaths;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
public CipConnectionManagerCloseRequest(
- byte requestPathSize,
+ short requestPathSize,
PathSegment classSegment,
PathSegment instanceSegment,
byte priority,
@@ -78,10 +74,8 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
int originatorVendorId,
long originatorSerialNumber,
short connectionPathSize,
- List<PathSegment> connectionPaths,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ List<PathSegment> connectionPaths) {
+ super();
this.requestPathSize = requestPathSize;
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
@@ -93,11 +87,9 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
this.originatorSerialNumber = originatorSerialNumber;
this.connectionPathSize = connectionPathSize;
this.connectionPaths = connectionPaths;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public byte getRequestPathSize() {
+ public short getRequestPathSize() {
return requestPathSize;
}
@@ -149,124 +141,43 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
writeBuffer.pushContext("CipConnectionManagerCloseRequest");
// Simple Field (requestPathSize)
- writeSimpleField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Simple Field (classSegment)
- writeSimpleField(
- "classSegment",
- classSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("classSegment", classSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (instanceSegment)
writeSimpleField(
- "instanceSegment",
- instanceSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "instanceSegment", instanceSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (priority)
- writeSimpleField(
- "priority",
- priority,
- writeUnsignedByte(writeBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("priority", priority, writeUnsignedByte(writeBuffer, 4));
// Simple Field (tickTime)
- writeSimpleField(
- "tickTime",
- tickTime,
- writeUnsignedByte(writeBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("tickTime", tickTime, writeUnsignedByte(writeBuffer, 4));
// Simple Field (timeoutTicks)
- writeSimpleField(
- "timeoutTicks",
- timeoutTicks,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("timeoutTicks", timeoutTicks, writeUnsignedShort(writeBuffer, 8));
// Simple Field (connectionSerialNumber)
writeSimpleField(
- "connectionSerialNumber",
- connectionSerialNumber,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "connectionSerialNumber", connectionSerialNumber, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorVendorId)
- writeSimpleField(
- "originatorVendorId",
- originatorVendorId,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("originatorVendorId", originatorVendorId, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorSerialNumber)
writeSimpleField(
- "originatorSerialNumber",
- originatorSerialNumber,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "originatorSerialNumber", originatorSerialNumber, writeUnsignedLong(writeBuffer, 32));
// Simple Field (connectionPathSize)
- writeSimpleField(
- "connectionPathSize",
- connectionPathSize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("connectionPathSize", connectionPathSize, writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (byte) 0x00,
- writeByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (byte) 0x00, writeByte(writeBuffer, 8));
// Array Field (connectionPaths)
- writeComplexTypeArrayField(
- "connectionPaths",
- connectionPaths,
- writeBuffer,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeComplexTypeArrayField("connectionPaths", connectionPaths, writeBuffer);
writeBuffer.popContext("CipConnectionManagerCloseRequest");
}
@@ -326,129 +237,52 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectionManagerCloseRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readSimpleField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readSimpleField("requestPathSize", readUnsignedShort(readBuffer, 8));
PathSegment classSegment =
readSimpleField(
"classSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
PathSegment instanceSegment =
readSimpleField(
"instanceSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte priority =
- readSimpleField(
- "priority",
- readUnsignedByte(readBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte tickTime =
- readSimpleField(
- "tickTime",
- readUnsignedByte(readBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short timeoutTicks =
- readSimpleField(
- "timeoutTicks",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
+
+ byte priority = readSimpleField("priority", readUnsignedByte(readBuffer, 4));
+
+ byte tickTime = readSimpleField("tickTime", readUnsignedByte(readBuffer, 4));
+
+ short timeoutTicks = readSimpleField("timeoutTicks", readUnsignedShort(readBuffer, 8));
int connectionSerialNumber =
- readSimpleField(
- "connectionSerialNumber",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int originatorVendorId =
- readSimpleField(
- "originatorVendorId",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionSerialNumber", readUnsignedInt(readBuffer, 16));
+
+ int originatorVendorId = readSimpleField("originatorVendorId", readUnsignedInt(readBuffer, 16));
long originatorSerialNumber =
- readSimpleField(
- "originatorSerialNumber",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("originatorSerialNumber", readUnsignedLong(readBuffer, 32));
short connectionPathSize =
- readSimpleField(
- "connectionPathSize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- Byte reservedField0 =
- readReservedField(
- "reserved",
- readByte(readBuffer, 8),
- (byte) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionPathSize", readUnsignedShort(readBuffer, 8));
+
+ Byte reservedField0 = readReservedField("reserved", readByte(readBuffer, 8), (byte) 0x00);
List<PathSegment> connectionPaths =
readTerminatedArrayField(
"connectionPaths",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer),
() ->
((boolean)
(org.apache.plc4x.java.eip.readwrite.utils.StaticHelper.noMorePathSegments(
- readBuffer, order))),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readBuffer))));
readBuffer.closeContext("CipConnectionManagerCloseRequest");
// Create the instance
@@ -463,14 +297,12 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
originatorVendorId,
originatorSerialNumber,
connectionPathSize,
- connectionPaths,
- serviceLen,
- order);
+ connectionPaths);
}
public static class CipConnectionManagerCloseRequestBuilderImpl
implements CipService.CipServiceBuilder {
- private final byte requestPathSize;
+ private final short requestPathSize;
private final PathSegment classSegment;
private final PathSegment instanceSegment;
private final byte priority;
@@ -481,11 +313,9 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
private final long originatorSerialNumber;
private final short connectionPathSize;
private final List<PathSegment> connectionPaths;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipConnectionManagerCloseRequestBuilderImpl(
- byte requestPathSize,
+ short requestPathSize,
PathSegment classSegment,
PathSegment instanceSegment,
byte priority,
@@ -495,9 +325,7 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
int originatorVendorId,
long originatorSerialNumber,
short connectionPathSize,
- List<PathSegment> connectionPaths,
- Integer serviceLen,
- IntegerEncoding order) {
+ List<PathSegment> connectionPaths) {
this.requestPathSize = requestPathSize;
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
@@ -509,12 +337,9 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
this.originatorSerialNumber = originatorSerialNumber;
this.connectionPathSize = connectionPathSize;
this.connectionPaths = connectionPaths;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectionManagerCloseRequest build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipConnectionManagerCloseRequest build() {
CipConnectionManagerCloseRequest cipConnectionManagerCloseRequest =
new CipConnectionManagerCloseRequest(
requestPathSize,
@@ -527,9 +352,7 @@ public class CipConnectionManagerCloseRequest extends CipService implements Mess
originatorVendorId,
originatorSerialNumber,
connectionPathSize,
- connectionPaths,
- serviceLen,
- order);
+ connectionPaths);
return cipConnectionManagerCloseRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java
index 8f1c033618..ac396c5b5d 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java
@@ -58,28 +58,20 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
protected final long originatorSerialNumber;
protected final short applicationReplySize;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
public CipConnectionManagerCloseResponse(
short status,
short additionalStatusWords,
int connectionSerialNumber,
int originatorVendorId,
long originatorSerialNumber,
- short applicationReplySize,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ short applicationReplySize) {
+ super();
this.status = status;
this.additionalStatusWords = additionalStatusWords;
this.connectionSerialNumber = connectionSerialNumber;
this.originatorVendorId = originatorVendorId;
this.originatorSerialNumber = originatorSerialNumber;
this.applicationReplySize = applicationReplySize;
- this.serviceLen = serviceLen;
- this.order = order;
}
public short getStatus() {
@@ -114,84 +106,32 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
writeBuffer.pushContext("CipConnectionManagerCloseResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedShort(writeBuffer, 8));
// Simple Field (additionalStatusWords)
writeSimpleField(
- "additionalStatusWords",
- additionalStatusWords,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "additionalStatusWords", additionalStatusWords, writeUnsignedShort(writeBuffer, 8));
// Simple Field (connectionSerialNumber)
writeSimpleField(
- "connectionSerialNumber",
- connectionSerialNumber,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "connectionSerialNumber", connectionSerialNumber, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorVendorId)
- writeSimpleField(
- "originatorVendorId",
- originatorVendorId,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("originatorVendorId", originatorVendorId, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorSerialNumber)
writeSimpleField(
- "originatorSerialNumber",
- originatorSerialNumber,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "originatorSerialNumber", originatorSerialNumber, writeUnsignedLong(writeBuffer, 32));
// Simple Field (applicationReplySize)
writeSimpleField(
- "applicationReplySize",
- applicationReplySize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "applicationReplySize", applicationReplySize, writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("CipConnectionManagerCloseResponse");
}
@@ -235,8 +175,7 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectionManagerCloseResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -244,78 +183,26 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Short reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short status =
- readSimpleField(
- "status",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
+
+ short status = readSimpleField("status", readUnsignedShort(readBuffer, 8));
short additionalStatusWords =
- readSimpleField(
- "additionalStatusWords",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("additionalStatusWords", readUnsignedShort(readBuffer, 8));
int connectionSerialNumber =
- readSimpleField(
- "connectionSerialNumber",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int originatorVendorId =
- readSimpleField(
- "originatorVendorId",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionSerialNumber", readUnsignedInt(readBuffer, 16));
+
+ int originatorVendorId = readSimpleField("originatorVendorId", readUnsignedInt(readBuffer, 16));
long originatorSerialNumber =
- readSimpleField(
- "originatorSerialNumber",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("originatorSerialNumber", readUnsignedLong(readBuffer, 32));
short applicationReplySize =
- readSimpleField(
- "applicationReplySize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("applicationReplySize", readUnsignedShort(readBuffer, 8));
Short reservedField1 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
readBuffer.closeContext("CipConnectionManagerCloseResponse");
// Create the instance
@@ -325,9 +212,7 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
connectionSerialNumber,
originatorVendorId,
originatorSerialNumber,
- applicationReplySize,
- serviceLen,
- order);
+ applicationReplySize);
}
public static class CipConnectionManagerCloseResponseBuilderImpl
@@ -338,8 +223,6 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
private final int originatorVendorId;
private final long originatorSerialNumber;
private final short applicationReplySize;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipConnectionManagerCloseResponseBuilderImpl(
short status,
@@ -347,21 +230,16 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
int connectionSerialNumber,
int originatorVendorId,
long originatorSerialNumber,
- short applicationReplySize,
- Integer serviceLen,
- IntegerEncoding order) {
+ short applicationReplySize) {
this.status = status;
this.additionalStatusWords = additionalStatusWords;
this.connectionSerialNumber = connectionSerialNumber;
this.originatorVendorId = originatorVendorId;
this.originatorSerialNumber = originatorSerialNumber;
this.applicationReplySize = applicationReplySize;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectionManagerCloseResponse build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipConnectionManagerCloseResponse build() {
CipConnectionManagerCloseResponse cipConnectionManagerCloseResponse =
new CipConnectionManagerCloseResponse(
status,
@@ -369,9 +247,7 @@ public class CipConnectionManagerCloseResponse extends CipService implements Mes
connectionSerialNumber,
originatorVendorId,
originatorSerialNumber,
- applicationReplySize,
- serviceLen,
- order);
+ applicationReplySize);
return cipConnectionManagerCloseResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java
index 8b4e2607da..dea80d32ad 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java
@@ -70,10 +70,6 @@ public class CipConnectionManagerRequest extends CipService implements Message {
protected final short connectionPathSize;
protected final List<PathSegment> connectionPaths;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
public CipConnectionManagerRequest(
PathSegment classSegment,
PathSegment instanceSegment,
@@ -92,10 +88,8 @@ public class CipConnectionManagerRequest extends CipService implements Message {
NetworkConnectionParameters toConnectionParameters,
TransportType transportType,
short connectionPathSize,
- List<PathSegment> connectionPaths,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ List<PathSegment> connectionPaths) {
+ super();
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
this.priority = priority;
@@ -114,8 +108,6 @@ public class CipConnectionManagerRequest extends CipService implements Message {
this.transportType = transportType;
this.connectionPathSize = connectionPathSize;
this.connectionPaths = connectionPaths;
- this.serviceLen = serviceLen;
- this.order = order;
}
public PathSegment getClassSegment() {
@@ -199,208 +191,77 @@ public class CipConnectionManagerRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- byte requestPathSize =
- (byte)
+ short requestPathSize =
+ (short)
((((getClassSegment().getLengthInBytes()) + (getInstanceSegment().getLengthInBytes())))
/ (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Simple Field (classSegment)
- writeSimpleField(
- "classSegment",
- classSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("classSegment", classSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (instanceSegment)
writeSimpleField(
- "instanceSegment",
- instanceSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "instanceSegment", instanceSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (priority)
- writeSimpleField(
- "priority",
- priority,
- writeUnsignedByte(writeBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("priority", priority, writeUnsignedByte(writeBuffer, 4));
// Simple Field (tickTime)
- writeSimpleField(
- "tickTime",
- tickTime,
- writeUnsignedByte(writeBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("tickTime", tickTime, writeUnsignedByte(writeBuffer, 4));
// Simple Field (timeoutTicks)
- writeSimpleField(
- "timeoutTicks",
- timeoutTicks,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("timeoutTicks", timeoutTicks, writeUnsignedShort(writeBuffer, 8));
// Simple Field (otConnectionId)
- writeSimpleField(
- "otConnectionId",
- otConnectionId,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("otConnectionId", otConnectionId, writeUnsignedLong(writeBuffer, 32));
// Simple Field (toConnectionId)
- writeSimpleField(
- "toConnectionId",
- toConnectionId,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("toConnectionId", toConnectionId, writeUnsignedLong(writeBuffer, 32));
// Simple Field (connectionSerialNumber)
writeSimpleField(
- "connectionSerialNumber",
- connectionSerialNumber,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "connectionSerialNumber", connectionSerialNumber, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorVendorId)
- writeSimpleField(
- "originatorVendorId",
- originatorVendorId,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("originatorVendorId", originatorVendorId, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorSerialNumber)
writeSimpleField(
- "originatorSerialNumber",
- originatorSerialNumber,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "originatorSerialNumber", originatorSerialNumber, writeUnsignedLong(writeBuffer, 32));
// Simple Field (timeoutMultiplier)
- writeSimpleField(
- "timeoutMultiplier",
- timeoutMultiplier,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("timeoutMultiplier", timeoutMultiplier, writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (long) 0x000000,
- writeUnsignedLong(writeBuffer, 24),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (long) 0x000000, writeUnsignedLong(writeBuffer, 24));
// Simple Field (otRpi)
- writeSimpleField(
- "otRpi",
- otRpi,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("otRpi", otRpi, writeUnsignedLong(writeBuffer, 32));
// Simple Field (otConnectionParameters)
writeSimpleField(
"otConnectionParameters",
otConnectionParameters,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (toRpi)
- writeSimpleField(
- "toRpi",
- toRpi,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("toRpi", toRpi, writeUnsignedLong(writeBuffer, 32));
// Simple Field (toConnectionParameters)
writeSimpleField(
"toConnectionParameters",
toConnectionParameters,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (transportType)
- writeSimpleField(
- "transportType",
- transportType,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("transportType", transportType, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (connectionPathSize)
- writeSimpleField(
- "connectionPathSize",
- connectionPathSize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("connectionPathSize", connectionPathSize, writeUnsignedShort(writeBuffer, 8));
// Array Field (connectionPaths)
- writeComplexTypeArrayField(
- "connectionPaths",
- connectionPaths,
- writeBuffer,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeComplexTypeArrayField("connectionPaths", connectionPaths, writeBuffer);
writeBuffer.popContext("CipConnectionManagerRequest");
}
@@ -484,208 +345,82 @@ public class CipConnectionManagerRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectionManagerRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readImplicitField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
PathSegment classSegment =
readSimpleField(
"classSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
PathSegment instanceSegment =
readSimpleField(
"instanceSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
- byte priority =
- readSimpleField(
- "priority",
- readUnsignedByte(readBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte tickTime =
- readSimpleField(
- "tickTime",
- readUnsignedByte(readBuffer, 4),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short timeoutTicks =
- readSimpleField(
- "timeoutTicks",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long otConnectionId =
- readSimpleField(
- "otConnectionId",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long toConnectionId =
- readSimpleField(
- "toConnectionId",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ byte priority = readSimpleField("priority", readUnsignedByte(readBuffer, 4));
+
+ byte tickTime = readSimpleField("tickTime", readUnsignedByte(readBuffer, 4));
+
+ short timeoutTicks = readSimpleField("timeoutTicks", readUnsignedShort(readBuffer, 8));
+
+ long otConnectionId = readSimpleField("otConnectionId", readUnsignedLong(readBuffer, 32));
+
+ long toConnectionId = readSimpleField("toConnectionId", readUnsignedLong(readBuffer, 32));
int connectionSerialNumber =
- readSimpleField(
- "connectionSerialNumber",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int originatorVendorId =
- readSimpleField(
- "originatorVendorId",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionSerialNumber", readUnsignedInt(readBuffer, 16));
+
+ int originatorVendorId = readSimpleField("originatorVendorId", readUnsignedInt(readBuffer, 16));
long originatorSerialNumber =
- readSimpleField(
- "originatorSerialNumber",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("originatorSerialNumber", readUnsignedLong(readBuffer, 32));
short timeoutMultiplier =
- readSimpleField(
- "timeoutMultiplier",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("timeoutMultiplier", readUnsignedShort(readBuffer, 8));
Long reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedLong(readBuffer, 24),
- (long) 0x000000,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long otRpi =
- readSimpleField(
- "otRpi",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedLong(readBuffer, 24), (long) 0x000000);
+
+ long otRpi = readSimpleField("otRpi", readUnsignedLong(readBuffer, 32));
NetworkConnectionParameters otConnectionParameters =
readSimpleField(
"otConnectionParameters",
new DataReaderComplexDefault<>(
- () ->
- NetworkConnectionParameters.staticParse(readBuffer, (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long toRpi =
- readSimpleField(
- "toRpi",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> NetworkConnectionParameters.staticParse(readBuffer), readBuffer));
+
+ long toRpi = readSimpleField("toRpi", readUnsignedLong(readBuffer, 32));
NetworkConnectionParameters toConnectionParameters =
readSimpleField(
"toConnectionParameters",
new DataReaderComplexDefault<>(
- () ->
- NetworkConnectionParameters.staticParse(readBuffer, (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> NetworkConnectionParameters.staticParse(readBuffer), readBuffer));
TransportType transportType =
readSimpleField(
"transportType",
new DataReaderComplexDefault<>(
- () -> TransportType.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> TransportType.staticParse(readBuffer), readBuffer));
short connectionPathSize =
- readSimpleField(
- "connectionPathSize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionPathSize", readUnsignedShort(readBuffer, 8));
List<PathSegment> connectionPaths =
readTerminatedArrayField(
"connectionPaths",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer),
() ->
((boolean)
(org.apache.plc4x.java.eip.readwrite.utils.StaticHelper.noMorePathSegments(
- readBuffer, order))),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readBuffer))));
readBuffer.closeContext("CipConnectionManagerRequest");
// Create the instance
@@ -707,9 +442,7 @@ public class CipConnectionManagerRequest extends CipService implements Message {
toConnectionParameters,
transportType,
connectionPathSize,
- connectionPaths,
- serviceLen,
- order);
+ connectionPaths);
}
public static class CipConnectionManagerRequestBuilderImpl
@@ -732,8 +465,6 @@ public class CipConnectionManagerRequest extends CipService implements Message {
private final TransportType transportType;
private final short connectionPathSize;
private final List<PathSegment> connectionPaths;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipConnectionManagerRequestBuilderImpl(
PathSegment classSegment,
@@ -753,9 +484,7 @@ public class CipConnectionManagerRequest extends CipService implements Message {
NetworkConnectionParameters toConnectionParameters,
TransportType transportType,
short connectionPathSize,
- List<PathSegment> connectionPaths,
- Integer serviceLen,
- IntegerEncoding order) {
+ List<PathSegment> connectionPaths) {
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
this.priority = priority;
@@ -774,12 +503,9 @@ public class CipConnectionManagerRequest extends CipService implements Message {
this.transportType = transportType;
this.connectionPathSize = connectionPathSize;
this.connectionPaths = connectionPaths;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectionManagerRequest build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipConnectionManagerRequest build() {
CipConnectionManagerRequest cipConnectionManagerRequest =
new CipConnectionManagerRequest(
classSegment,
@@ -799,9 +525,7 @@ public class CipConnectionManagerRequest extends CipService implements Message {
toConnectionParameters,
transportType,
connectionPathSize,
- connectionPaths,
- serviceLen,
- order);
+ connectionPaths);
return cipConnectionManagerRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java
index d1c5dc40f2..88784a1017 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java
@@ -59,10 +59,6 @@ public class CipConnectionManagerResponse extends CipService implements Message
protected final long otApi;
protected final long toApi;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
public CipConnectionManagerResponse(
long otConnectionId,
long toConnectionId,
@@ -70,10 +66,8 @@ public class CipConnectionManagerResponse extends CipService implements Message
int originatorVendorId,
long originatorSerialNumber,
long otApi,
- long toApi,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ long toApi) {
+ super();
this.otConnectionId = otConnectionId;
this.toConnectionId = toConnectionId;
this.connectionSerialNumber = connectionSerialNumber;
@@ -81,8 +75,6 @@ public class CipConnectionManagerResponse extends CipService implements Message
this.originatorSerialNumber = originatorSerialNumber;
this.otApi = otApi;
this.toApi = toApi;
- this.serviceLen = serviceLen;
- this.order = order;
}
public long getOtConnectionId() {
@@ -121,106 +113,38 @@ public class CipConnectionManagerResponse extends CipService implements Message
writeBuffer.pushContext("CipConnectionManagerResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (long) 0x000000,
- writeUnsignedLong(writeBuffer, 24),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (long) 0x000000, writeUnsignedLong(writeBuffer, 24));
// Simple Field (otConnectionId)
- writeSimpleField(
- "otConnectionId",
- otConnectionId,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("otConnectionId", otConnectionId, writeUnsignedLong(writeBuffer, 32));
// Simple Field (toConnectionId)
- writeSimpleField(
- "toConnectionId",
- toConnectionId,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("toConnectionId", toConnectionId, writeUnsignedLong(writeBuffer, 32));
// Simple Field (connectionSerialNumber)
writeSimpleField(
- "connectionSerialNumber",
- connectionSerialNumber,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "connectionSerialNumber", connectionSerialNumber, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorVendorId)
- writeSimpleField(
- "originatorVendorId",
- originatorVendorId,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("originatorVendorId", originatorVendorId, writeUnsignedInt(writeBuffer, 16));
// Simple Field (originatorSerialNumber)
writeSimpleField(
- "originatorSerialNumber",
- originatorSerialNumber,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "originatorSerialNumber", originatorSerialNumber, writeUnsignedLong(writeBuffer, 32));
// Simple Field (otApi)
- writeSimpleField(
- "otApi",
- otApi,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("otApi", otApi, writeUnsignedLong(writeBuffer, 32));
// Simple Field (toApi)
- writeSimpleField(
- "toApi",
- toApi,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("toApi", toApi, writeUnsignedLong(writeBuffer, 32));
// Implicit Field (replySize) (Used for parsing, but its value is not stored as it's implicitly
// given by the objects content)
- short replySize = (short) ((serviceLen) - (30));
- writeImplicitField(
- "replySize",
- replySize,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short replySize = (short) ((getLengthInBytes()) - (30));
+ writeImplicitField("replySize", replySize, writeUnsignedShort(writeBuffer, 8));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("CipConnectionManagerResponse");
}
@@ -270,8 +194,7 @@ public class CipConnectionManagerResponse extends CipService implements Message
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipConnectionManagerResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -279,96 +202,28 @@ public class CipConnectionManagerResponse extends CipService implements Message
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Long reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedLong(readBuffer, 24),
- (long) 0x000000,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long otConnectionId =
- readSimpleField(
- "otConnectionId",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long toConnectionId =
- readSimpleField(
- "toConnectionId",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedLong(readBuffer, 24), (long) 0x000000);
+
+ long otConnectionId = readSimpleField("otConnectionId", readUnsignedLong(readBuffer, 32));
+
+ long toConnectionId = readSimpleField("toConnectionId", readUnsignedLong(readBuffer, 32));
int connectionSerialNumber =
- readSimpleField(
- "connectionSerialNumber",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int originatorVendorId =
- readSimpleField(
- "originatorVendorId",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("connectionSerialNumber", readUnsignedInt(readBuffer, 16));
+
+ int originatorVendorId = readSimpleField("originatorVendorId", readUnsignedInt(readBuffer, 16));
long originatorSerialNumber =
- readSimpleField(
- "originatorSerialNumber",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long otApi =
- readSimpleField(
- "otApi",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long toApi =
- readSimpleField(
- "toApi",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short replySize =
- readImplicitField(
- "replySize",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("originatorSerialNumber", readUnsignedLong(readBuffer, 32));
+
+ long otApi = readSimpleField("otApi", readUnsignedLong(readBuffer, 32));
+
+ long toApi = readSimpleField("toApi", readUnsignedLong(readBuffer, 32));
+
+ short replySize = readImplicitField("replySize", readUnsignedShort(readBuffer, 8));
Short reservedField1 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
readBuffer.closeContext("CipConnectionManagerResponse");
// Create the instance
@@ -379,9 +234,7 @@ public class CipConnectionManagerResponse extends CipService implements Message
originatorVendorId,
originatorSerialNumber,
otApi,
- toApi,
- serviceLen,
- order);
+ toApi);
}
public static class CipConnectionManagerResponseBuilderImpl
@@ -393,8 +246,6 @@ public class CipConnectionManagerResponse extends CipService implements Message
private final long originatorSerialNumber;
private final long otApi;
private final long toApi;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipConnectionManagerResponseBuilderImpl(
long otConnectionId,
@@ -403,9 +254,7 @@ public class CipConnectionManagerResponse extends CipService implements Message
int originatorVendorId,
long originatorSerialNumber,
long otApi,
- long toApi,
- Integer serviceLen,
- IntegerEncoding order) {
+ long toApi) {
this.otConnectionId = otConnectionId;
this.toConnectionId = toConnectionId;
this.connectionSerialNumber = connectionSerialNumber;
@@ -413,12 +262,9 @@ public class CipConnectionManagerResponse extends CipService implements Message
this.originatorSerialNumber = originatorSerialNumber;
this.otApi = otApi;
this.toApi = toApi;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipConnectionManagerResponse build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipConnectionManagerResponse build() {
CipConnectionManagerResponse cipConnectionManagerResponse =
new CipConnectionManagerResponse(
otConnectionId,
@@ -427,9 +273,7 @@ public class CipConnectionManagerResponse extends CipService implements Message
originatorVendorId,
originatorSerialNumber,
otApi,
- toApi,
- serviceLen,
- order);
+ toApi);
return cipConnectionManagerResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipRRData.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipRRData.java
index 3065a5d339..58b77f0f22 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipRRData.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipRRData.java
@@ -56,9 +56,6 @@ public class CipRRData extends EipPacket implements Message {
protected final int itemCount;
protected final List<TypeId> typeId;
- // Arguments.
- protected final IntegerEncoding order;
-
public CipRRData(
long sessionHandle,
long status,
@@ -67,14 +64,12 @@ public class CipRRData extends EipPacket implements Message {
long interfaceHandle,
int timeout,
int itemCount,
- List<TypeId> typeId,
- IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
+ List<TypeId> typeId) {
+ super(sessionHandle, status, senderContext, options);
this.interfaceHandle = interfaceHandle;
this.timeout = timeout;
this.itemCount = itemCount;
this.typeId = typeId;
- this.order = order;
}
public long getInterfaceHandle() {
@@ -101,44 +96,16 @@ public class CipRRData extends EipPacket implements Message {
writeBuffer.pushContext("CipRRData");
// Simple Field (interfaceHandle)
- writeSimpleField(
- "interfaceHandle",
- interfaceHandle,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("interfaceHandle", interfaceHandle, writeUnsignedLong(writeBuffer, 32));
// Simple Field (timeout)
- writeSimpleField(
- "timeout",
- timeout,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("timeout", timeout, writeUnsignedInt(writeBuffer, 16));
// Simple Field (itemCount)
- writeSimpleField(
- "itemCount",
- itemCount,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("itemCount", itemCount, writeUnsignedInt(writeBuffer, 16));
// Array Field (typeId)
- writeComplexTypeArrayField(
- "typeId",
- typeId,
- writeBuffer,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeComplexTypeArrayField("typeId", typeId, writeBuffer);
writeBuffer.popContext("CipRRData");
}
@@ -176,54 +143,28 @@ public class CipRRData extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("CipRRData");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- long interfaceHandle =
- readSimpleField(
- "interfaceHandle",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int timeout =
- readSimpleField(
- "timeout",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int itemCount =
- readSimpleField(
- "itemCount",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ long interfaceHandle = readSimpleField("interfaceHandle", readUnsignedLong(readBuffer, 32));
+
+ int timeout = readSimpleField("timeout", readUnsignedInt(readBuffer, 16));
+
+ int itemCount = readSimpleField("itemCount", readUnsignedInt(readBuffer, 16));
List<TypeId> typeId =
readCountArrayField(
"typeId",
- new DataReaderComplexDefault<>(
- () -> TypeId.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- itemCount,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> TypeId.staticParse(readBuffer), readBuffer),
+ itemCount);
readBuffer.closeContext("CipRRData");
// Create the instance
- return new CipRRDataBuilderImpl(interfaceHandle, timeout, itemCount, typeId, order);
+ return new CipRRDataBuilderImpl(interfaceHandle, timeout, itemCount, typeId);
}
public static class CipRRDataBuilderImpl implements EipPacket.EipPacketBuilder {
@@ -231,27 +172,16 @@ public class CipRRData extends EipPacket implements Message {
private final int timeout;
private final int itemCount;
private final List<TypeId> typeId;
- private final IntegerEncoding order;
public CipRRDataBuilderImpl(
- long interfaceHandle,
- int timeout,
- int itemCount,
- List<TypeId> typeId,
- IntegerEncoding order) {
+ long interfaceHandle, int timeout, int itemCount, List<TypeId> typeId) {
this.interfaceHandle = interfaceHandle;
this.timeout = timeout;
this.itemCount = itemCount;
this.typeId = typeId;
- this.order = order;
}
- public CipRRData build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ public CipRRData build(long sessionHandle, long status, byte[] senderContext, long options) {
CipRRData cipRRData =
new CipRRData(
sessionHandle,
@@ -261,8 +191,7 @@ public class CipRRData extends EipPacket implements Message {
interfaceHandle,
timeout,
itemCount,
- typeId,
- order);
+ typeId);
return cipRRData;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java
index fc5ee216fa..8076419c9f 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java
@@ -54,16 +54,10 @@ public class CipReadRequest extends CipService implements Message {
protected final byte[] tag;
protected final int elementNb;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipReadRequest(byte[] tag, int elementNb, Integer serviceLen, IntegerEncoding order) {
- super(serviceLen, order);
+ public CipReadRequest(byte[] tag, int elementNb) {
+ super();
this.tag = tag;
this.elementNb = elementNb;
- this.serviceLen = serviceLen;
- this.order = order;
}
public byte[] getTag() {
@@ -83,35 +77,14 @@ public class CipReadRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- byte requestPathSize = (byte) ((COUNT(getTag())) / (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = (short) ((COUNT(getTag())) / (2));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Array Field (tag)
- writeByteArrayField(
- "tag",
- tag,
- writeByteArray(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeByteArrayField("tag", tag, writeByteArray(writeBuffer, 8));
// Simple Field (elementNb)
- writeSimpleField(
- "elementNb",
- elementNb,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("elementNb", elementNb, writeUnsignedInt(writeBuffer, 16));
writeBuffer.popContext("CipReadRequest");
}
@@ -142,63 +115,35 @@ public class CipReadRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipReadRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readImplicitField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte[] tag =
- readBuffer.readByteArray(
- "tag",
- Math.toIntExact(((requestPathSize) * (2))),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int elementNb =
- readSimpleField(
- "elementNb",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
+
+ byte[] tag = readBuffer.readByteArray("tag", Math.toIntExact(((requestPathSize) * (2))));
+
+ int elementNb = readSimpleField("elementNb", readUnsignedInt(readBuffer, 16));
readBuffer.closeContext("CipReadRequest");
// Create the instance
- return new CipReadRequestBuilderImpl(tag, elementNb, serviceLen, order);
+ return new CipReadRequestBuilderImpl(tag, elementNb);
}
public static class CipReadRequestBuilderImpl implements CipService.CipServiceBuilder {
private final byte[] tag;
private final int elementNb;
- private final Integer serviceLen;
- private final IntegerEncoding order;
- public CipReadRequestBuilderImpl(
- byte[] tag, int elementNb, Integer serviceLen, IntegerEncoding order) {
+ public CipReadRequestBuilderImpl(byte[] tag, int elementNb) {
this.tag = tag;
this.elementNb = elementNb;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipReadRequest build(Integer serviceLen, IntegerEncoding order) {
-
- CipReadRequest cipReadRequest = new CipReadRequest(tag, elementNb, serviceLen, order);
+ public CipReadRequest build() {
+ CipReadRequest cipReadRequest = new CipReadRequest(tag, elementNb);
return cipReadRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java
index 76de832869..1fa2a10f4f 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java
@@ -55,18 +55,11 @@ public class CipReadResponse extends CipService implements Message {
protected final short extStatus;
protected final CIPData data;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipReadResponse(
- short status, short extStatus, CIPData data, Integer serviceLen, IntegerEncoding order) {
- super(serviceLen, order);
+ public CipReadResponse(short status, short extStatus, CIPData data) {
+ super();
this.status = status;
this.extStatus = extStatus;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
public short getStatus() {
@@ -89,45 +82,16 @@ public class CipReadResponse extends CipService implements Message {
writeBuffer.pushContext("CipReadResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedShort(writeBuffer, 8));
// Simple Field (extStatus)
- writeSimpleField(
- "extStatus",
- extStatus,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("extStatus", extStatus, writeUnsignedShort(writeBuffer, 8));
// Optional Field (data) (Can be skipped, if the value is null)
- writeOptionalField(
- "data",
- data,
- new DataWriterComplexDefault<>(writeBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeOptionalField("data", data, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("CipReadResponse");
}
@@ -161,8 +125,7 @@ public class CipReadResponse extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipReadResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -170,69 +133,37 @@ public class CipReadResponse extends CipService implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Short reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short status =
- readSimpleField(
- "status",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short extStatus =
- readSimpleField(
- "extStatus",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
+
+ short status = readSimpleField("status", readUnsignedShort(readBuffer, 8));
+
+ short extStatus = readSimpleField("extStatus", readUnsignedShort(readBuffer, 8));
CIPData data =
readOptionalField(
"data",
new DataReaderComplexDefault<>(
() -> CIPData.staticParse(readBuffer, (int) ((serviceLen) - (4))), readBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ (((serviceLen) - (4))) > (0));
readBuffer.closeContext("CipReadResponse");
// Create the instance
- return new CipReadResponseBuilderImpl(status, extStatus, data, serviceLen, order);
+ return new CipReadResponseBuilderImpl(status, extStatus, data);
}
public static class CipReadResponseBuilderImpl implements CipService.CipServiceBuilder {
private final short status;
private final short extStatus;
private final CIPData data;
- private final Integer serviceLen;
- private final IntegerEncoding order;
- public CipReadResponseBuilderImpl(
- short status, short extStatus, CIPData data, Integer serviceLen, IntegerEncoding order) {
+ public CipReadResponseBuilderImpl(short status, short extStatus, CIPData data) {
this.status = status;
this.extStatus = extStatus;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipReadResponse build(Integer serviceLen, IntegerEncoding order) {
-
- CipReadResponse cipReadResponse =
- new CipReadResponse(status, extStatus, data, serviceLen, order);
+ public CipReadResponse build() {
+ CipReadResponse cipReadResponse = new CipReadResponse(status, extStatus, data);
return cipReadResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java
index efac71b088..964e55cede 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java
@@ -44,14 +44,8 @@ public abstract class CipService implements Message {
public abstract Short getService();
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipService(Integer serviceLen, IntegerEncoding order) {
+ public CipService() {
super();
- this.serviceLen = serviceLen;
- this.order = order;
}
protected abstract void serializeCipServiceChild(WriteBuffer writeBuffer)
@@ -64,24 +58,10 @@ public abstract class CipService implements Message {
writeBuffer.pushContext("CipService");
// Discriminator Field (response) (Used as input to a switch field)
- writeDiscriminatorField(
- "response",
- getResponse(),
- writeBoolean(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeDiscriminatorField("response", getResponse(), writeBoolean(writeBuffer));
// Discriminator Field (service) (Used as input to a switch field)
- writeDiscriminatorField(
- "service",
- getService(),
- writeUnsignedShort(writeBuffer, 7),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeDiscriminatorField("service", getService(), writeUnsignedShort(writeBuffer, 7));
// Switch field (Serialize the sub-type)
serializeCipServiceChild(writeBuffer);
@@ -114,9 +94,9 @@ public abstract class CipService implements Message {
public static CipService staticParse(ReadBuffer readBuffer, Object... args)
throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 3)) {
+ if ((args == null) || (args.length != 2)) {
throw new PlcRuntimeException(
- "Wrong number of arguments, expected 3, but got " + args.length);
+ "Wrong number of arguments, expected 2, but got " + args.length);
}
Boolean connected;
if (args[0] instanceof Boolean) {
@@ -138,22 +118,10 @@ public abstract class CipService implements Message {
"Argument 1 expected to be of type Integer or a string which is parseable but was "
+ args[1].getClass().getName());
}
- IntegerEncoding order;
- if (args[2] instanceof IntegerEncoding) {
- order = (IntegerEncoding) args[2];
- } else if (args[2] instanceof String) {
- order = IntegerEncoding.valueOf((String) args[2]);
- } else {
- throw new PlcRuntimeException(
- "Argument 2 expected to be of type IntegerEncoding or a string which is parseable but was"
- + " "
- + args[2].getClass().getName());
- }
- return staticParse(readBuffer, connected, serviceLen, order);
+ return staticParse(readBuffer, connected, serviceLen);
}
- public static CipService staticParse(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
+ public static CipService staticParse(ReadBuffer readBuffer, Boolean connected, Integer serviceLen)
throws ParseException {
readBuffer.pullContext("CipService");
PositionAware positionAware = readBuffer;
@@ -161,99 +129,73 @@ public abstract class CipService implements Message {
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- boolean response =
- readDiscriminatorField(
- "response",
- readBoolean(readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ boolean response = readDiscriminatorField("response", readBoolean(readBuffer));
- short service =
- readDiscriminatorField(
- "service",
- readUnsignedShort(readBuffer, 7),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short service = readDiscriminatorField("service", readUnsignedShort(readBuffer, 7));
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
CipServiceBuilder builder = null;
if (EvaluationHelper.equals(service, (short) 0x01)
&& EvaluationHelper.equals(response, (boolean) false)) {
builder =
- GetAttributeAllRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ GetAttributeAllRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x01)
&& EvaluationHelper.equals(response, (boolean) true)) {
builder =
- GetAttributeAllResponse.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ GetAttributeAllResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4C)
&& EvaluationHelper.equals(response, (boolean) false)) {
- builder =
- CipReadRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen, order);
+ builder = CipReadRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4C)
&& EvaluationHelper.equals(response, (boolean) true)) {
- builder =
- CipReadResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen, order);
+ builder = CipReadResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4D)
&& EvaluationHelper.equals(response, (boolean) false)) {
- builder =
- CipWriteRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen, order);
+ builder = CipWriteRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4D)
&& EvaluationHelper.equals(response, (boolean) true)) {
- builder =
- CipWriteResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen, order);
+ builder = CipWriteResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4E)
&& EvaluationHelper.equals(response, (boolean) false)) {
builder =
CipConnectionManagerCloseRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x4E)
&& EvaluationHelper.equals(response, (boolean) true)) {
builder =
CipConnectionManagerCloseResponse.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x0A)
&& EvaluationHelper.equals(response, (boolean) false)) {
builder =
- MultipleServiceRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ MultipleServiceRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x0A)
&& EvaluationHelper.equals(response, (boolean) true)) {
builder =
- MultipleServiceResponse.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ MultipleServiceResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x52)
&& EvaluationHelper.equals(response, (boolean) false)
&& EvaluationHelper.equals(connected, (boolean) false)) {
builder =
- CipUnconnectedRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ CipUnconnectedRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x52)
&& EvaluationHelper.equals(response, (boolean) false)
&& EvaluationHelper.equals(connected, (boolean) true)) {
- builder =
- CipConnectedRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ builder = CipConnectedRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x52)
&& EvaluationHelper.equals(response, (boolean) true)) {
builder =
- CipConnectedResponse.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ CipConnectedResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x5B)
&& EvaluationHelper.equals(response, (boolean) false)) {
builder =
CipConnectionManagerRequest.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ readBuffer, connected, serviceLen);
} else if (EvaluationHelper.equals(service, (short) 0x5B)
&& EvaluationHelper.equals(response, (boolean) true)) {
builder =
CipConnectionManagerResponse.staticParseCipServiceBuilder(
- readBuffer, connected, serviceLen, order);
+ readBuffer, connected, serviceLen);
}
if (builder == null) {
throw new ParseException(
@@ -272,13 +214,12 @@ public abstract class CipService implements Message {
readBuffer.closeContext("CipService");
// Create the instance
- CipService _cipService = builder.build(serviceLen, order);
-
+ CipService _cipService = builder.build();
return _cipService;
}
public interface CipServiceBuilder {
- CipService build(Integer serviceLen, IntegerEncoding order);
+ CipService build();
}
@Override
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java
index a96eda3d59..dd03602f33 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java
@@ -60,26 +60,18 @@ public class CipUnconnectedRequest extends CipService implements Message {
protected final byte backPlane;
protected final byte slot;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
public CipUnconnectedRequest(
PathSegment classSegment,
PathSegment instanceSegment,
CipService unconnectedService,
byte backPlane,
- byte slot,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ byte slot) {
+ super();
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
this.unconnectedService = unconnectedService;
this.backPlane = backPlane;
this.slot = slot;
- this.serviceLen = serviceLen;
- this.order = order;
}
public PathSegment getClassSegment() {
@@ -115,100 +107,39 @@ public class CipUnconnectedRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- byte requestPathSize =
- (byte)
+ short requestPathSize =
+ (short)
((((getClassSegment().getLengthInBytes()) + (getInstanceSegment().getLengthInBytes())))
/ (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Simple Field (classSegment)
- writeSimpleField(
- "classSegment",
- classSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("classSegment", classSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (instanceSegment)
writeSimpleField(
- "instanceSegment",
- instanceSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "instanceSegment", instanceSegment, new DataWriterComplexDefault<>(writeBuffer));
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (int) 0x9D05,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (int) 0x9D05, writeUnsignedInt(writeBuffer, 16));
// Implicit Field (messageSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
int messageSize = (int) (((getLengthInBytes()) - (10)) - (4));
- writeImplicitField(
- "messageSize",
- messageSize,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("messageSize", messageSize, writeUnsignedInt(writeBuffer, 16));
// Simple Field (unconnectedService)
writeSimpleField(
- "unconnectedService",
- unconnectedService,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "unconnectedService", unconnectedService, new DataWriterComplexDefault<>(writeBuffer));
// Const Field (route)
- writeConstField(
- "route",
- ROUTE,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeConstField("route", ROUTE, writeUnsignedInt(writeBuffer, 16));
// Simple Field (backPlane)
- writeSimpleField(
- "backPlane",
- backPlane,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("backPlane", backPlane, writeSignedByte(writeBuffer, 8));
// Simple Field (slot)
- writeSimpleField(
- "slot",
- slot,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("slot", slot, writeSignedByte(writeBuffer, 8));
writeBuffer.popContext("CipUnconnectedRequest");
}
@@ -255,110 +186,48 @@ public class CipUnconnectedRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipUnconnectedRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readImplicitField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
PathSegment classSegment =
readSimpleField(
"classSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
PathSegment instanceSegment =
readSimpleField(
"instanceSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
Integer reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedInt(readBuffer, 16),
- (int) 0x9D05,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int messageSize =
- readImplicitField(
- "messageSize",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x9D05);
+
+ int messageSize = readImplicitField("messageSize", readUnsignedInt(readBuffer, 16));
CipService unconnectedService =
readSimpleField(
"unconnectedService",
new DataReaderComplexDefault<>(
- () ->
- CipService.staticParse(
- readBuffer,
- (boolean) (false),
- (int) (messageSize),
- (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> CipService.staticParse(readBuffer, (boolean) (false), (int) (messageSize)),
+ readBuffer));
int route =
- readConstField(
- "route",
- readUnsignedInt(readBuffer, 16),
- CipUnconnectedRequest.ROUTE,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte backPlane =
- readSimpleField(
- "backPlane",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte slot =
- readSimpleField(
- "slot",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readConstField("route", readUnsignedInt(readBuffer, 16), CipUnconnectedRequest.ROUTE);
+
+ byte backPlane = readSimpleField("backPlane", readSignedByte(readBuffer, 8));
+
+ byte slot = readSimpleField("slot", readSignedByte(readBuffer, 8));
readBuffer.closeContext("CipUnconnectedRequest");
// Create the instance
return new CipUnconnectedRequestBuilderImpl(
- classSegment, instanceSegment, unconnectedService, backPlane, slot, serviceLen, order);
+ classSegment, instanceSegment, unconnectedService, backPlane, slot);
}
public static class CipUnconnectedRequestBuilderImpl implements CipService.CipServiceBuilder {
@@ -367,37 +236,24 @@ public class CipUnconnectedRequest extends CipService implements Message {
private final CipService unconnectedService;
private final byte backPlane;
private final byte slot;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipUnconnectedRequestBuilderImpl(
PathSegment classSegment,
PathSegment instanceSegment,
CipService unconnectedService,
byte backPlane,
- byte slot,
- Integer serviceLen,
- IntegerEncoding order) {
+ byte slot) {
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
this.unconnectedService = unconnectedService;
this.backPlane = backPlane;
this.slot = slot;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipUnconnectedRequest build(Integer serviceLen, IntegerEncoding order) {
-
+ public CipUnconnectedRequest build() {
CipUnconnectedRequest cipUnconnectedRequest =
new CipUnconnectedRequest(
- classSegment,
- instanceSegment,
- unconnectedService,
- backPlane,
- slot,
- serviceLen,
- order);
+ classSegment, instanceSegment, unconnectedService, backPlane, slot);
return cipUnconnectedRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java
index feffd731d8..bb436b4941 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java
@@ -56,24 +56,12 @@ public class CipWriteRequest extends CipService implements Message {
protected final int elementNb;
protected final byte[] data;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipWriteRequest(
- byte[] tag,
- CIPDataTypeCode dataType,
- int elementNb,
- byte[] data,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ public CipWriteRequest(byte[] tag, CIPDataTypeCode dataType, int elementNb, byte[] data) {
+ super();
this.tag = tag;
this.dataType = dataType;
this.elementNb = elementNb;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
public byte[] getTag() {
@@ -101,25 +89,11 @@ public class CipWriteRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- byte requestPathSize = (byte) ((COUNT(getTag())) / (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = (short) ((COUNT(getTag())) / (2));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Array Field (tag)
- writeByteArrayField(
- "tag",
- tag,
- writeByteArray(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeByteArrayField("tag", tag, writeByteArray(writeBuffer, 8));
// Simple Field (dataType)
writeSimpleEnumField(
@@ -127,31 +101,13 @@ public class CipWriteRequest extends CipService implements Message {
"CIPDataTypeCode",
dataType,
new DataWriterEnumDefault<>(
- CIPDataTypeCode::getValue, CIPDataTypeCode::name, writeUnsignedInt(writeBuffer, 16)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ CIPDataTypeCode::getValue, CIPDataTypeCode::name, writeUnsignedInt(writeBuffer, 16)));
// Simple Field (elementNb)
- writeSimpleField(
- "elementNb",
- elementNb,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("elementNb", elementNb, writeUnsignedInt(writeBuffer, 16));
// Array Field (data)
- writeByteArrayField(
- "data",
- data,
- writeByteArray(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeByteArrayField("data", data, writeByteArray(writeBuffer, 8));
writeBuffer.popContext("CipWriteRequest");
}
@@ -190,64 +146,32 @@ public class CipWriteRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipWriteRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readImplicitField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte[] tag =
- readBuffer.readByteArray(
- "tag",
- Math.toIntExact((requestPathSize) * (2)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
+
+ byte[] tag = readBuffer.readByteArray("tag", Math.toIntExact((requestPathSize) * (2)));
CIPDataTypeCode dataType =
readEnumField(
"dataType",
"CIPDataTypeCode",
new DataReaderEnumDefault<>(
- CIPDataTypeCode::enumForValue, readUnsignedInt(readBuffer, 16)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int elementNb =
- readSimpleField(
- "elementNb",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ CIPDataTypeCode::enumForValue, readUnsignedInt(readBuffer, 16)));
+
+ int elementNb = readSimpleField("elementNb", readUnsignedInt(readBuffer, 16));
byte[] data =
- readBuffer.readByteArray(
- "data",
- Math.toIntExact((dataType.getSize()) * (elementNb)),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readBuffer.readByteArray("data", Math.toIntExact((dataType.getSize()) * (elementNb)));
readBuffer.closeContext("CipWriteRequest");
// Create the instance
- return new CipWriteRequestBuilderImpl(tag, dataType, elementNb, data, serviceLen, order);
+ return new CipWriteRequestBuilderImpl(tag, dataType, elementNb, data);
}
public static class CipWriteRequestBuilderImpl implements CipService.CipServiceBuilder {
@@ -255,28 +179,17 @@ public class CipWriteRequest extends CipService implements Message {
private final CIPDataTypeCode dataType;
private final int elementNb;
private final byte[] data;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public CipWriteRequestBuilderImpl(
- byte[] tag,
- CIPDataTypeCode dataType,
- int elementNb,
- byte[] data,
- Integer serviceLen,
- IntegerEncoding order) {
+ byte[] tag, CIPDataTypeCode dataType, int elementNb, byte[] data) {
this.tag = tag;
this.dataType = dataType;
this.elementNb = elementNb;
this.data = data;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipWriteRequest build(Integer serviceLen, IntegerEncoding order) {
-
- CipWriteRequest cipWriteRequest =
- new CipWriteRequest(tag, dataType, elementNb, data, serviceLen, order);
+ public CipWriteRequest build() {
+ CipWriteRequest cipWriteRequest = new CipWriteRequest(tag, dataType, elementNb, data);
return cipWriteRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java
index 0a55faeaa5..42a130a5b5 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java
@@ -54,17 +54,10 @@ public class CipWriteResponse extends CipService implements Message {
protected final short status;
protected final short extStatus;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public CipWriteResponse(
- short status, short extStatus, Integer serviceLen, IntegerEncoding order) {
- super(serviceLen, order);
+ public CipWriteResponse(short status, short extStatus) {
+ super();
this.status = status;
this.extStatus = extStatus;
- this.serviceLen = serviceLen;
- this.order = order;
}
public short getStatus() {
@@ -83,34 +76,13 @@ public class CipWriteResponse extends CipService implements Message {
writeBuffer.pushContext("CipWriteResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedShort(writeBuffer, 8));
// Simple Field (extStatus)
- writeSimpleField(
- "extStatus",
- extStatus,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("extStatus", extStatus, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("CipWriteResponse");
}
@@ -139,8 +111,7 @@ public class CipWriteResponse extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("CipWriteResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -148,56 +119,28 @@ public class CipWriteResponse extends CipService implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Short reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short status =
- readSimpleField(
- "status",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short extStatus =
- readSimpleField(
- "extStatus",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
+
+ short status = readSimpleField("status", readUnsignedShort(readBuffer, 8));
+
+ short extStatus = readSimpleField("extStatus", readUnsignedShort(readBuffer, 8));
readBuffer.closeContext("CipWriteResponse");
// Create the instance
- return new CipWriteResponseBuilderImpl(status, extStatus, serviceLen, order);
+ return new CipWriteResponseBuilderImpl(status, extStatus);
}
public static class CipWriteResponseBuilderImpl implements CipService.CipServiceBuilder {
private final short status;
private final short extStatus;
- private final Integer serviceLen;
- private final IntegerEncoding order;
- public CipWriteResponseBuilderImpl(
- short status, short extStatus, Integer serviceLen, IntegerEncoding order) {
+ public CipWriteResponseBuilderImpl(short status, short extStatus) {
this.status = status;
this.extStatus = extStatus;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public CipWriteResponse build(Integer serviceLen, IntegerEncoding order) {
-
- CipWriteResponse cipWriteResponse =
- new CipWriteResponse(status, extStatus, serviceLen, order);
+ public CipWriteResponse build() {
+ CipWriteResponse cipWriteResponse = new CipWriteResponse(status, extStatus);
return cipWriteResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassID.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassID.java
index 59865605c9..94b9c3383a 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassID.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassID.java
@@ -46,14 +46,10 @@ public class ClassID extends LogicalSegmentType implements Message {
protected final byte format;
protected final short segmentClass;
- // Arguments.
- protected final IntegerEncoding order;
-
- public ClassID(byte format, short segmentClass, IntegerEncoding order) {
- super(order);
+ public ClassID(byte format, short segmentClass) {
+ super();
this.format = format;
this.segmentClass = segmentClass;
- this.order = order;
}
public byte getFormat() {
@@ -73,24 +69,10 @@ public class ClassID extends LogicalSegmentType implements Message {
writeBuffer.pushContext("ClassID");
// Simple Field (format)
- writeSimpleField(
- "format",
- format,
- writeUnsignedByte(writeBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("format", format, writeUnsignedByte(writeBuffer, 2));
// Simple Field (segmentClass)
- writeSimpleField(
- "segmentClass",
- segmentClass,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("segmentClass", segmentClass, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("ClassID");
}
@@ -116,50 +98,33 @@ public class ClassID extends LogicalSegmentType implements Message {
}
public static LogicalSegmentTypeBuilder staticParseLogicalSegmentTypeBuilder(
- ReadBuffer readBuffer, IntegerEncoding order) throws ParseException {
+ ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("ClassID");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte format =
- readSimpleField(
- "format",
- readUnsignedByte(readBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short segmentClass =
- readSimpleField(
- "segmentClass",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ byte format = readSimpleField("format", readUnsignedByte(readBuffer, 2));
+
+ short segmentClass = readSimpleField("segmentClass", readUnsignedShort(readBuffer, 8));
readBuffer.closeContext("ClassID");
// Create the instance
- return new ClassIDBuilderImpl(format, segmentClass, order);
+ return new ClassIDBuilderImpl(format, segmentClass);
}
public static class ClassIDBuilderImpl implements LogicalSegmentType.LogicalSegmentTypeBuilder {
private final byte format;
private final short segmentClass;
- private final IntegerEncoding order;
- public ClassIDBuilderImpl(byte format, short segmentClass, IntegerEncoding order) {
+ public ClassIDBuilderImpl(byte format, short segmentClass) {
this.format = format;
this.segmentClass = segmentClass;
- this.order = order;
}
- public ClassID build(IntegerEncoding order) {
-
- ClassID classID = new ClassID(format, segmentClass, order);
+ public ClassID build() {
+ ClassID classID = new ClassID(format, segmentClass);
return classID;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassSegment.java
index 78418b0520..d42796c233 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassSegment.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ClassSegment.java
@@ -43,21 +43,16 @@ public class ClassSegment implements Message {
protected final byte logicalSegmentFormat;
protected final short classSegment;
- // Arguments.
- protected final IntegerEncoding order;
-
public ClassSegment(
byte pathSegmentType,
byte logicalSegmentType,
byte logicalSegmentFormat,
- short classSegment,
- IntegerEncoding order) {
+ short classSegment) {
super();
this.pathSegmentType = pathSegmentType;
this.logicalSegmentType = logicalSegmentType;
this.logicalSegmentFormat = logicalSegmentFormat;
this.classSegment = classSegment;
- this.order = order;
}
public byte getPathSegmentType() {
@@ -83,44 +78,17 @@ public class ClassSegment implements Message {
writeBuffer.pushContext("ClassSegment");
// Simple Field (pathSegmentType)
- writeSimpleField(
- "pathSegmentType",
- pathSegmentType,
- writeUnsignedByte(writeBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("pathSegmentType", pathSegmentType, writeUnsignedByte(writeBuffer, 3));
// Simple Field (logicalSegmentType)
- writeSimpleField(
- "logicalSegmentType",
- logicalSegmentType,
- writeUnsignedByte(writeBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("logicalSegmentType", logicalSegmentType, writeUnsignedByte(writeBuffer, 3));
// Simple Field (logicalSegmentFormat)
writeSimpleField(
- "logicalSegmentFormat",
- logicalSegmentFormat,
- writeUnsignedByte(writeBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "logicalSegmentFormat", logicalSegmentFormat, writeUnsignedByte(writeBuffer, 2));
// Simple Field (classSegment)
- writeSimpleField(
- "classSegment",
- classSegment,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("classSegment", classSegment, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("ClassSegment");
}
@@ -154,74 +122,31 @@ public class ClassSegment implements Message {
public static ClassSegment staticParse(ReadBuffer readBuffer, Object... args)
throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 1)) {
- throw new PlcRuntimeException(
- "Wrong number of arguments, expected 1, but got " + args.length);
- }
- IntegerEncoding order;
- if (args[0] instanceof IntegerEncoding) {
- order = (IntegerEncoding) args[0];
- } else if (args[0] instanceof String) {
- order = IntegerEncoding.valueOf((String) args[0]);
- } else {
- throw new PlcRuntimeException(
- "Argument 0 expected to be of type IntegerEncoding or a string which is parseable but was"
- + " "
- + args[0].getClass().getName());
- }
- return staticParse(readBuffer, order);
+ return staticParse(readBuffer);
}
- public static ClassSegment staticParse(ReadBuffer readBuffer, IntegerEncoding order)
- throws ParseException {
+ public static ClassSegment staticParse(ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("ClassSegment");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte pathSegmentType =
- readSimpleField(
- "pathSegmentType",
- readUnsignedByte(readBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ byte pathSegmentType = readSimpleField("pathSegmentType", readUnsignedByte(readBuffer, 3));
byte logicalSegmentType =
- readSimpleField(
- "logicalSegmentType",
- readUnsignedByte(readBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("logicalSegmentType", readUnsignedByte(readBuffer, 3));
byte logicalSegmentFormat =
- readSimpleField(
- "logicalSegmentFormat",
- readUnsignedByte(readBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short classSegment =
- readSimpleField(
- "classSegment",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("logicalSegmentFormat", readUnsignedByte(readBuffer, 2));
+
+ short classSegment = readSimpleField("classSegment", readUnsignedShort(readBuffer, 8));
readBuffer.closeContext("ClassSegment");
// Create the instance
ClassSegment _classSegment;
_classSegment =
- new ClassSegment(
- pathSegmentType, logicalSegmentType, logicalSegmentFormat, classSegment, order);
+ new ClassSegment(pathSegmentType, logicalSegmentType, logicalSegmentFormat, classSegment);
return _classSegment;
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedAddressItem.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedAddressItem.java
index b268fbf340..c950148518 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedAddressItem.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedAddressItem.java
@@ -45,13 +45,9 @@ public class ConnectedAddressItem extends TypeId implements Message {
// Properties.
protected final long connectionId;
- // Arguments.
- protected final IntegerEncoding order;
-
- public ConnectedAddressItem(long connectionId, IntegerEncoding order) {
- super(order);
+ public ConnectedAddressItem(long connectionId) {
+ super();
this.connectionId = connectionId;
- this.order = order;
}
public long getConnectionId() {
@@ -66,24 +62,10 @@ public class ConnectedAddressItem extends TypeId implements Message {
writeBuffer.pushContext("ConnectedAddressItem");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (int) 0x0004,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (int) 0x0004, writeUnsignedInt(writeBuffer, 16));
// Simple Field (connectionId)
- writeSimpleField(
- "connectionId",
- connectionId,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("connectionId", connectionId, writeUnsignedLong(writeBuffer, 32));
writeBuffer.popContext("ConnectedAddressItem");
}
@@ -108,7 +90,7 @@ public class ConnectedAddressItem extends TypeId implements Message {
return lengthInBits;
}
- public static TypeIdBuilder staticParseTypeIdBuilder(ReadBuffer readBuffer, IntegerEncoding order)
+ public static TypeIdBuilder staticParseTypeIdBuilder(ReadBuffer readBuffer)
throws ParseException {
readBuffer.pullContext("ConnectedAddressItem");
PositionAware positionAware = readBuffer;
@@ -117,41 +99,24 @@ public class ConnectedAddressItem extends TypeId implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Integer reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedInt(readBuffer, 16),
- (int) 0x0004,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long connectionId =
- readSimpleField(
- "connectionId",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedInt(readBuffer, 16), (int) 0x0004);
+
+ long connectionId = readSimpleField("connectionId", readUnsignedLong(readBuffer, 32));
readBuffer.closeContext("ConnectedAddressItem");
// Create the instance
- return new ConnectedAddressItemBuilderImpl(connectionId, order);
+ return new ConnectedAddressItemBuilderImpl(connectionId);
}
public static class ConnectedAddressItemBuilderImpl implements TypeId.TypeIdBuilder {
private final long connectionId;
- private final IntegerEncoding order;
- public ConnectedAddressItemBuilderImpl(long connectionId, IntegerEncoding order) {
+ public ConnectedAddressItemBuilderImpl(long connectionId) {
this.connectionId = connectionId;
- this.order = order;
}
- public ConnectedAddressItem build(IntegerEncoding order) {
-
- ConnectedAddressItem connectedAddressItem = new ConnectedAddressItem(connectionId, order);
+ public ConnectedAddressItem build() {
+ ConnectedAddressItem connectedAddressItem = new ConnectedAddressItem(connectionId);
return connectedAddressItem;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedDataItem.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedDataItem.java
index b08f85a319..791305a1b0 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedDataItem.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ConnectedDataItem.java
@@ -46,14 +46,10 @@ public class ConnectedDataItem extends TypeId implements Message {
protected final int sequenceCount;
protected final CipService service;
- // Arguments.
- protected final IntegerEncoding order;
-
- public ConnectedDataItem(int sequenceCount, CipService service, IntegerEncoding order) {
- super(order);
+ public ConnectedDataItem(int sequenceCount, CipService service) {
+ super();
this.sequenceCount = sequenceCount;
this.service = service;
- this.order = order;
}
public int getSequenceCount() {
@@ -74,34 +70,13 @@ public class ConnectedDataItem extends TypeId implements Message {
// Implicit Field (packetSize) (Used for parsing, but its value is not stored as it's implicitly
// given by the objects content)
int packetSize = (int) ((getService().getLengthInBytes()) + (2));
- writeImplicitField(
- "packetSize",
- packetSize,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("packetSize", packetSize, writeUnsignedInt(writeBuffer, 16));
// Simple Field (sequenceCount)
- writeSimpleField(
- "sequenceCount",
- sequenceCount,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("sequenceCount", sequenceCount, writeUnsignedInt(writeBuffer, 16));
// Simple Field (service)
- writeSimpleField(
- "service",
- service,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("service", service, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("ConnectedDataItem");
}
@@ -129,7 +104,7 @@ public class ConnectedDataItem extends TypeId implements Message {
return lengthInBits;
}
- public static TypeIdBuilder staticParseTypeIdBuilder(ReadBuffer readBuffer, IntegerEncoding order)
+ public static TypeIdBuilder staticParseTypeIdBuilder(ReadBuffer readBuffer)
throws ParseException {
readBuffer.pullContext("ConnectedDataItem");
PositionAware positionAware = readBuffer;
@@ -137,23 +112,9 @@ public class ConnectedDataItem extends TypeId implements Message {
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- int packetSize =
- readImplicitField(
- "packetSize",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ int packetSize = readImplicitField("packetSize", readUnsignedInt(readBuffer, 16));
- int sequenceCount =
- readSimpleField(
- "sequenceCount",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ int sequenceCount = readSimpleField("sequenceCount", readUnsignedInt(readBuffer, 16));
CipService service =
readSimpleField(
@@ -161,36 +122,25 @@ public class ConnectedDataItem extends TypeId implements Message {
new DataReaderComplexDefault<>(
() ->
CipService.staticParse(
- readBuffer,
- (boolean) (true),
- (int) ((packetSize) - (2)),
- (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readBuffer, (boolean) (true), (int) ((packetSize) - (2))),
+ readBuffer));
readBuffer.closeContext("ConnectedDataItem");
// Create the instance
- return new ConnectedDataItemBuilderImpl(sequenceCount, service, order);
+ return new ConnectedDataItemBuilderImpl(sequenceCount, service);
}
public static class ConnectedDataItemBuilderImpl implements TypeId.TypeIdBuilder {
private final int sequenceCount;
private final CipService service;
- private final IntegerEncoding order;
- public ConnectedDataItemBuilderImpl(
- int sequenceCount, CipService service, IntegerEncoding order) {
+ public ConnectedDataItemBuilderImpl(int sequenceCount, CipService service) {
this.sequenceCount = sequenceCount;
this.service = service;
- this.order = order;
}
- public ConnectedDataItem build(IntegerEncoding order) {
-
- ConnectedDataItem connectedDataItem = new ConnectedDataItem(sequenceCount, service, order);
+ public ConnectedDataItem build() {
+ ConnectedDataItem connectedDataItem = new ConnectedDataItem(sequenceCount, service);
return connectedDataItem;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegment.java
index 5394cfc717..c705eaedb1 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegment.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegment.java
@@ -45,13 +45,9 @@ public class DataSegment extends PathSegment implements Message {
// Properties.
protected final DataSegmentType segmentType;
- // Arguments.
- protected final IntegerEncoding order;
-
- public DataSegment(DataSegmentType segmentType, IntegerEncoding order) {
- super(order);
+ public DataSegment(DataSegmentType segmentType) {
+ super();
this.segmentType = segmentType;
- this.order = order;
}
public DataSegmentType getSegmentType() {
@@ -66,14 +62,7 @@ public class DataSegment extends PathSegment implements Message {
writeBuffer.pushContext("DataSegment");
// Simple Field (segmentType)
- writeSimpleField(
- "segmentType",
- segmentType,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("segmentType", segmentType, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("DataSegment");
}
@@ -95,8 +84,8 @@ public class DataSegment extends PathSegment implements Message {
return lengthInBits;
}
- public static PathSegmentBuilder staticParsePathSegmentBuilder(
- ReadBuffer readBuffer, IntegerEncoding order) throws ParseException {
+ public static PathSegmentBuilder staticParsePathSegmentBuilder(ReadBuffer readBuffer)
+ throws ParseException {
readBuffer.pullContext("DataSegment");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -107,30 +96,22 @@ public class DataSegment extends PathSegment implements Message {
readSimpleField(
"segmentType",
new DataReaderComplexDefault<>(
- () -> DataSegmentType.staticParse(readBuffer, (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> DataSegmentType.staticParse(readBuffer), readBuffer));
readBuffer.closeContext("DataSegment");
// Create the instance
- return new DataSegmentBuilderImpl(segmentType, order);
+ return new DataSegmentBuilderImpl(segmentType);
}
public static class DataSegmentBuilderImpl implements PathSegment.PathSegmentBuilder {
private final DataSegmentType segmentType;
- private final IntegerEncoding order;
- public DataSegmentBuilderImpl(DataSegmentType segmentType, IntegerEncoding order) {
+ public DataSegmentBuilderImpl(DataSegmentType segmentType) {
this.segmentType = segmentType;
- this.order = order;
}
- public DataSegment build(IntegerEncoding order) {
-
- DataSegment dataSegment = new DataSegment(segmentType, order);
+ public DataSegment build() {
+ DataSegment dataSegment = new DataSegment(segmentType);
return dataSegment;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java
index 23880e2bdc..31f1253814 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java
@@ -40,12 +40,8 @@ public abstract class DataSegmentType implements Message {
// Abstract accessors for discriminator values.
public abstract Short getDataSegmentType();
- // Arguments.
- protected final IntegerEncoding order;
-
- public DataSegmentType(IntegerEncoding order) {
+ public DataSegmentType() {
super();
- this.order = order;
}
protected abstract void serializeDataSegmentTypeChild(WriteBuffer writeBuffer)
@@ -59,13 +55,7 @@ public abstract class DataSegmentType implements Message {
// Discriminator Field (dataSegmentType) (Used as input to a switch field)
writeDiscriminatorField(
- "dataSegmentType",
- getDataSegmentType(),
- writeUnsignedShort(writeBuffer, 5),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "dataSegmentType", getDataSegmentType(), writeUnsignedShort(writeBuffer, 5));
// Switch field (Serialize the sub-type)
serializeDataSegmentTypeChild(writeBuffer);
@@ -95,26 +85,10 @@ public abstract class DataSegmentType implements Message {
public static DataSegmentType staticParse(ReadBuffer readBuffer, Object... args)
throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 1)) {
- throw new PlcRuntimeException(
- "Wrong number of arguments, expected 1, but got " + args.length);
- }
- IntegerEncoding order;
- if (args[0] instanceof IntegerEncoding) {
- order = (IntegerEncoding) args[0];
- } else if (args[0] instanceof String) {
- order = IntegerEncoding.valueOf((String) args[0]);
- } else {
- throw new PlcRuntimeException(
- "Argument 0 expected to be of type IntegerEncoding or a string which is parseable but was"
- + " "
- + args[0].getClass().getName());
- }
- return staticParse(readBuffer, order);
+ return staticParse(readBuffer);
}
- public static DataSegmentType staticParse(ReadBuffer readBuffer, IntegerEncoding order)
- throws ParseException {
+ public static DataSegmentType staticParse(ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("DataSegmentType");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -122,18 +96,12 @@ public abstract class DataSegmentType implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
short dataSegmentType =
- readDiscriminatorField(
- "dataSegmentType",
- readUnsignedShort(readBuffer, 5),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readDiscriminatorField("dataSegmentType", readUnsignedShort(readBuffer, 5));
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
DataSegmentTypeBuilder builder = null;
if (EvaluationHelper.equals(dataSegmentType, (short) 0x11)) {
- builder = AnsiExtendedSymbolSegment.staticParseDataSegmentTypeBuilder(readBuffer, order);
+ builder = AnsiExtendedSymbolSegment.staticParseDataSegmentTypeBuilder(readBuffer);
}
if (builder == null) {
throw new ParseException(
@@ -146,13 +114,12 @@ public abstract class DataSegmentType implements Message {
readBuffer.closeContext("DataSegmentType");
// Create the instance
- DataSegmentType _dataSegmentType = builder.build(order);
-
+ DataSegmentType _dataSegmentType = builder.build();
return _dataSegmentType;
}
public interface DataSegmentTypeBuilder {
- DataSegmentType build(IntegerEncoding order);
+ DataSegmentType build();
}
@Override
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionRequest.java
index 011e890344..bcdcc6b2ec 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionRequest.java
@@ -54,13 +54,8 @@ public class EipConnectionRequest extends EipPacket implements Message {
public static final Integer PROTOCOLVERSION = 0x01;
public static final Integer FLAGS = 0x00;
- // Arguments.
- protected final IntegerEncoding order;
-
- public EipConnectionRequest(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
- this.order = order;
+ public EipConnectionRequest(long sessionHandle, long status, byte[] senderContext, long options) {
+ super(sessionHandle, status, senderContext, options);
}
public int getProtocolVersion() {
@@ -79,24 +74,10 @@ public class EipConnectionRequest extends EipPacket implements Message {
writeBuffer.pushContext("EipConnectionRequest");
// Const Field (protocolVersion)
- writeConstField(
- "protocolVersion",
- PROTOCOLVERSION,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeConstField("protocolVersion", PROTOCOLVERSION, writeUnsignedInt(writeBuffer, 16));
// Const Field (flags)
- writeConstField(
- "flags",
- FLAGS,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeConstField("flags", FLAGS, writeUnsignedInt(writeBuffer, 16));
writeBuffer.popContext("EipConnectionRequest");
}
@@ -122,7 +103,7 @@ public class EipConnectionRequest extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("EipConnectionRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -133,42 +114,24 @@ public class EipConnectionRequest extends EipPacket implements Message {
readConstField(
"protocolVersion",
readUnsignedInt(readBuffer, 16),
- EipConnectionRequest.PROTOCOLVERSION,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ EipConnectionRequest.PROTOCOLVERSION);
int flags =
- readConstField(
- "flags",
- readUnsignedInt(readBuffer, 16),
- EipConnectionRequest.FLAGS,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readConstField("flags", readUnsignedInt(readBuffer, 16), EipConnectionRequest.FLAGS);
readBuffer.closeContext("EipConnectionRequest");
// Create the instance
- return new EipConnectionRequestBuilderImpl(order);
+ return new EipConnectionRequestBuilderImpl();
}
public static class EipConnectionRequestBuilderImpl implements EipPacket.EipPacketBuilder {
- private final IntegerEncoding order;
- public EipConnectionRequestBuilderImpl(IntegerEncoding order) {
- this.order = order;
- }
+ public EipConnectionRequestBuilderImpl() {}
public EipConnectionRequest build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ long sessionHandle, long status, byte[] senderContext, long options) {
EipConnectionRequest eipConnectionRequest =
- new EipConnectionRequest(sessionHandle, status, senderContext, options, order);
+ new EipConnectionRequest(sessionHandle, status, senderContext, options);
return eipConnectionRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionResponse.java
index db7e17501c..60fb682607 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipConnectionResponse.java
@@ -54,13 +54,9 @@ public class EipConnectionResponse extends EipPacket implements Message {
public static final Integer PROTOCOLVERSION = 0x01;
public static final Integer FLAGS = 0x00;
- // Arguments.
- protected final IntegerEncoding order;
-
public EipConnectionResponse(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
- this.order = order;
+ long sessionHandle, long status, byte[] senderContext, long options) {
+ super(sessionHandle, status, senderContext, options);
}
public int getProtocolVersion() {
@@ -79,24 +75,10 @@ public class EipConnectionResponse extends EipPacket implements Message {
writeBuffer.pushContext("EipConnectionResponse");
// Const Field (protocolVersion)
- writeConstField(
- "protocolVersion",
- PROTOCOLVERSION,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeConstField("protocolVersion", PROTOCOLVERSION, writeUnsignedInt(writeBuffer, 16));
// Const Field (flags)
- writeConstField(
- "flags",
- FLAGS,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeConstField("flags", FLAGS, writeUnsignedInt(writeBuffer, 16));
writeBuffer.popContext("EipConnectionResponse");
}
@@ -122,7 +104,7 @@ public class EipConnectionResponse extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("EipConnectionResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -133,42 +115,24 @@ public class EipConnectionResponse extends EipPacket implements Message {
readConstField(
"protocolVersion",
readUnsignedInt(readBuffer, 16),
- EipConnectionResponse.PROTOCOLVERSION,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ EipConnectionResponse.PROTOCOLVERSION);
int flags =
- readConstField(
- "flags",
- readUnsignedInt(readBuffer, 16),
- EipConnectionResponse.FLAGS,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readConstField("flags", readUnsignedInt(readBuffer, 16), EipConnectionResponse.FLAGS);
readBuffer.closeContext("EipConnectionResponse");
// Create the instance
- return new EipConnectionResponseBuilderImpl(order);
+ return new EipConnectionResponseBuilderImpl();
}
public static class EipConnectionResponseBuilderImpl implements EipPacket.EipPacketBuilder {
- private final IntegerEncoding order;
- public EipConnectionResponseBuilderImpl(IntegerEncoding order) {
- this.order = order;
- }
+ public EipConnectionResponseBuilderImpl() {}
public EipConnectionResponse build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ long sessionHandle, long status, byte[] senderContext, long options) {
EipConnectionResponse eipConnectionResponse =
- new EipConnectionResponse(sessionHandle, status, senderContext, options, order);
+ new EipConnectionResponse(sessionHandle, status, senderContext, options);
return eipConnectionResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipDisconnectRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipDisconnectRequest.java
index 68a588fecc..299feaa4a0 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipDisconnectRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipDisconnectRequest.java
@@ -50,13 +50,8 @@ public class EipDisconnectRequest extends EipPacket implements Message {
return 0;
}
- // Arguments.
- protected final IntegerEncoding order;
-
- public EipDisconnectRequest(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
- this.order = order;
+ public EipDisconnectRequest(long sessionHandle, long status, byte[] senderContext, long options) {
+ super(sessionHandle, status, senderContext, options);
}
@Override
@@ -84,7 +79,7 @@ public class EipDisconnectRequest extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("EipDisconnectRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -93,24 +88,17 @@ public class EipDisconnectRequest extends EipPacket implements Message {
readBuffer.closeContext("EipDisconnectRequest");
// Create the instance
- return new EipDisconnectRequestBuilderImpl(order);
+ return new EipDisconnectRequestBuilderImpl();
}
public static class EipDisconnectRequestBuilderImpl implements EipPacket.EipPacketBuilder {
- private final IntegerEncoding order;
- public EipDisconnectRequestBuilderImpl(IntegerEncoding order) {
- this.order = order;
- }
+ public EipDisconnectRequestBuilderImpl() {}
public EipDisconnectRequest build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ long sessionHandle, long status, byte[] senderContext, long options) {
EipDisconnectRequest eipDisconnectRequest =
- new EipDisconnectRequest(sessionHandle, status, senderContext, options, order);
+ new EipDisconnectRequest(sessionHandle, status, senderContext, options);
return eipDisconnectRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipPacket.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipPacket.java
index 590085867b..fb573133b7 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipPacket.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/EipPacket.java
@@ -50,17 +50,12 @@ public abstract class EipPacket implements Message {
protected final byte[] senderContext;
protected final long options;
- // Arguments.
- protected final IntegerEncoding order;
-
- public EipPacket(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order) {
+ public EipPacket(long sessionHandle, long status, byte[] senderContext, long options) {
super();
this.sessionHandle = sessionHandle;
this.status = status;
this.senderContext = senderContext;
this.options = options;
- this.order = order;
}
public long getSessionHandle() {
@@ -89,66 +84,24 @@ public abstract class EipPacket implements Message {
writeBuffer.pushContext("EipPacket");
// Discriminator Field (command) (Used as input to a switch field)
- writeDiscriminatorField(
- "command",
- getCommand(),
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeDiscriminatorField("command", getCommand(), writeUnsignedInt(writeBuffer, 16));
// Implicit Field (packetLength) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
int packetLength = (int) ((getLengthInBytes()) - (24));
- writeImplicitField(
- "packetLength",
- packetLength,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("packetLength", packetLength, writeUnsignedInt(writeBuffer, 16));
// Simple Field (sessionHandle)
- writeSimpleField(
- "sessionHandle",
- sessionHandle,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("sessionHandle", sessionHandle, writeUnsignedLong(writeBuffer, 32));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedLong(writeBuffer, 32));
// Array Field (senderContext)
- writeByteArrayField(
- "senderContext",
- senderContext,
- writeByteArray(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeByteArrayField("senderContext", senderContext, writeByteArray(writeBuffer, 8));
// Simple Field (options)
- writeSimpleField(
- "options",
- options,
- writeUnsignedLong(writeBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("options", options, writeUnsignedLong(writeBuffer, 32));
// Switch field (Serialize the sub-type)
serializeEipPacketChild(writeBuffer);
@@ -194,130 +147,77 @@ public abstract class EipPacket implements Message {
public static EipPacket staticParse(ReadBuffer readBuffer, Object... args) throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 2)) {
+ if ((args == null) || (args.length != 1)) {
throw new PlcRuntimeException(
- "Wrong number of arguments, expected 2, but got " + args.length);
+ "Wrong number of arguments, expected 1, but got " + args.length);
}
- IntegerEncoding order;
- if (args[0] instanceof IntegerEncoding) {
- order = (IntegerEncoding) args[0];
+ Boolean response;
+ if (args[0] instanceof Boolean) {
+ response = (Boolean) args[0];
} else if (args[0] instanceof String) {
- order = IntegerEncoding.valueOf((String) args[0]);
+ response = Boolean.valueOf((String) args[0]);
} else {
throw new PlcRuntimeException(
- "Argument 0 expected to be of type IntegerEncoding or a string which is parseable but was"
- + " "
+ "Argument 0 expected to be of type Boolean or a string which is parseable but was "
+ args[0].getClass().getName());
}
- Boolean response;
- if (args[1] instanceof Boolean) {
- response = (Boolean) args[1];
- } else if (args[1] instanceof String) {
- response = Boolean.valueOf((String) args[1]);
- } else {
- throw new PlcRuntimeException(
- "Argument 1 expected to be of type Boolean or a string which is parseable but was "
- + args[1].getClass().getName());
- }
- return staticParse(readBuffer, order, response);
+ return staticParse(readBuffer, response);
}
- public static EipPacket staticParse(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ public static EipPacket staticParse(ReadBuffer readBuffer, Boolean response)
+ throws ParseException {
readBuffer.pullContext("EipPacket");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- int command =
- readDiscriminatorField(
- "command",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- int packetLength =
- readImplicitField(
- "packetLength",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long sessionHandle =
- readSimpleField(
- "sessionHandle",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long status =
- readSimpleField(
- "status",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- byte[] senderContext =
- readBuffer.readByteArray(
- "senderContext",
- Math.toIntExact(8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- long options =
- readSimpleField(
- "options",
- readUnsignedLong(readBuffer, 32),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ int command = readDiscriminatorField("command", readUnsignedInt(readBuffer, 16));
+
+ int packetLength = readImplicitField("packetLength", readUnsignedInt(readBuffer, 16));
+
+ long sessionHandle = readSimpleField("sessionHandle", readUnsignedLong(readBuffer, 32));
+
+ long status = readSimpleField("status", readUnsignedLong(readBuffer, 32));
+
+ byte[] senderContext = readBuffer.readByteArray("senderContext", Math.toIntExact(8));
+
+ long options = readSimpleField("options", readUnsignedLong(readBuffer, 32));
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
EipPacketBuilder builder = null;
if (EvaluationHelper.equals(command, (int) 0x0001)
&& EvaluationHelper.equals(response, (boolean) false)) {
- builder = NullCommandRequest.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = NullCommandRequest.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0001)
&& EvaluationHelper.equals(response, (boolean) true)) {
- builder = NullCommandResponse.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = NullCommandResponse.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0004)
&& EvaluationHelper.equals(response, (boolean) false)) {
- builder = ListServicesRequest.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = ListServicesRequest.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0004)
&& EvaluationHelper.equals(response, (boolean) true)
&& EvaluationHelper.equals(packetLength, (int) 0)) {
- builder = NullListServicesResponse.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = NullListServicesResponse.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0004)
&& EvaluationHelper.equals(response, (boolean) true)) {
- builder = ListServicesResponse.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = ListServicesResponse.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0065)
&& EvaluationHelper.equals(response, (boolean) false)) {
- builder = EipConnectionRequest.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = EipConnectionRequest.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0065)
&& EvaluationHelper.equals(response, (boolean) true)
&& EvaluationHelper.equals(packetLength, (int) 0)) {
- builder = NullEipConnectionResponse.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = NullEipConnectionResponse.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0065)
&& EvaluationHelper.equals(response, (boolean) true)) {
- builder = EipConnectionResponse.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = EipConnectionResponse.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0066)) {
- builder = EipDisconnectRequest.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = EipDisconnectRequest.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x006F)) {
- builder = CipRRData.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = CipRRData.staticParseEipPacketBuilder(readBuffer, response);
} else if (EvaluationHelper.equals(command, (int) 0x0070)) {
- builder = SendUnitData.staticParseEipPacketBuilder(readBuffer, order, response);
+ builder = SendUnitData.staticParseEipPacketBuilder(readBuffer, response);
}
if (builder == null) {
throw new ParseException(
@@ -336,13 +236,12 @@ public abstract class EipPacket implements Message {
readBuffer.closeContext("EipPacket");
// Create the instance
- EipPacket _eipPacket = builder.build(sessionHandle, status, senderContext, options, order);
+ EipPacket _eipPacket = builder.build(sessionHandle, status, senderContext, options);
return _eipPacket;
}
public interface EipPacketBuilder {
- EipPacket build(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order);
+ EipPacket build(long sessionHandle, long status, byte[] senderContext, long options);
}
@Override
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java
index 4a614d187f..b735fe0bc0 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java
@@ -54,20 +54,10 @@ public class GetAttributeAllRequest extends CipService implements Message {
protected final PathSegment classSegment;
protected final PathSegment instanceSegment;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public GetAttributeAllRequest(
- PathSegment classSegment,
- PathSegment instanceSegment,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ public GetAttributeAllRequest(PathSegment classSegment, PathSegment instanceSegment) {
+ super();
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
- this.serviceLen = serviceLen;
- this.order = order;
}
public PathSegment getClassSegment() {
@@ -87,38 +77,18 @@ public class GetAttributeAllRequest extends CipService implements Message {
// Implicit Field (requestPathSize) (Used for parsing, but its value is not stored as it's
// implicitly given by the objects content)
- byte requestPathSize =
- (byte)
+ short requestPathSize =
+ (short)
((((getClassSegment().getLengthInBytes()) + (getInstanceSegment().getLengthInBytes())))
/ (2));
- writeImplicitField(
- "requestPathSize",
- requestPathSize,
- writeSignedByte(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeImplicitField("requestPathSize", requestPathSize, writeUnsignedShort(writeBuffer, 8));
// Simple Field (classSegment)
- writeSimpleField(
- "classSegment",
- classSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("classSegment", classSegment, new DataWriterComplexDefault<>(writeBuffer));
// Simple Field (instanceSegment)
writeSimpleField(
- "instanceSegment",
- instanceSegment,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "instanceSegment", instanceSegment, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("GetAttributeAllRequest");
}
@@ -147,69 +117,43 @@ public class GetAttributeAllRequest extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("GetAttributeAllRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte requestPathSize =
- readImplicitField(
- "requestPathSize",
- readSignedByte(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ short requestPathSize = readImplicitField("requestPathSize", readUnsignedShort(readBuffer, 8));
PathSegment classSegment =
readSimpleField(
"classSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
PathSegment instanceSegment =
readSimpleField(
"instanceSegment",
- new DataReaderComplexDefault<>(
- () -> PathSegment.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> PathSegment.staticParse(readBuffer), readBuffer));
readBuffer.closeContext("GetAttributeAllRequest");
// Create the instance
- return new GetAttributeAllRequestBuilderImpl(classSegment, instanceSegment, serviceLen, order);
+ return new GetAttributeAllRequestBuilderImpl(classSegment, instanceSegment);
}
public static class GetAttributeAllRequestBuilderImpl implements CipService.CipServiceBuilder {
private final PathSegment classSegment;
private final PathSegment instanceSegment;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public GetAttributeAllRequestBuilderImpl(
- PathSegment classSegment,
- PathSegment instanceSegment,
- Integer serviceLen,
- IntegerEncoding order) {
+ PathSegment classSegment, PathSegment instanceSegment) {
this.classSegment = classSegment;
this.instanceSegment = instanceSegment;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public GetAttributeAllRequest build(Integer serviceLen, IntegerEncoding order) {
-
+ public GetAttributeAllRequest build() {
GetAttributeAllRequest getAttributeAllRequest =
- new GetAttributeAllRequest(classSegment, instanceSegment, serviceLen, order);
+ new GetAttributeAllRequest(classSegment, instanceSegment);
return getAttributeAllRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java
index 7d633f2ae1..9d8415a843 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java
@@ -55,22 +55,11 @@ public class GetAttributeAllResponse extends CipService implements Message {
protected final short extStatus;
protected final CIPAttributes attributes;
- // Arguments.
- protected final Integer serviceLen;
- protected final IntegerEncoding order;
-
- public GetAttributeAllResponse(
- short status,
- short extStatus,
- CIPAttributes attributes,
- Integer serviceLen,
- IntegerEncoding order) {
- super(serviceLen, order);
+ public GetAttributeAllResponse(short status, short extStatus, CIPAttributes attributes) {
+ super();
this.status = status;
this.extStatus = extStatus;
this.attributes = attributes;
- this.serviceLen = serviceLen;
- this.order = order;
}
public short getStatus() {
@@ -93,45 +82,16 @@ public class GetAttributeAllResponse extends CipService implements Message {
writeBuffer.pushContext("GetAttributeAllResponse");
// Reserved Field (reserved)
- writeReservedField(
- "reserved",
- (short) 0x00,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 8));
// Simple Field (status)
- writeSimpleField(
- "status",
- status,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("status", status, writeUnsignedShort(writeBuffer, 8));
// Simple Field (extStatus)
- writeSimpleField(
- "extStatus",
- extStatus,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("extStatus", extStatus, writeUnsignedShort(writeBuffer, 8));
// Optional Field (attributes) (Can be skipped, if the value is null)
- writeOptionalField(
- "attributes",
- attributes,
- new DataWriterComplexDefault<>(writeBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeOptionalField("attributes", attributes, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("GetAttributeAllResponse");
}
@@ -165,8 +125,7 @@ public class GetAttributeAllResponse extends CipService implements Message {
}
public static CipServiceBuilder staticParseCipServiceBuilder(
- ReadBuffer readBuffer, Boolean connected, Integer serviceLen, IntegerEncoding order)
- throws ParseException {
+ ReadBuffer readBuffer, Boolean connected, Integer serviceLen) throws ParseException {
readBuffer.pullContext("GetAttributeAllResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -174,32 +133,11 @@ public class GetAttributeAllResponse extends CipService implements Message {
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
Short reservedField0 =
- readReservedField(
- "reserved",
- readUnsignedShort(readBuffer, 8),
- (short) 0x00,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short status =
- readSimpleField(
- "status",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short extStatus =
- readSimpleField(
- "extStatus",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readReservedField("reserved", readUnsignedShort(readBuffer, 8), (short) 0x00);
+
+ short status = readSimpleField("status", readUnsignedShort(readBuffer, 8));
+
+ short extStatus = readSimpleField("extStatus", readUnsignedShort(readBuffer, 8));
CIPAttributes attributes =
readOptionalField(
@@ -207,41 +145,28 @@ public class GetAttributeAllResponse extends CipService implements Message {
new DataReaderComplexDefault<>(
() -> CIPAttributes.staticParse(readBuffer, (int) ((serviceLen) - (4))),
readBuffer),
- (((serviceLen) - (4))) > (0),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ (((serviceLen) - (4))) > (0));
readBuffer.closeContext("GetAttributeAllResponse");
// Create the instance
- return new GetAttributeAllResponseBuilderImpl(status, extStatus, attributes, serviceLen, order);
+ return new GetAttributeAllResponseBuilderImpl(status, extStatus, attributes);
}
public static class GetAttributeAllResponseBuilderImpl implements CipService.CipServiceBuilder {
private final short status;
private final short extStatus;
private final CIPAttributes attributes;
- private final Integer serviceLen;
- private final IntegerEncoding order;
public GetAttributeAllResponseBuilderImpl(
- short status,
- short extStatus,
- CIPAttributes attributes,
- Integer serviceLen,
- IntegerEncoding order) {
+ short status, short extStatus, CIPAttributes attributes) {
this.status = status;
this.extStatus = extStatus;
this.attributes = attributes;
- this.serviceLen = serviceLen;
- this.order = order;
}
- public GetAttributeAllResponse build(Integer serviceLen, IntegerEncoding order) {
-
+ public GetAttributeAllResponse build() {
GetAttributeAllResponse getAttributeAllResponse =
- new GetAttributeAllResponse(status, extStatus, attributes, serviceLen, order);
+ new GetAttributeAllResponse(status, extStatus, attributes);
return getAttributeAllResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceID.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceID.java
index 42eff9542c..12786e9f90 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceID.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceID.java
@@ -46,14 +46,10 @@ public class InstanceID extends LogicalSegmentType implements Message {
protected final byte format;
protected final short instance;
- // Arguments.
- protected final IntegerEncoding order;
-
- public InstanceID(byte format, short instance, IntegerEncoding order) {
- super(order);
+ public InstanceID(byte format, short instance) {
+ super();
this.format = format;
this.instance = instance;
- this.order = order;
}
public byte getFormat() {
@@ -73,24 +69,10 @@ public class InstanceID extends LogicalSegmentType implements Message {
writeBuffer.pushContext("InstanceID");
// Simple Field (format)
- writeSimpleField(
- "format",
- format,
- writeUnsignedByte(writeBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("format", format, writeUnsignedByte(writeBuffer, 2));
// Simple Field (instance)
- writeSimpleField(
- "instance",
- instance,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("instance", instance, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("InstanceID");
}
@@ -116,51 +98,34 @@ public class InstanceID extends LogicalSegmentType implements Message {
}
public static LogicalSegmentTypeBuilder staticParseLogicalSegmentTypeBuilder(
- ReadBuffer readBuffer, IntegerEncoding order) throws ParseException {
+ ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("InstanceID");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte format =
- readSimpleField(
- "format",
- readUnsignedByte(readBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short instance =
- readSimpleField(
- "instance",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ byte format = readSimpleField("format", readUnsignedByte(readBuffer, 2));
+
+ short instance = readSimpleField("instance", readUnsignedShort(readBuffer, 8));
readBuffer.closeContext("InstanceID");
// Create the instance
- return new InstanceIDBuilderImpl(format, instance, order);
+ return new InstanceIDBuilderImpl(format, instance);
}
public static class InstanceIDBuilderImpl
implements LogicalSegmentType.LogicalSegmentTypeBuilder {
private final byte format;
private final short instance;
- private final IntegerEncoding order;
- public InstanceIDBuilderImpl(byte format, short instance, IntegerEncoding order) {
+ public InstanceIDBuilderImpl(byte format, short instance) {
this.format = format;
this.instance = instance;
- this.order = order;
}
- public InstanceID build(IntegerEncoding order) {
-
- InstanceID instanceID = new InstanceID(format, instance, order);
+ public InstanceID build() {
+ InstanceID instanceID = new InstanceID(format, instance);
return instanceID;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceSegment.java
index 47f322b674..861e4fa487 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceSegment.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/InstanceSegment.java
@@ -43,21 +43,13 @@ public class InstanceSegment implements Message {
protected final byte logicalSegmentFormat;
protected final short instance;
- // Arguments.
- protected final IntegerEncoding order;
-
public InstanceSegment(
- byte pathSegmentType,
- byte logicalSegmentType,
- byte logicalSegmentFormat,
- short instance,
- IntegerEncoding order) {
+ byte pathSegmentType, byte logicalSegmentType, byte logicalSegmentFormat, short instance) {
super();
this.pathSegmentType = pathSegmentType;
this.logicalSegmentType = logicalSegmentType;
this.logicalSegmentFormat = logicalSegmentFormat;
this.instance = instance;
- this.order = order;
}
public byte getPathSegmentType() {
@@ -83,44 +75,17 @@ public class InstanceSegment implements Message {
writeBuffer.pushContext("InstanceSegment");
// Simple Field (pathSegmentType)
- writeSimpleField(
- "pathSegmentType",
- pathSegmentType,
- writeUnsignedByte(writeBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("pathSegmentType", pathSegmentType, writeUnsignedByte(writeBuffer, 3));
// Simple Field (logicalSegmentType)
- writeSimpleField(
- "logicalSegmentType",
- logicalSegmentType,
- writeUnsignedByte(writeBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("logicalSegmentType", logicalSegmentType, writeUnsignedByte(writeBuffer, 3));
// Simple Field (logicalSegmentFormat)
writeSimpleField(
- "logicalSegmentFormat",
- logicalSegmentFormat,
- writeUnsignedByte(writeBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ "logicalSegmentFormat", logicalSegmentFormat, writeUnsignedByte(writeBuffer, 2));
// Simple Field (instance)
- writeSimpleField(
- "instance",
- instance,
- writeUnsignedShort(writeBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("instance", instance, writeUnsignedShort(writeBuffer, 8));
writeBuffer.popContext("InstanceSegment");
}
@@ -154,74 +119,31 @@ public class InstanceSegment implements Message {
public static InstanceSegment staticParse(ReadBuffer readBuffer, Object... args)
throws ParseException {
PositionAware positionAware = readBuffer;
- if ((args == null) || (args.length != 1)) {
- throw new PlcRuntimeException(
- "Wrong number of arguments, expected 1, but got " + args.length);
- }
- IntegerEncoding order;
- if (args[0] instanceof IntegerEncoding) {
- order = (IntegerEncoding) args[0];
- } else if (args[0] instanceof String) {
- order = IntegerEncoding.valueOf((String) args[0]);
- } else {
- throw new PlcRuntimeException(
- "Argument 0 expected to be of type IntegerEncoding or a string which is parseable but was"
- + " "
- + args[0].getClass().getName());
- }
- return staticParse(readBuffer, order);
+ return staticParse(readBuffer);
}
- public static InstanceSegment staticParse(ReadBuffer readBuffer, IntegerEncoding order)
- throws ParseException {
+ public static InstanceSegment staticParse(ReadBuffer readBuffer) throws ParseException {
readBuffer.pullContext("InstanceSegment");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- byte pathSegmentType =
- readSimpleField(
- "pathSegmentType",
- readUnsignedByte(readBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ byte pathSegmentType = readSimpleField("pathSegmentType", readUnsignedByte(readBuffer, 3));
byte logicalSegmentType =
- readSimpleField(
- "logicalSegmentType",
- readUnsignedByte(readBuffer, 3),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("logicalSegmentType", readUnsignedByte(readBuffer, 3));
byte logicalSegmentFormat =
- readSimpleField(
- "logicalSegmentFormat",
- readUnsignedByte(readBuffer, 2),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
-
- short instance =
- readSimpleField(
- "instance",
- readUnsignedShort(readBuffer, 8),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ readSimpleField("logicalSegmentFormat", readUnsignedByte(readBuffer, 2));
+
+ short instance = readSimpleField("instance", readUnsignedShort(readBuffer, 8));
readBuffer.closeContext("InstanceSegment");
// Create the instance
InstanceSegment _instanceSegment;
_instanceSegment =
- new InstanceSegment(
- pathSegmentType, logicalSegmentType, logicalSegmentFormat, instance, order);
+ new InstanceSegment(pathSegmentType, logicalSegmentType, logicalSegmentFormat, instance);
return _instanceSegment;
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/IntegerEncoding.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/IntegerEncoding.java
deleted file mode 100644
index f962cf1c47..0000000000
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/IntegerEncoding.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.eip.readwrite;
-
-import java.util.HashMap;
-import java.util.Map;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public enum IntegerEncoding {
- BIG_ENDIAN((byte) 0x0),
- LITTLE_ENDIAN((byte) 0x1);
- private static final Map<Byte, IntegerEncoding> map;
-
- static {
- map = new HashMap<>();
- for (IntegerEncoding value : IntegerEncoding.values()) {
- map.put((byte) value.getValue(), value);
- }
- }
-
- private byte value;
-
- IntegerEncoding(byte value) {
- this.value = value;
- }
-
- public byte getValue() {
- return value;
- }
-
- public static IntegerEncoding enumForValue(byte value) {
- return map.get(value);
- }
-
- public static Boolean isDefined(byte value) {
- return map.containsKey(value);
- }
-}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesRequest.java
index 731e3d0e44..9a045082dd 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesRequest.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesRequest.java
@@ -50,13 +50,8 @@ public class ListServicesRequest extends EipPacket implements Message {
return 0;
}
- // Arguments.
- protected final IntegerEncoding order;
-
- public ListServicesRequest(
- long sessionHandle, long status, byte[] senderContext, long options, IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
- this.order = order;
+ public ListServicesRequest(long sessionHandle, long status, byte[] senderContext, long options) {
+ super(sessionHandle, status, senderContext, options);
}
@Override
@@ -84,7 +79,7 @@ public class ListServicesRequest extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("ListServicesRequest");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -93,24 +88,17 @@ public class ListServicesRequest extends EipPacket implements Message {
readBuffer.closeContext("ListServicesRequest");
// Create the instance
- return new ListServicesRequestBuilderImpl(order);
+ return new ListServicesRequestBuilderImpl();
}
public static class ListServicesRequestBuilderImpl implements EipPacket.EipPacketBuilder {
- private final IntegerEncoding order;
- public ListServicesRequestBuilderImpl(IntegerEncoding order) {
- this.order = order;
- }
+ public ListServicesRequestBuilderImpl() {}
public ListServicesRequest build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ long sessionHandle, long status, byte[] senderContext, long options) {
ListServicesRequest listServicesRequest =
- new ListServicesRequest(sessionHandle, status, senderContext, options, order);
+ new ListServicesRequest(sessionHandle, status, senderContext, options);
return listServicesRequest;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesResponse.java
index 09d6c9e9d0..d0c4f88a99 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesResponse.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ListServicesResponse.java
@@ -54,21 +54,16 @@ public class ListServicesResponse extends EipPacket implements Message {
protected final int itemCount;
protected final List<TypeId> typeId;
- // Arguments.
- protected final IntegerEncoding order;
-
public ListServicesResponse(
long sessionHandle,
long status,
byte[] senderContext,
long options,
int itemCount,
- List<TypeId> typeId,
- IntegerEncoding order) {
- super(sessionHandle, status, senderContext, options, order);
+ List<TypeId> typeId) {
+ super(sessionHandle, status, senderContext, options);
this.itemCount = itemCount;
this.typeId = typeId;
- this.order = order;
}
public int getItemCount() {
@@ -87,24 +82,10 @@ public class ListServicesResponse extends EipPacket implements Message {
writeBuffer.pushContext("ListServicesResponse");
// Simple Field (itemCount)
- writeSimpleField(
- "itemCount",
- itemCount,
- writeUnsignedInt(writeBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("itemCount", itemCount, writeUnsignedInt(writeBuffer, 16));
// Array Field (typeId)
- writeComplexTypeArrayField(
- "typeId",
- typeId,
- writeBuffer,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeComplexTypeArrayField("typeId", typeId, writeBuffer);
writeBuffer.popContext("ListServicesResponse");
}
@@ -136,59 +117,40 @@ public class ListServicesResponse extends EipPacket implements Message {
}
public static EipPacketBuilder staticParseEipPacketBuilder(
- ReadBuffer readBuffer, IntegerEncoding order, Boolean response) throws ParseException {
+ ReadBuffer readBuffer, Boolean response) throws ParseException {
readBuffer.pullContext("ListServicesResponse");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
int curPos;
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- int itemCount =
- readSimpleField(
- "itemCount",
- readUnsignedInt(readBuffer, 16),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ int itemCount = readSimpleField("itemCount", readUnsignedInt(readBuffer, 16));
List<TypeId> typeId =
readCountArrayField(
"typeId",
- new DataReaderComplexDefault<>(
- () -> TypeId.staticParse(readBuffer, (IntegerEncoding) (order)), readBuffer),
- itemCount,
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ new DataReaderComplexDefault<>(() -> TypeId.staticParse(readBuffer), readBuffer),
+ itemCount);
readBuffer.closeContext("ListServicesResponse");
// Create the instance
- return new ListServicesResponseBuilderImpl(itemCount, typeId, order);
+ return new ListServicesResponseBuilderImpl(itemCount, typeId);
}
public static class ListServicesResponseBuilderImpl implements EipPacket.EipPacketBuilder {
private final int itemCount;
private final List<TypeId> typeId;
- private final IntegerEncoding order;
- public ListServicesResponseBuilderImpl(
- int itemCount, List<TypeId> typeId, IntegerEncoding order) {
+ public ListServicesResponseBuilderImpl(int itemCount, List<TypeId> typeId) {
this.itemCount = itemCount;
this.typeId = typeId;
- this.order = order;
}
public ListServicesResponse build(
- long sessionHandle,
- long status,
- byte[] senderContext,
- long options,
- IntegerEncoding order) {
+ long sessionHandle, long status, byte[] senderContext, long options) {
ListServicesResponse listServicesResponse =
new ListServicesResponse(
- sessionHandle, status, senderContext, options, itemCount, typeId, order);
+ sessionHandle, status, senderContext, options, itemCount, typeId);
return listServicesResponse;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegment.java
index ba2c6ea5be..8428fdda56 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegment.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegment.java
@@ -45,13 +45,9 @@ public class LogicalSegment extends PathSegment implements Message {
// Properties.
protected final LogicalSegmentType segmentType;
- // Arguments.
- protected final IntegerEncoding order;
-
- public LogicalSegment(LogicalSegmentType segmentType, IntegerEncoding order) {
- super(order);
+ public LogicalSegment(LogicalSegmentType segmentType) {
+ super();
this.segmentType = segmentType;
- this.order = order;
}
public LogicalSegmentType getSegmentType() {
@@ -66,14 +62,7 @@ public class LogicalSegment extends PathSegment implements Message {
writeBuffer.pushContext("LogicalSegment");
// Simple Field (segmentType)
- writeSimpleField(
- "segmentType",
- segmentType,
- new DataWriterComplexDefault<>(writeBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ writeSimpleField("segmentType", segmentType, new DataWriterComplexDefault<>(writeBuffer));
writeBuffer.popContext("LogicalSegment");
}
@@ -95,8 +84,8 @@ public class LogicalSegment extends PathSegment implements Message {
return lengthInBits;
}
- public static PathSegmentBuilder staticParsePathSegmentBuilder(
- ReadBuffer readBuffer, IntegerEncoding order) throws ParseException {
+ public static PathSegmentBuilder staticParsePathSegmentBuilder(ReadBuffer readBuffer)
+ throws ParseException {
readBuffer.pullContext("LogicalSegment");
PositionAware positionAware = readBuffer;
int startPos = positionAware.getPos();
@@ -107,30 +96,22 @@ public class LogicalSegment extends PathSegment implements Message {
readSimpleField(
"segmentType",
new DataReaderComplexDefault<>(
- () -> LogicalSegmentType.staticParse(readBuffer, (IntegerEncoding) (order)),
- readBuffer),
- WithOption.WithByteOrder(
- (((order) == (IntegerEncoding.BIG_ENDIAN))
- ? ByteOrder.BIG_ENDIAN
- : ByteOrder.LITTLE_ENDIAN)));
+ () -> LogicalSegmentType.staticParse(readBuffer), readBuffer));
readBuffer.closeContext("LogicalSegment");
// Create the instance
- return new LogicalSegmentBuilderImpl(segmentType, order);
+ return new LogicalSegmentBuilderImpl(segmentType);
}
public static class LogicalSegmentBuilderImpl implements PathSegment.PathSegmentBuilder {
private final LogicalSegmentType segmentType;
- private final IntegerEncoding order;
- public LogicalSegmentBuilderImpl(LogicalSegmentType segmentType, IntegerEncoding order) {
+ public LogicalSegmentBuilderImpl(LogicalSegmentType segmentType) {
this.segmentType = segmentType;
- this.order = order;
}
- public LogicalSegment build(IntegerEncoding order) {
-
- LogicalSegment logicalSegment = new LogicalSegment(segmentType, order);
+ public LogicalSegment build() {
+ LogicalSegment logicalSegment = new LogicalSegment(segmentType);
return logicalSegment;
}
}
diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegmentType.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegmentType.java
index 164b6211c1..87cdc672c5 100644
--- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegmentType.java
+++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/LogicalSegmentType.java
@@ -40,12 +40,8 @@ public abstract class LogicalSegmentType implements Message {
// Abstract accessors for discriminator values.
public abstract Byte getLogicalSegmentType();
- // Arguments.
- protected final IntegerEncoding order;
-
- public LogicalSegmentType(IntegerEncoding order) {
+ public LogicalSegmentType() {
super();
- this.order = order;
}
... 4293 lines suppressed ...