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/06/17 06:29:42 UTC
[plc4x] branch develop updated: fix(plc4go/spi): DefaultCodec.go rendering fixed
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
The following commit(s) were added to refs/heads/develop by this push:
new 747e2ee9fd fix(plc4go/spi): DefaultCodec.go rendering fixed
747e2ee9fd is described below
commit 747e2ee9fdfddcc95943cee3052d8a7889efc657
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Jun 17 08:29:34 2023 +0200
fix(plc4go/spi): DefaultCodec.go rendering fixed
---
plc4go/internal/cbus/MessageCodec_test.go | 13 ++++++++-----
plc4go/spi/default/DefaultCodec.go | 2 +-
plc4go/spi/default/DefaultCodec_test.go | 3 +++
plc4go/spi/default/defaultCodec_plc4xgen.go | 8 ++++++++
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/plc4go/internal/cbus/MessageCodec_test.go b/plc4go/internal/cbus/MessageCodec_test.go
index e104441a90..af0a0cdfe9 100644
--- a/plc4go/internal/cbus/MessageCodec_test.go
+++ b/plc4go/internal/cbus/MessageCodec_test.go
@@ -843,11 +843,14 @@ func TestMessageCodec_String(t *testing.T) {
},
want: `
╔═MessageCodec════════════════════════════════════════════════════════════════════════════════════════════════════════╗
-║╔═defaultCodec═════════════════════════════════════════════════════════════════════════╗ ║
-║║╔═transportInstance╗╔═defaultIncomingMessageChannel╗╔═customMessageHandling╗╔═running╗║ ║
-║║║ test ║║ 0 element(s) ║║ b0 false ║║b0 false║║ ║
-║║╚══════════════════╝╚══════════════════════════════╝╚══════════════════════╝╚════════╝║ ║
-║╚══════════════════════════════════════════════════════════════════════════════════════╝ ║
+║╔═defaultCodec══════════════════════════════════════════════════════════════════════════════════════════╗ ║
+║║╔═transportInstance╗╔═defaultIncomingMessageChannel╗╔═customMessageHandling╗╔═running╗╔═receiveTimeout╗║ ║
+║║║ test ║║ 0 element(s) ║║ b0 false ║║b0 false║║ 10s ║║ ║
+║║╚══════════════════╝╚══════════════════════════════╝╚══════════════════════╝╚════════╝╚═══════════════╝║ ║
+║║╔═traceDefaultMessageCodecWorker╗ ║ ║
+║║║ b0 false ║ ║ ║
+║║╚═══════════════════════════════╝ ║ ║
+║╚═══════════════════════════════════════════════════════════════════════════════════════════════════════╝ ║
║╔═requestContext/RequestContext/sendIdentifyRequestBefore═════════════════════════════════════════════════════╗ ║
║║ b1 true ║ ║
║╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝ ║
diff --git a/plc4go/spi/default/DefaultCodec.go b/plc4go/spi/default/DefaultCodec.go
index 21e202d48e..e542681a74 100644
--- a/plc4go/spi/default/DefaultCodec.go
+++ b/plc4go/spi/default/DefaultCodec.go
@@ -87,7 +87,7 @@ type defaultCodec struct {
stateChange sync.Mutex
activeWorker sync.WaitGroup
- receiveTimeout time.Duration
+ receiveTimeout time.Duration `stringer:"true"`
traceDefaultMessageCodecWorker bool
log zerolog.Logger `ignore:"true"`
diff --git a/plc4go/spi/default/DefaultCodec_test.go b/plc4go/spi/default/DefaultCodec_test.go
index 47ee666559..c0d00b5ac0 100644
--- a/plc4go/spi/default/DefaultCodec_test.go
+++ b/plc4go/spi/default/DefaultCodec_test.go
@@ -1281,6 +1281,9 @@ func Test_defaultCodec_String(t *testing.T) {
║╚══════════════════╝║║yoink1║║yoink2║║╚══════════════════════════════╝╚══════════════════════╝╚════════╝║
║ ║╚══════╝╚══════╝║ ║
║ ╚════════════════╝ ║
+║╔═receiveTimeout╗╔═traceDefaultMessageCodecWorker╗ ║
+║║ 0s ║║ b0 false ║ ║
+║╚═══════════════╝╚═══════════════════════════════╝ ║
╚════════════════════════════════════════════════════════════════════════════════════════════════════════╝`[1:],
},
}
diff --git a/plc4go/spi/default/defaultCodec_plc4xgen.go b/plc4go/spi/default/defaultCodec_plc4xgen.go
index eaa92e0c5a..7b4d953718 100644
--- a/plc4go/spi/default/defaultCodec_plc4xgen.go
+++ b/plc4go/spi/default/defaultCodec_plc4xgen.go
@@ -102,6 +102,14 @@ func (d *defaultCodec) SerializeWithWriteBuffer(ctx context.Context, writeBuffer
if err := writeBuffer.WriteBit("running", d.running.Load()); err != nil {
return err
}
+
+ if err := writeBuffer.WriteString("receiveTimeout", uint32(len(d.receiveTimeout.String())*8), "UTF-8", d.receiveTimeout.String()); err != nil {
+ return err
+ }
+
+ if err := writeBuffer.WriteBit("traceDefaultMessageCodecWorker", d.traceDefaultMessageCodecWorker); err != nil {
+ return err
+ }
if err := writeBuffer.PopContext("defaultCodec"); err != nil {
return err
}