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/09/04 20:54:38 UTC
(plc4x) 03/05: fix(plc4go/plc4xGenerator): fix broken fallback rendering
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 d183e52822e10e05b6dc9d6829acac9526e11ae0
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Sep 4 22:02:43 2024 +0200
fix(plc4go/plc4xGenerator): fix broken fallback rendering
---
.../bacnetip/ApplicationLayerMessageCodec.go | 2 +-
.../ApplicationLayerMessageCodec_plc4xgen.go | 27 ++++++++--------------
plc4go/internal/bacnetip/Subscriber_plc4xgen.go | 2 +-
.../bacgopes/app_BIPSimpleApplication_plc4xgen.go | 14 +++++------
.../bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go | 2 +-
.../bacgopes/device_WhoIsIAmServices_plc4xgen.go | 2 +-
.../bacnetip/bacgopes/iocb_IOCB_plc4xgen.go | 2 +-
.../bacgopes/iocb_IOQController_plc4xgen.go | 2 +-
.../bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go | 2 +-
.../bacnetip/bacgopes/udp_UDPActor_plc4xgen.go | 4 ++--
plc4go/internal/cbus/Connection_plc4xgen.go | 2 +-
plc4go/internal/knxnetip/Subscriber_plc4xgen.go | 2 +-
plc4go/internal/opcua/Configuration_plc4xgen.go | 2 +-
plc4go/internal/opcua/Connection_plc4xgen.go | 4 ++--
plc4go/internal/opcua/SecureChannel_plc4xgen.go | 6 ++---
plc4go/internal/opcua/Subscriber_plc4xgen.go | 2 +-
plc4go/spi/pool/workItem_plc4xgen.go | 2 +-
plc4go/tools/plc4xGenerator/main.go | 2 +-
18 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
index ee2e07d959..23cd93b5d6 100644
--- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
+++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go
@@ -41,7 +41,7 @@ import (
type ApplicationLayerMessageCodec struct {
bipSimpleApplication *bacgopes.BIPSimpleApplication
messageCode *MessageCodec
- deviceInfoCache bacgopes.DeviceInfoCache
+ deviceInfoCache bacgopes.DeviceInfoCache `directSerialize:"true"`
localAddress *net.UDPAddr `stringer:"true"`
remoteAddress *net.UDPAddr `stringer:"true"`
diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
index 7b62812975..6d0e4ed1e7 100644
--- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
+++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec_plc4xgen.go
@@ -69,7 +69,7 @@ func (d *ApplicationLayerMessageCodec) SerializeWithWriteBuffer(ctx context.Cont
}
if d.messageCode != nil {
{
- _value := fmt.Sprintf("%v", *d.messageCode)
+ _value := fmt.Sprintf("%v", d.messageCode)
if err := writeBuffer.WriteString("messageCode", uint32(len(_value)*8), _value); err != nil {
return err
@@ -77,23 +77,14 @@ func (d *ApplicationLayerMessageCodec) SerializeWithWriteBuffer(ctx context.Cont
}
}
- if d.deviceInfoCache != nil {
- if serializableField, ok := any(d.deviceInfoCache).(utils.Serializable); ok {
- if err := writeBuffer.PushContext("deviceInfoCache"); err != nil {
- return err
- }
- if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
- return err
- }
- if err := writeBuffer.PopContext("deviceInfoCache"); err != nil {
- return err
- }
- } else {
- stringValue := fmt.Sprintf("%v", d.deviceInfoCache)
- if err := writeBuffer.WriteString("deviceInfoCache", uint32(len(stringValue)*8), stringValue); err != nil {
- return err
- }
- }
+ if err := writeBuffer.PushContext("deviceInfoCache"); err != nil {
+ return err
+ }
+ if err := d.deviceInfoCache.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
+ return err
+ }
+ if err := writeBuffer.PopContext("deviceInfoCache"); err != nil {
+ return err
}
if d.localAddress != nil {
if err := writeBuffer.WriteString("localAddress", uint32(len(d.localAddress.String())*8), d.localAddress.String()); err != nil {
diff --git a/plc4go/internal/bacnetip/Subscriber_plc4xgen.go b/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
index e8aa0d30a7..99898d2636 100644
--- a/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
+++ b/plc4go/internal/bacnetip/Subscriber_plc4xgen.go
@@ -50,7 +50,7 @@ func (d *Subscriber) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.connection != nil {
{
- _value := fmt.Sprintf("%v", *d.connection)
+ _value := fmt.Sprintf("%v", d.connection)
if err := writeBuffer.WriteString("connection", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
index a3a5e6844d..ada80d9112 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication_plc4xgen.go
@@ -66,7 +66,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.asap != nil {
{
- _value := fmt.Sprintf("%v", *d.asap)
+ _value := fmt.Sprintf("%v", d.asap)
if err := writeBuffer.WriteString("asap", uint32(len(_value)*8), _value); err != nil {
return err
@@ -75,7 +75,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.smap != nil {
{
- _value := fmt.Sprintf("%v", *d.smap)
+ _value := fmt.Sprintf("%v", d.smap)
if err := writeBuffer.WriteString("smap", uint32(len(_value)*8), _value); err != nil {
return err
@@ -84,7 +84,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.nsap != nil {
{
- _value := fmt.Sprintf("%v", *d.nsap)
+ _value := fmt.Sprintf("%v", d.nsap)
if err := writeBuffer.WriteString("nsap", uint32(len(_value)*8), _value); err != nil {
return err
@@ -93,7 +93,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.nse != nil {
{
- _value := fmt.Sprintf("%v", *d.nse)
+ _value := fmt.Sprintf("%v", d.nse)
if err := writeBuffer.WriteString("nse", uint32(len(_value)*8), _value); err != nil {
return err
@@ -102,7 +102,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.bip != nil {
{
- _value := fmt.Sprintf("%v", *d.bip)
+ _value := fmt.Sprintf("%v", d.bip)
if err := writeBuffer.WriteString("bip", uint32(len(_value)*8), _value); err != nil {
return err
@@ -111,7 +111,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.annexj != nil {
{
- _value := fmt.Sprintf("%v", *d.annexj)
+ _value := fmt.Sprintf("%v", d.annexj)
if err := writeBuffer.WriteString("annexj", uint32(len(_value)*8), _value); err != nil {
return err
@@ -120,7 +120,7 @@ func (d *BIPSimpleApplication) SerializeWithWriteBuffer(ctx context.Context, wri
}
if d.mux != nil {
{
- _value := fmt.Sprintf("%v", *d.mux)
+ _value := fmt.Sprintf("%v", d.mux)
if err := writeBuffer.WriteString("mux", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
index 4e1ebb08e7..1478f026ab 100644
--- a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo_plc4xgen.go
@@ -96,7 +96,7 @@ func (d *DeviceInfo) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.MaximumNpduLength != nil {
{
- _value := fmt.Sprintf("%v", *d.MaximumNpduLength)
+ _value := fmt.Sprintf("%v", d.MaximumNpduLength)
if err := writeBuffer.WriteString("maximumNpduLength", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
index 515cf83a7c..7ec29eef1f 100644
--- a/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/device_WhoIsIAmServices_plc4xgen.go
@@ -60,7 +60,7 @@ func (d *WhoIsIAmServices) SerializeWithWriteBuffer(ctx context.Context, writeBu
}
if d.localDevice != nil {
{
- _value := fmt.Sprintf("%v", *d.localDevice)
+ _value := fmt.Sprintf("%v", d.localDevice)
if err := writeBuffer.WriteString("localDevice", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
index 0bb7b054fe..6365d85885 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
@@ -61,7 +61,7 @@ func (d *IOCB) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.W
}
if d.destination != nil {
{
- _value := fmt.Sprintf("%v", *d.destination)
+ _value := fmt.Sprintf("%v", d.destination)
if err := writeBuffer.WriteString("destination", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
index 05fa15f594..e96cd9153b 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController_plc4xgen.go
@@ -67,7 +67,7 @@ func (d *IOQController) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
}
if d.ioQueue != nil {
{
- _value := fmt.Sprintf("%v", *d.ioQueue)
+ _value := fmt.Sprintf("%v", d.ioQueue)
if err := writeBuffer.WriteString("ioQueue", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
index 574077a4e1..32a6ed6aeb 100644
--- a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue_plc4xgen.go
@@ -57,7 +57,7 @@ func (d *SieveQueue) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.address != nil {
{
- _value := fmt.Sprintf("%v", *d.address)
+ _value := fmt.Sprintf("%v", d.address)
if err := writeBuffer.WriteString("address", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
index b11d814fc0..2a81835b27 100644
--- a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
+++ b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor_plc4xgen.go
@@ -50,7 +50,7 @@ func (d *UDPActor) SerializeWithWriteBuffer(ctx context.Context, writeBuffer uti
}
if d.director != nil {
{
- _value := fmt.Sprintf("%v", *d.director)
+ _value := fmt.Sprintf("%v", d.director)
if err := writeBuffer.WriteString("director", uint32(len(_value)*8), _value); err != nil {
return err
@@ -63,7 +63,7 @@ func (d *UDPActor) SerializeWithWriteBuffer(ctx context.Context, writeBuffer uti
}
if d.timer != nil {
{
- _value := fmt.Sprintf("%v", *d.timer)
+ _value := fmt.Sprintf("%v", d.timer)
if err := writeBuffer.WriteString("timer", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/cbus/Connection_plc4xgen.go b/plc4go/internal/cbus/Connection_plc4xgen.go
index 6822b68490..bb8d493c80 100644
--- a/plc4go/internal/cbus/Connection_plc4xgen.go
+++ b/plc4go/internal/cbus/Connection_plc4xgen.go
@@ -57,7 +57,7 @@ func (d *Connection) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.messageCodec != nil {
{
- _value := fmt.Sprintf("%v", *d.messageCodec)
+ _value := fmt.Sprintf("%v", d.messageCodec)
if err := writeBuffer.WriteString("messageCodec", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/knxnetip/Subscriber_plc4xgen.go b/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
index cbce46c9e0..a6ad2e21c7 100644
--- a/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
+++ b/plc4go/internal/knxnetip/Subscriber_plc4xgen.go
@@ -50,7 +50,7 @@ func (d *Subscriber) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.connection != nil {
{
- _value := fmt.Sprintf("%v", *d.connection)
+ _value := fmt.Sprintf("%v", d.connection)
if err := writeBuffer.WriteString("connection", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/opcua/Configuration_plc4xgen.go b/plc4go/internal/opcua/Configuration_plc4xgen.go
index 875431b118..4b6556586d 100644
--- a/plc4go/internal/opcua/Configuration_plc4xgen.go
+++ b/plc4go/internal/opcua/Configuration_plc4xgen.go
@@ -128,7 +128,7 @@ func (d *Configuration) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
}
if d.Ckp != nil {
{
- _value := fmt.Sprintf("%v", *d.Ckp)
+ _value := fmt.Sprintf("%v", d.Ckp)
if err := writeBuffer.WriteString("ckp", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/opcua/Connection_plc4xgen.go b/plc4go/internal/opcua/Connection_plc4xgen.go
index 8b60130f2f..5ac1e4dc28 100644
--- a/plc4go/internal/opcua/Connection_plc4xgen.go
+++ b/plc4go/internal/opcua/Connection_plc4xgen.go
@@ -53,7 +53,7 @@ func (d *Connection) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.messageCodec != nil {
{
- _value := fmt.Sprintf("%v", *d.messageCodec)
+ _value := fmt.Sprintf("%v", d.messageCodec)
if err := writeBuffer.WriteString("messageCodec", uint32(len(_value)*8), _value); err != nil {
return err
@@ -98,7 +98,7 @@ func (d *Connection) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.channel != nil {
{
- _value := fmt.Sprintf("%v", *d.channel)
+ _value := fmt.Sprintf("%v", d.channel)
if err := writeBuffer.WriteString("channel", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/opcua/SecureChannel_plc4xgen.go b/plc4go/internal/opcua/SecureChannel_plc4xgen.go
index c87d801956..67b91eb419 100644
--- a/plc4go/internal/opcua/SecureChannel_plc4xgen.go
+++ b/plc4go/internal/opcua/SecureChannel_plc4xgen.go
@@ -205,7 +205,7 @@ func (d *SecureChannel) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
}
if d.encryptionHandler != nil {
{
- _value := fmt.Sprintf("%v", *d.encryptionHandler)
+ _value := fmt.Sprintf("%v", d.encryptionHandler)
if err := writeBuffer.WriteString("encryptionHandler", uint32(len(_value)*8), _value); err != nil {
return err
@@ -245,7 +245,7 @@ func (d *SecureChannel) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
}
if d.codec != nil {
{
- _value := fmt.Sprintf("%v", *d.codec)
+ _value := fmt.Sprintf("%v", d.codec)
if err := writeBuffer.WriteString("codec", uint32(len(_value)*8), _value); err != nil {
return err
@@ -254,7 +254,7 @@ func (d *SecureChannel) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
}
if d.channelTransactionManager != nil {
{
- _value := fmt.Sprintf("%v", *d.channelTransactionManager)
+ _value := fmt.Sprintf("%v", d.channelTransactionManager)
if err := writeBuffer.WriteString("channelTransactionManager", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/internal/opcua/Subscriber_plc4xgen.go b/plc4go/internal/opcua/Subscriber_plc4xgen.go
index 785ba3bb43..a43805152e 100644
--- a/plc4go/internal/opcua/Subscriber_plc4xgen.go
+++ b/plc4go/internal/opcua/Subscriber_plc4xgen.go
@@ -81,7 +81,7 @@ func (d *Subscriber) SerializeWithWriteBuffer(ctx context.Context, writeBuffer u
}
if d.connection != nil {
{
- _value := fmt.Sprintf("%v", *d.connection)
+ _value := fmt.Sprintf("%v", d.connection)
if err := writeBuffer.WriteString("connection", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/spi/pool/workItem_plc4xgen.go b/plc4go/spi/pool/workItem_plc4xgen.go
index 3e579dce12..5c95a46637 100644
--- a/plc4go/spi/pool/workItem_plc4xgen.go
+++ b/plc4go/spi/pool/workItem_plc4xgen.go
@@ -54,7 +54,7 @@ func (d *workItem) SerializeWithWriteBuffer(ctx context.Context, writeBuffer uti
}
if d.completionFuture != nil {
{
- _value := fmt.Sprintf("%v", *d.completionFuture)
+ _value := fmt.Sprintf("%v", d.completionFuture)
if err := writeBuffer.WriteString("completionFuture", uint32(len(_value)*8), _value); err != nil {
return err
diff --git a/plc4go/tools/plc4xGenerator/main.go b/plc4go/tools/plc4xGenerator/main.go
index cd90574300..c97936e6c6 100644
--- a/plc4go/tools/plc4xGenerator/main.go
+++ b/plc4go/tools/plc4xGenerator/main.go
@@ -432,7 +432,7 @@ func (g *Generator) generate(typeName string) {
default:
fmt.Printf("\t no support implemented for Ident with type %v\n", fieldType)
g.Printf("{\n")
- g.Printf("_value := fmt.Sprintf(\"%%v\", "+deref+"d.%s)\n", fieldName)
+ g.Printf("_value := fmt.Sprintf(\"%%v\", d.%s)\n", fieldName)
g.Printf(stringFieldSerialize, "_value", fieldNameUntitled)
g.Printf("}\n")
}