You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/05/17 12:40:51 UTC
[plc4x] 02/03: refactor(plc4go/spi): ignore callbacks in builder for code generation
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 24eeddbabe7182298de505f0334a90460b47ae79
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed May 17 14:19:47 2023 +0200
refactor(plc4go/spi): ignore callbacks in builder for code generation
---
plc4go/spi/model/DefaultPlcBrowseRequest.go | 4 +-
.../DefaultPlcBrowseRequestBuilder_plc4xgen.go | 38 ---------------
plc4go/spi/model/DefaultPlcReadRequest.go | 6 +--
.../model/DefaultPlcReadRequestBuilder_plc4xgen.go | 57 ----------------------
plc4go/spi/model/DefaultPlcSubscriptionRequest.go | 6 +--
...efaultPlcSubscriptionRequestBuilder_plc4xgen.go | 57 ----------------------
6 files changed, 8 insertions(+), 160 deletions(-)
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequest.go b/plc4go/spi/model/DefaultPlcBrowseRequest.go
index 8da30e9fb0..f0f625c3cc 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequest.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequest.go
@@ -29,8 +29,8 @@ import (
//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseRequestBuilder
type DefaultPlcBrowseRequestBuilder struct {
- tagHandler spi.PlcTagHandler
- browser spi.PlcBrowser
+ tagHandler spi.PlcTagHandler `ignore:"true"`
+ browser spi.PlcBrowser `ignore:"true"`
// The double structure is in order to preserve the order of elements.
queryNames []string
queryStrings map[string]string
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
index 8a3903a903..a9d69dd885 100644
--- a/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestBuilder_plc4xgen.go
@@ -42,44 +42,6 @@ func (d *DefaultPlcBrowseRequestBuilder) SerializeWithWriteBuffer(ctx context.Co
if err := writeBuffer.PushContext("PlcBrowseRequestBuilder"); err != nil {
return err
}
-
- if d.tagHandler != nil {
- if serializableField, ok := d.tagHandler.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("tagHandler"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("tagHandler"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.tagHandler)
- if err := writeBuffer.WriteString("tagHandler", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
-
- if d.browser != nil {
- if serializableField, ok := d.browser.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("browser"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("browser"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.browser)
- if err := writeBuffer.WriteString("browser", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
if err := writeBuffer.PushContext("queryNames", utils.WithRenderAsList(true)); err != nil {
return err
}
diff --git a/plc4go/spi/model/DefaultPlcReadRequest.go b/plc4go/spi/model/DefaultPlcReadRequest.go
index 553627e374..08ebc85e1e 100644
--- a/plc4go/spi/model/DefaultPlcReadRequest.go
+++ b/plc4go/spi/model/DefaultPlcReadRequest.go
@@ -31,12 +31,12 @@ import (
//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcReadRequestBuilder
type DefaultPlcReadRequestBuilder struct {
- reader spi.PlcReader
- tagHandler spi.PlcTagHandler
+ reader spi.PlcReader `ignore:"true"`
+ tagHandler spi.PlcTagHandler `ignore:"true"`
tagNames []string
tagAddresses map[string]string
tags map[string]apiModel.PlcTag
- readRequestInterceptor interceptors.ReadRequestInterceptor
+ readRequestInterceptor interceptors.ReadRequestInterceptor `ignore:"true"`
}
func NewDefaultPlcReadRequestBuilder(tagHandler spi.PlcTagHandler, reader spi.PlcReader) apiModel.PlcReadRequestBuilder {
diff --git a/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
index b73a9a6883..2ae90c109d 100644
--- a/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcReadRequestBuilder_plc4xgen.go
@@ -42,44 +42,6 @@ func (d *DefaultPlcReadRequestBuilder) SerializeWithWriteBuffer(ctx context.Cont
if err := writeBuffer.PushContext("PlcReadRequestBuilder"); err != nil {
return err
}
-
- if d.reader != nil {
- if serializableField, ok := d.reader.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("reader"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("reader"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.reader)
- if err := writeBuffer.WriteString("reader", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
-
- if d.tagHandler != nil {
- if serializableField, ok := d.tagHandler.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("tagHandler"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("tagHandler"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.tagHandler)
- if err := writeBuffer.WriteString("tagHandler", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
if err := writeBuffer.PushContext("tagNames", utils.WithRenderAsList(true)); err != nil {
return err
}
@@ -129,25 +91,6 @@ func (d *DefaultPlcReadRequestBuilder) SerializeWithWriteBuffer(ctx context.Cont
if err := writeBuffer.PopContext("tags", utils.WithRenderAsList(true)); err != nil {
return err
}
-
- if d.readRequestInterceptor != nil {
- if serializableField, ok := d.readRequestInterceptor.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("readRequestInterceptor"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("readRequestInterceptor"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.readRequestInterceptor)
- if err := writeBuffer.WriteString("readRequestInterceptor", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
if err := writeBuffer.PopContext("PlcReadRequestBuilder"); err != nil {
return err
}
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequest.go b/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
index 5f87b9f0f2..72a9028000 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequest.go
@@ -51,9 +51,9 @@ func (s SubscriptionType) String() string {
//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionRequestBuilder
type DefaultPlcSubscriptionRequestBuilder struct {
- subscriber spi.PlcSubscriber
- tagHandler spi.PlcTagHandler
- valueHandler spi.PlcValueHandler
+ subscriber spi.PlcSubscriber `ignore:"true"`
+ tagHandler spi.PlcTagHandler `ignore:"true"`
+ valueHandler spi.PlcValueHandler `ignore:"true"`
tagNames []string
tagAddresses map[string]string
tags map[string]apiModel.PlcTag
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
index 4d49548e12..bf15058ecb 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestBuilder_plc4xgen.go
@@ -42,63 +42,6 @@ func (d *DefaultPlcSubscriptionRequestBuilder) SerializeWithWriteBuffer(ctx cont
if err := writeBuffer.PushContext("PlcSubscriptionRequestBuilder"); err != nil {
return err
}
-
- if d.subscriber != nil {
- if serializableField, ok := d.subscriber.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("subscriber"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("subscriber"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.subscriber)
- if err := writeBuffer.WriteString("subscriber", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
-
- if d.tagHandler != nil {
- if serializableField, ok := d.tagHandler.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("tagHandler"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("tagHandler"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.tagHandler)
- if err := writeBuffer.WriteString("tagHandler", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
-
- if d.valueHandler != nil {
- if serializableField, ok := d.valueHandler.(utils.Serializable); ok {
- if err := writeBuffer.PushContext("valueHandler"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("valueHandler"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.valueHandler)
- if err := writeBuffer.WriteString("valueHandler", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
- return err
- }
- }
- }
if err := writeBuffer.PushContext("tagNames", utils.WithRenderAsList(true)); err != nil {
return err
}