You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2024/08/31 21:24:41 UTC
(plc4x) 28/35: feat(code-gen/go): peek field reader
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit d88e5125aa5b7185cbf168110615c20b0b3d1b4d
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Aug 31 21:33:58 2024 +0200
feat(code-gen/go): peek field reader
---
.../templates/go/complex-type-template.go.ftlh | 57 +++-------------------
.../readwrite/model/BACnetCalendarEntry.go | 9 +---
.../bacnetip/readwrite/model/BACnetChannelValue.go | 9 +---
.../bacnetip/readwrite/model/BACnetClientCOV.go | 9 +---
...edServiceRequestAtomicReadFileStreamOrRecord.go | 8 +--
...rviceRequestConfirmedTextMessageMessageClass.go | 8 +--
.../BACnetConfirmedServiceRequestReadRangeRange.go | 8 +--
.../readwrite/model/BACnetConstructedData.go | 8 +--
.../model/BACnetConstructedDataElement.go | 8 +--
.../model/BACnetEventLogRecordLogDatum.go | 8 +--
.../readwrite/model/BACnetEventParameter.go | 9 +---
...BACnetEventParameterChangeOfValueCivCriteria.go | 8 +--
.../BACnetEventParameterExtendedParameters.go | 8 +--
.../readwrite/model/BACnetFaultParameter.go | 9 +---
...etFaultParameterFaultExtendedParametersEntry.go | 9 +---
...tFaultParameterFaultOutOfRangeMaxNormalValue.go | 8 +--
...tFaultParameterFaultOutOfRangeMinNormalValue.go | 8 +--
.../bacnetip/readwrite/model/BACnetHostAddress.go | 9 +---
.../model/BACnetLandingCallStatusCommand.go | 9 +---
.../bacnetip/readwrite/model/BACnetLogData.go | 8 +--
.../readwrite/model/BACnetLogDataLogDataEntry.go | 9 +---
.../readwrite/model/BACnetLogRecordLogDatum.go | 8 +--
.../model/BACnetNotificationParameters.go | 8 +--
...ationParametersChangeOfDiscreteValueNewValue.go | 8 +--
...tNotificationParametersChangeOfValueNewValue.go | 8 +--
...CnetNotificationParametersExtendedParameters.go | 8 +--
.../readwrite/model/BACnetOptionalBinaryPV.go | 9 +---
.../model/BACnetOptionalCharacterString.go | 9 +---
.../bacnetip/readwrite/model/BACnetOptionalREAL.go | 9 +---
.../readwrite/model/BACnetOptionalUnsigned.go | 9 +---
.../readwrite/model/BACnetPriorityValue.go | 9 +---
.../readwrite/model/BACnetProcessIdSelection.go | 9 +---
.../BACnetPropertyAccessResultAccessResult.go | 9 +---
.../readwrite/model/BACnetPropertyStates.go | 9 +---
.../model/BACnetReadAccessPropertyReadResult.go | 8 +--
.../bacnetip/readwrite/model/BACnetRecipient.go | 9 +---
.../bacnetip/readwrite/model/BACnetScale.go | 9 +---
...BACnetServiceAckAtomicReadFileStreamOrRecord.go | 8 +--
.../bacnetip/readwrite/model/BACnetShedLevel.go | 9 +---
.../readwrite/model/BACnetSpecialEventPeriod.go | 9 +---
.../bacnetip/readwrite/model/BACnetTimeStamp.go | 9 +---
.../readwrite/model/BACnetTimerStateChangeValue.go | 9 +---
.../BACnetUnconfirmedServiceRequestWhoHasObject.go | 9 +---
.../bacnetip/readwrite/model/BACnetValueSource.go | 9 +---
plc4go/protocols/cbus/readwrite/model/CALReply.go | 9 +---
.../protocols/cbus/readwrite/model/CALReplyLong.go | 9 +---
.../model/CBusPointToMultiPointCommand.go | 11 ++---
.../readwrite/model/CBusPointToPointCommand.go | 9 +---
.../model/CBusPointToPointToMultiPointCommand.go | 9 +---
.../protocols/cbus/readwrite/model/EncodedReply.go | 10 +---
.../cbus/readwrite/model/LevelInformation.go | 10 +---
.../protocols/cbus/readwrite/model/MonitoredSAL.go | 11 ++---
.../model/MonitoredSALLongFormSmartMode.go | 9 +---
.../model/MonitoredSALShortFormBasicMode.go | 9 +---
plc4go/protocols/cbus/readwrite/model/Reply.go | 11 ++---
.../cbus/readwrite/model/ReplyOrConfirmation.go | 10 +---
plc4go/protocols/cbus/readwrite/model/Request.go | 30 +-----------
.../protocols/cbus/readwrite/model/RequestReset.go | 30 +-----------
.../readwrite/model/RequestSmartConnectShortcut.go | 15 +-----
.../cbus/readwrite/model/StatusRequest.go | 11 ++---
60 files changed, 103 insertions(+), 526 deletions(-)
diff --git a/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
index cb63ca55d6..15edc267b7 100644
--- a/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/complex-type-template.go.ftlh
@@ -1092,58 +1092,13 @@ func ${type.name}ParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.WithStack(utils.${errorType}{Message: ${validationField.getDescription().orElse("\"Validation failed\"")}})<@emitImport import="github.com/pkg/errors" />
}
<#break>
- <#case "peek">
- <#assign peekField = field.asPeekField().orElseThrow()>
-
- // Peek Field (${peekField.name})
- <#if peekField.type.isSimpleTypeReference()>
- currentPos = positionAware.GetPos()
- ${peekField.name}, _err := ${helper.getReadBufferReadMethodCall(peekField.name, peekField.type.asSimpleTypeReference().orElseThrow(), peekField)}
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing '${peekField.name}' field of ${type.name}")<@emitImport import="github.com/pkg/errors" />
- }
- <#elseif helper.isEnumField(field)>
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("${peekField.name}"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for ${peekField.name}")<@emitImport import="github.com/pkg/errors" />
- }
- ${peekField.name}, _err := ${helper.getLanguageTypeNameForField(field)}ParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing '${peekField.name}' field of ${type.name}")<@emitImport import="github.com/pkg/errors" />
- }
- if closeErr := readBuffer.CloseContext("${peekField.name}"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for ${peekField.name}")<@emitImport import="github.com/pkg/errors" />
- }
- <#else>
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("${peekField.name}"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for ${peekField.name}")<@emitImport import="github.com/pkg/errors" />
- }
- <@compress single_line=true>
- <#assign complexTypeReference=peekField.type.asComplexTypeReference().orElseThrow()>
- <#assign typeName=complexTypeReference.name>
- <#assign typeDefinition=complexTypeReference.typeDefinition>
- <#if typeDefinition.isDiscriminatedChildTypeDefinition()>
- <#-- Usually you don't use child directly unless they are parameterized #-->
- <#assign typeName=typeDefinition.parentType.orElseThrow().name>
- <#assign typeDefinition=typeDefinition.parentType.orElseThrow()>
- </#if>
- <#assign hasRefParams=complexTypeReference.params.isPresent()>
- <#assign refParams>
- <#if hasRefParams>
- ,
- <#list complexTypeReference.params.orElseThrow() as parserArgument>
- ${helper.toTypedParseExpression(peekField, helper.getArgumentType(peekField.type, parserArgument?index), parserArgument, parserArguments)}
- <#sep>, </#sep>
- </#list>
- </#if>
- </#assign>
- ${peekField.name}, _ := ${typeName}ParseWithBuffer(ctx, readBuffer${refParams})
- </...@compress>
- </#if>
+ <#case "peek">
+ <#assign peekField = field.asPeekField().orElseThrow()>
+ <#assign typedField = field.asTypedField().orElseThrow()>
+ <#assign namedField = field.asNamedField().orElseThrow()>
- readBuffer.Reset(currentPos)
- <#break>
+ ${namedField.name},err := Read${field.typeName?cap_first}Field[${helper.getLanguageTypeNameForField(field)}](ctx, "${namedField.name}", ${helper.getDataReaderCall(typedField.type)}<#if peekField.offsetExpression.present>, ${helper.toParseExpression(peekField, helper.boolTypeReference, peekField.offsetExpression.get(), parserArguments)}<#else>, 0</#if>${helper.getFieldOptions(typedField, parserArguments)});
+ <#break>
</#switch>
</#list>
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
index 4db68c0717..51d16f5b94 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetCalendarEntry.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetCalendarEntryParseWithBuffer(ctx context.Context, readBuffer utils.Re
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
index bf7ea9601b..6d48618361 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetChannelValue.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -174,13 +175,7 @@ func BACnetChannelValueParseWithBuffer(ctx context.Context, readBuffer utils.Rea
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
index 1566507ed2..0f0b391d0b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetClientCOV.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetClientCOVParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
index a9778e5cfa..63c423c38e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecord.go
@@ -184,13 +184,7 @@ func BACnetConfirmedServiceRequestAtomicReadFileStreamOrRecordParseWithBuffer(ct
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
openingTag, err := ReadSimpleField[BACnetOpeningTag](ctx, "openingTag", ReadComplex[BACnetOpeningTag](BACnetOpeningTagParseWithBufferProducer((uint8)(peekedTagHeader.GetActualTagNumber())), readBuffer))
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
index cfb0a519a4..1d16a85f23 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessageMessageClass.go
@@ -192,13 +192,7 @@ func BACnetConfirmedServiceRequestConfirmedTextMessageMessageClassParseWithBuffe
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
index 8ecc931cef..b39c755c01 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRangeRange.go
@@ -184,13 +184,7 @@ func BACnetConfirmedServiceRequestReadRangeRangeParseWithBuffer(ctx context.Cont
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
openingTag, err := ReadSimpleField[BACnetOpeningTag](ctx, "openingTag", ReadComplex[BACnetOpeningTag](BACnetOpeningTagParseWithBufferProducer((uint8)(peekedTagHeader.GetActualTagNumber())), readBuffer))
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
index 030416c211..dc0c459361 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedData.go
@@ -199,13 +199,7 @@ func BACnetConstructedDataParseWithBuffer(ctx context.Context, readBuffer utils.
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
index 4fe0631125..283e182daf 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetConstructedDataElement.go
@@ -233,13 +233,7 @@ func BACnetConstructedDataElementParseWithBuffer(ctx context.Context, readBuffer
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
index 244546a483..3dd6f35c03 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventLogRecordLogDatum.go
@@ -192,13 +192,7 @@ func BACnetEventLogRecordLogDatumParseWithBuffer(ctx context.Context, readBuffer
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
index 41cae87a74..0827906ae0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameter.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetEventParameterParseWithBuffer(ctx context.Context, readBuffer utils.R
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
index 1c813e6a37..1552c2c9da 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterChangeOfValueCivCriteria.go
@@ -192,13 +192,7 @@ func BACnetEventParameterChangeOfValueCivCriteriaParseWithBuffer(ctx context.Con
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
index e5c5367daf..970dec2cf4 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetEventParameterExtendedParameters.go
@@ -438,13 +438,7 @@ func BACnetEventParameterExtendedParametersParseWithBuffer(ctx context.Context,
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
index b20e2d646c..483fc2d91b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameter.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetFaultParameterParseWithBuffer(ctx context.Context, readBuffer utils.R
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
index 848658a3ab..cd1aa82828 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultExtendedParametersEntry.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -174,13 +175,7 @@ func BACnetFaultParameterFaultExtendedParametersEntryParseWithBuffer(ctx context
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
index ba31911d85..6fe57a1335 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMaxNormalValue.go
@@ -192,13 +192,7 @@ func BACnetFaultParameterFaultOutOfRangeMaxNormalValueParseWithBuffer(ctx contex
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
index 6fe7ac96bf..730d73ffb0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetFaultParameterFaultOutOfRangeMinNormalValue.go
@@ -192,13 +192,7 @@ func BACnetFaultParameterFaultOutOfRangeMinNormalValueParseWithBuffer(ctx contex
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
index 5977ef2454..78f4f4be51 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetHostAddress.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetHostAddressParseWithBuffer(ctx context.Context, readBuffer utils.Read
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
index fdf00ad14d..96a387aa8d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLandingCallStatusCommand.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetLandingCallStatusCommandParseWithBuffer(ctx context.Context, readBuff
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
index e13c8cbc4a..93bfe38d25 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogData.go
@@ -192,13 +192,7 @@ func BACnetLogDataParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuff
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
index a2bb2155f7..c3871f80b0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogDataLogDataEntry.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetLogDataLogDataEntryParseWithBuffer(ctx context.Context, readBuffer ut
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
index 9ea65f4e27..6713d67de7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetLogRecordLogDatum.go
@@ -192,13 +192,7 @@ func BACnetLogRecordLogDatumParseWithBuffer(ctx context.Context, readBuffer util
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
index 1447d22acb..c68ae7eee0 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParameters.go
@@ -193,13 +193,7 @@ func BACnetNotificationParametersParseWithBuffer(ctx context.Context, readBuffer
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
index 408089f14b..c33e094d0b 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfDiscreteValueNewValue.go
@@ -203,13 +203,7 @@ func BACnetNotificationParametersChangeOfDiscreteValueNewValueParseWithBuffer(ct
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
index 9d8d3b8005..a8d55737ed 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersChangeOfValueNewValue.go
@@ -192,13 +192,7 @@ func BACnetNotificationParametersChangeOfValueNewValueParseWithBuffer(ctx contex
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
index 6266f6661e..2eae9b5159 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetNotificationParametersExtendedParameters.go
@@ -438,13 +438,7 @@ func BACnetNotificationParametersExtendedParametersParseWithBuffer(ctx context.C
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'openingTag' field"))
}
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
index 37867aade2..042e30b514 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalBinaryPV.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetOptionalBinaryPVParseWithBuffer(ctx context.Context, readBuffer utils
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
index cc2a6b1a4e..e4cec6002f 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalCharacterString.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetOptionalCharacterStringParseWithBuffer(ctx context.Context, readBuffe
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
index ce48cd4cbb..5b9cbae29e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalREAL.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetOptionalREALParseWithBuffer(ctx context.Context, readBuffer utils.Rea
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
index b39d8db1c7..c1f5301ed8 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetOptionalUnsigned.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetOptionalUnsignedParseWithBuffer(ctx context.Context, readBuffer utils
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
index c8afae939c..e51df56aaa 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPriorityValue.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -177,13 +178,7 @@ func BACnetPriorityValueParseWithBuffer(ctx context.Context, readBuffer utils.Re
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
index 9afce85e8c..0716a9c2b7 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetProcessIdSelection.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetProcessIdSelectionParseWithBuffer(ctx context.Context, readBuffer uti
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
index 82a6d425bc..78d5d75c09 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyAccessResultAccessResult.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -168,13 +169,7 @@ func BACnetPropertyAccessResultAccessResultParseWithBuffer(ctx context.Context,
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
index 28da164511..e5c3e5bc86 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetPropertyStates.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetPropertyStatesParseWithBuffer(ctx context.Context, readBuffer utils.R
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
index 1423e27c52..92371c3c68 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetReadAccessPropertyReadResult.go
@@ -171,13 +171,7 @@ func BACnetReadAccessPropertyReadResultParseWithBuffer(ctx context.Context, read
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
index 4e067a8375..c2b0e608be 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetRecipient.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetRecipientParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
index 3b68b11779..edbf358f7a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetScale.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetScaleParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
index e5fb998d18..a33501f1ee 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFileStreamOrRecord.go
@@ -184,13 +184,7 @@ func BACnetServiceAckAtomicReadFileStreamOrRecordParseWithBuffer(ctx context.Con
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
openingTag, err := ReadSimpleField[BACnetOpeningTag](ctx, "openingTag", ReadComplex[BACnetOpeningTag](BACnetOpeningTagParseWithBufferProducer((uint8)(peekedTagHeader.GetActualTagNumber())), readBuffer))
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
index 239cee1e5e..6aba8ef30a 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetShedLevel.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetShedLevelParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
index c3c7a83ef3..7af655c1e3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetSpecialEventPeriod.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetSpecialEventPeriodParseWithBuffer(ctx context.Context, readBuffer uti
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
index 3114d55623..5fc8cac9f1 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimeStamp.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetTimeStampParseWithBuffer(ctx context.Context, readBuffer utils.ReadBu
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
index bdd28504ad..e1bbdab609 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetTimerStateChangeValue.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -177,13 +178,7 @@ func BACnetTimerStateChangeValueParseWithBuffer(ctx context.Context, readBuffer
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
index 5cfd8fb841..d0b038fe60 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHasObject.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetUnconfirmedServiceRequestWhoHasObjectParseWithBuffer(ctx context.Cont
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
index f5078203fc..a651c0989d 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetValueSource.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -163,13 +164,7 @@ func BACnetValueSourceParseWithBuffer(ctx context.Context, readBuffer utils.Read
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedTagHeader)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedTagHeader"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedTagHeader")
- }
- peekedTagHeader, _ := BACnetTagHeaderParseWithBuffer(ctx, readBuffer)
- readBuffer.Reset(currentPos)
+ peekedTagHeader, err := ReadPeekField[BACnetTagHeader](ctx, "peekedTagHeader", ReadComplex[BACnetTagHeader](BACnetTagHeaderParseWithBuffer, readBuffer), 0)
peekedTagNumber, err := ReadVirtualField[uint8](ctx, "peekedTagNumber", (*uint8)(nil), peekedTagHeader.GetActualTagNumber())
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReply.go b/plc4go/protocols/cbus/readwrite/model/CALReply.go
index 93f191f544..21b287470e 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReply.go
@@ -159,14 +159,7 @@ func CALReplyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, c
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (calType)
- currentPos = positionAware.GetPos()
- calType, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("calType")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'calType' field of CALReply")
- }
-
- readBuffer.Reset(currentPos)
+ calType, err := ReadPeekField[byte](ctx, "calType", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type CALReplyChildSerializeRequirement interface {
diff --git a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
index 4710082765..5d6f53fb34 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALReplyLong.go
@@ -245,14 +245,7 @@ func CALReplyLongParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing reserved field"))
}
- // Peek Field (terminatingByte)
- currentPos = positionAware.GetPos()
- terminatingByte, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint32("terminatingByte", 24)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'terminatingByte' field of CALReplyLong")
- }
-
- readBuffer.Reset(currentPos)
+ terminatingByte, err := ReadPeekField[uint32](ctx, "terminatingByte", ReadUnsignedInt(readBuffer, uint8(24)), 0)
isUnitAddress, err := ReadVirtualField[bool](ctx, "isUnitAddress", (*bool)(nil), bool((terminatingByte&0xff) == (0x00)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
index f5a24e9e7d..230d99f3d0 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToMultiPointCommand.go
@@ -26,6 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -146,14 +148,7 @@ func CBusPointToMultiPointCommandParseWithBuffer(ctx context.Context, readBuffer
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedApplication)
- currentPos = positionAware.GetPos()
- peekedApplication, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("peekedApplication")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedApplication' field of CBusPointToMultiPointCommand")
- }
-
- readBuffer.Reset(currentPos)
+ peekedApplication, err := ReadPeekField[byte](ctx, "peekedApplication", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type CBusPointToMultiPointCommandChildSerializeRequirement interface {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
index 714da5ce6b..59e1aa73a7 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointCommand.go
@@ -177,14 +177,7 @@ func CBusPointToPointCommandParseWithBuffer(ctx context.Context, readBuffer util
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (bridgeAddressCountPeek)
- currentPos = positionAware.GetPos()
- bridgeAddressCountPeek, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint16("bridgeAddressCountPeek", 16)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'bridgeAddressCountPeek' field of CBusPointToPointCommand")
- }
-
- readBuffer.Reset(currentPos)
+ bridgeAddressCountPeek, err := ReadPeekField[uint16](ctx, "bridgeAddressCountPeek", ReadUnsignedShort(readBuffer, uint8(16)), 0)
isDirect, err := ReadVirtualField[bool](ctx, "isDirect", (*bool)(nil), bool((bridgeAddressCountPeek&0x00FF) == (0x0000)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
index e85e2f88e0..f1e8bddb2c 100644
--- a/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
+++ b/plc4go/protocols/cbus/readwrite/model/CBusPointToPointToMultiPointCommand.go
@@ -178,14 +178,7 @@ func CBusPointToPointToMultiPointCommandParseWithBuffer(ctx context.Context, rea
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'networkRoute' field"))
}
- // Peek Field (peekedApplication)
- currentPos = positionAware.GetPos()
- peekedApplication, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("peekedApplication")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedApplication' field of CBusPointToPointToMultiPointCommand")
- }
-
- readBuffer.Reset(currentPos)
+ peekedApplication, err := ReadPeekField[byte](ctx, "peekedApplication", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type CBusPointToPointToMultiPointCommandChildSerializeRequirement interface {
diff --git a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
index c8577802bc..272f09c37b 100644
--- a/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
+++ b/plc4go/protocols/cbus/readwrite/model/EncodedReply.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -167,14 +168,7 @@ func EncodedReplyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedByte)
- currentPos = positionAware.GetPos()
- peekedByte, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("peekedByte")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedByte' field of EncodedReply")
- }
-
- readBuffer.Reset(currentPos)
+ peekedByte, err := ReadPeekField[byte](ctx, "peekedByte", ReadByte(readBuffer, 8), 0)
isMonitoredSAL, err := ReadVirtualField[bool](ctx, "isMonitoredSAL", (*bool)(nil), bool((bool(bool(bool((peekedByte&0x3F) == (0x05))) || bool(bool((peekedByte) == (0x00)))) || bool(bool((peekedByte&0xF8) == (0x00))))) && bool(!(requestContext.GetSendIdentifyRequestBefore())))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
index dceb59e5d5..54a0ebb3e4 100644
--- a/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
+++ b/plc4go/protocols/cbus/readwrite/model/LevelInformation.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -234,14 +235,7 @@ func LevelInformationParseWithBuffer(ctx context.Context, readBuffer utils.ReadB
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (raw)
- currentPos = positionAware.GetPos()
- raw, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint16("raw", 16)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'raw' field of LevelInformation")
- }
-
- readBuffer.Reset(currentPos)
+ raw, err := ReadPeekField[uint16](ctx, "raw", ReadUnsignedShort(readBuffer, uint8(16)), 0)
nibble1, err := ReadVirtualField[uint8](ctx, "nibble1", (*uint8)(nil), (raw&0xF000)>>uint8(12))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
index ba406aa2f5..b1b0e0e11c 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSAL.go
@@ -26,6 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -146,14 +148,7 @@ func MonitoredSALParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (salType)
- currentPos = positionAware.GetPos()
- salType, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("salType")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'salType' field of MonitoredSAL")
- }
-
- readBuffer.Reset(currentPos)
+ salType, err := ReadPeekField[byte](ctx, "salType", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type MonitoredSALChildSerializeRequirement interface {
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
index 013420449f..2f3e17e6fb 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALLongFormSmartMode.go
@@ -259,14 +259,7 @@ func MonitoredSALLongFormSmartModeParseWithBuffer(ctx context.Context, readBuffe
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing reserved field"))
}
- // Peek Field (terminatingByte)
- currentPos = positionAware.GetPos()
- terminatingByte, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint32("terminatingByte", 24)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'terminatingByte' field of MonitoredSALLongFormSmartMode")
- }
-
- readBuffer.Reset(currentPos)
+ terminatingByte, err := ReadPeekField[uint32](ctx, "terminatingByte", ReadUnsignedInt(readBuffer, uint8(24)), 0)
isUnitAddress, err := ReadVirtualField[bool](ctx, "isUnitAddress", (*bool)(nil), bool((terminatingByte&0xff) == (0x00)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
index 64992988e6..f783025a40 100644
--- a/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
+++ b/plc4go/protocols/cbus/readwrite/model/MonitoredSALShortFormBasicMode.go
@@ -207,14 +207,7 @@ func MonitoredSALShortFormBasicModeParseWithBuffer(ctx context.Context, readBuff
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (counts)
- currentPos = positionAware.GetPos()
- counts, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("counts")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'counts' field of MonitoredSALShortFormBasicMode")
- }
-
- readBuffer.Reset(currentPos)
+ counts, err := ReadPeekField[byte](ctx, "counts", ReadByte(readBuffer, 8), 0)
bridgeCount, err := ReadOptionalField[uint8](ctx, "bridgeCount", ReadUnsignedByte(readBuffer, uint8(8)), bool((counts) != (0x00)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/Reply.go b/plc4go/protocols/cbus/readwrite/model/Reply.go
index f9a5a94adf..fcbb253790 100644
--- a/plc4go/protocols/cbus/readwrite/model/Reply.go
+++ b/plc4go/protocols/cbus/readwrite/model/Reply.go
@@ -26,6 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -147,14 +149,7 @@ func ReplyParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, cBus
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedByte)
- currentPos = positionAware.GetPos()
- peekedByte, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("peekedByte")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedByte' field of Reply")
- }
-
- readBuffer.Reset(currentPos)
+ peekedByte, err := ReadPeekField[byte](ctx, "peekedByte", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type ReplyChildSerializeRequirement interface {
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
index 176e64d6ad..008f709070 100644
--- a/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
+++ b/plc4go/protocols/cbus/readwrite/model/ReplyOrConfirmation.go
@@ -27,6 +27,7 @@ import (
"github.com/rs/zerolog"
. "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -168,14 +169,7 @@ func ReplyOrConfirmationParseWithBuffer(ctx context.Context, readBuffer utils.Re
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedByte)
- currentPos = positionAware.GetPos()
- peekedByte, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("peekedByte")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedByte' field of ReplyOrConfirmation")
- }
-
- readBuffer.Reset(currentPos)
+ peekedByte, err := ReadPeekField[byte](ctx, "peekedByte", ReadByte(readBuffer, 8), 0)
isAlpha, err := ReadVirtualField[bool](ctx, "isAlpha", (*bool)(nil), bool((bool((peekedByte) >= (0x67)))) && bool((bool((peekedByte) <= (0x7A)))))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/Request.go b/plc4go/protocols/cbus/readwrite/model/Request.go
index 0f6e8c7c7b..70a15f8d1c 100644
--- a/plc4go/protocols/cbus/readwrite/model/Request.go
+++ b/plc4go/protocols/cbus/readwrite/model/Request.go
@@ -212,20 +212,7 @@ func RequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, cB
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (peekedByte)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("peekedByte"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for peekedByte")
- }
- peekedByte, _err := RequestTypeParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'peekedByte' field of Request")
- }
- if closeErr := readBuffer.CloseContext("peekedByte"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for peekedByte")
- }
-
- readBuffer.Reset(currentPos)
+ peekedByte, err := ReadPeekField[RequestType](ctx, "peekedByte", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), 0)
startingCR, err := ReadOptionalField[RequestType](ctx, "startingCR", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), bool((peekedByte) == (RequestType_EMPTY)))
if err != nil {
@@ -237,20 +224,7 @@ func RequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, cB
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'resetMode' field"))
}
- // Peek Field (secondPeek)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("secondPeek"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for secondPeek")
- }
- secondPeek, _err := RequestTypeParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'secondPeek' field of Request")
- }
- if closeErr := readBuffer.CloseContext("secondPeek"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for secondPeek")
- }
-
- readBuffer.Reset(currentPos)
+ secondPeek, err := ReadPeekField[RequestType](ctx, "secondPeek", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), 0)
actualPeek, err := ReadVirtualField[RequestType](ctx, "actualPeek", (*RequestType)(nil), CastRequestType(utils.InlineIf(bool((bool(bool((startingCR) == (nil))) && bool(bool((resetMode) == (nil))))) || bool((bool(bool(bool((startingCR) == (nil))) && bool(bool((resetMode) != (nil)))) && bool(bool((secondPeek) == (RequestType_EMPTY))))), func() any { return CastRequestType(peekedByte) }, func() any { return CastRequestType(secondPeek) })))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestReset.go b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
index 65b0a95be7..c66429389a 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestReset.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestReset.go
@@ -182,40 +182,14 @@ func RequestResetParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (tildePeek)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("tildePeek"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for tildePeek")
- }
- tildePeek, _err := RequestTypeParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'tildePeek' field of RequestReset")
- }
- if closeErr := readBuffer.CloseContext("tildePeek"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for tildePeek")
- }
-
- readBuffer.Reset(currentPos)
+ tildePeek, err := ReadPeekField[RequestType](ctx, "tildePeek", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), 0)
secondTilde, err := ReadOptionalField[RequestType](ctx, "secondTilde", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), bool((tildePeek) == (RequestType_RESET)))
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("Error parsing 'secondTilde' field"))
}
- // Peek Field (tildePeek2)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("tildePeek2"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for tildePeek2")
- }
- tildePeek2, _err := RequestTypeParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'tildePeek2' field of RequestReset")
- }
- if closeErr := readBuffer.CloseContext("tildePeek2"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for tildePeek2")
- }
-
- readBuffer.Reset(currentPos)
+ tildePeek2, err := ReadPeekField[RequestType](ctx, "tildePeek2", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), 0)
thirdTilde, err := ReadOptionalField[RequestType](ctx, "thirdTilde", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), bool((tildePeek2) == (RequestType_RESET)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
index 873ca3ac5f..66d8141183 100644
--- a/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
+++ b/plc4go/protocols/cbus/readwrite/model/RequestSmartConnectShortcut.go
@@ -186,20 +186,7 @@ func RequestSmartConnectShortcutParseWithBuffer(ctx context.Context, readBuffer
}
_ = pipe
- // Peek Field (pipePeek)
- currentPos = positionAware.GetPos()
- if pullErr := readBuffer.PullContext("pipePeek"); pullErr != nil {
- return nil, errors.Wrap(pullErr, "Error pulling for pipePeek")
- }
- pipePeek, _err := RequestTypeParseWithBuffer(ctx, readBuffer)
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'pipePeek' field of RequestSmartConnectShortcut")
- }
- if closeErr := readBuffer.CloseContext("pipePeek"); closeErr != nil {
- return nil, errors.Wrap(closeErr, "Error closing for pipePeek")
- }
-
- readBuffer.Reset(currentPos)
+ pipePeek, err := ReadPeekField[RequestType](ctx, "pipePeek", ReadEnum(RequestTypeByValue, ReadUnsignedByte(readBuffer, uint8(8))), 0)
secondPipe, err := ReadOptionalField[byte](ctx, "secondPipe", ReadByte(readBuffer, 8), bool((pipePeek) == (RequestType_SMART_CONNECT_SHORTCUT)))
if err != nil {
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
index f819b9672c..ca4159470e 100644
--- a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
+++ b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
@@ -26,6 +26,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/fields"
+ . "github.com/apache/plc4x/plc4go/spi/codegen/io"
"github.com/apache/plc4x/plc4go/spi/utils"
)
@@ -143,14 +145,7 @@ func StatusRequestParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuff
currentPos := positionAware.GetPos()
_ = currentPos
- // Peek Field (statusType)
- currentPos = positionAware.GetPos()
- statusType, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadByte("statusType")
- if _err != nil {
- return nil, errors.Wrap(_err, "Error parsing 'statusType' field of StatusRequest")
- }
-
- readBuffer.Reset(currentPos)
+ statusType, err := ReadPeekField[byte](ctx, "statusType", ReadByte(readBuffer, 8), 0)
// Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
type StatusRequestChildSerializeRequirement interface {