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:49 UTC
[plc4x] branch develop updated (0a14655948 -> da294bae2d)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 0a14655948 fix(plc4go/spi): gracefully handle tag names not found on WriteResponse
new 2d7f0672bf test(plc4go/spi): avoid wobbly test by using elements match
new 24eeddbabe refactor(plc4go/spi): ignore callbacks in builder for code generation
new da294bae2d fix(plc4go/spi): fix small refactoring woopsie
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plc4go/spi/model/DefaultPlcBrowseRequest.go | 4 +-
.../DefaultPlcBrowseRequestBuilder_plc4xgen.go | 38 ---------------
...tResult.go => DefaultPlcBrowseRequestResult.go} | 18 +++----
...o => DefaultPlcBrowseRequestResult_plc4xgen.go} | 12 ++---
plc4go/spi/model/DefaultPlcReadRequest.go | 6 +--
.../model/DefaultPlcReadRequestBuilder_plc4xgen.go | 57 ----------------------
.../spi/model/DefaultPlcSubscriptionEvent_test.go | 2 +-
plc4go/spi/model/DefaultPlcSubscriptionRequest.go | 6 +--
...efaultPlcSubscriptionRequestBuilder_plc4xgen.go | 57 ----------------------
...t.go => DefaultPlcSubscriptionRequestResult.go} | 18 +++----
...efaultPlcSubscriptionRequestResult_plc4xgen.go} | 12 ++---
plc4go/spi/model/render_test.go | 2 +
12 files changed, 41 insertions(+), 191 deletions(-)
copy plc4go/spi/model/{DefaultPlcWriteRequestResult.go => DefaultPlcBrowseRequestResult.go} (63%)
copy plc4go/spi/model/{DefaultPlcWriteRequestResult_plc4xgen.go => DefaultPlcBrowseRequestResult_plc4xgen.go} (84%)
copy plc4go/spi/model/{DefaultPlcWriteRequestResult.go => DefaultPlcSubscriptionRequestResult.go} (60%)
copy plc4go/spi/model/{DefaultPlcWriteRequestResult_plc4xgen.go => DefaultPlcSubscriptionRequestResult_plc4xgen.go} (83%)
[plc4x] 03/03: fix(plc4go/spi): fix small refactoring woopsie
Posted by sr...@apache.org.
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 da294bae2d7905bcf4723ac155df58ccf2968756
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed May 17 14:40:40 2023 +0200
fix(plc4go/spi): fix small refactoring woopsie
---
plc4go/spi/model/DefaultPlcBrowseRequestResult.go | 45 +++++++++
.../DefaultPlcBrowseRequestResult_plc4xgen.go | 101 +++++++++++++++++++++
.../model/DefaultPlcSubscriptionRequestResult.go | 45 +++++++++
...DefaultPlcSubscriptionRequestResult_plc4xgen.go | 101 +++++++++++++++++++++
plc4go/spi/model/render_test.go | 2 +
5 files changed, 294 insertions(+)
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestResult.go b/plc4go/spi/model/DefaultPlcBrowseRequestResult.go
new file mode 100644
index 0000000000..e1f6a39188
--- /dev/null
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestResult.go
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package model
+
+import apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
+
+//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcBrowseRequestResult
+type DefaultPlcBrowseRequestResult struct {
+ Request apiModel.PlcBrowseRequest
+ Response apiModel.PlcBrowseResponse
+ Err error
+}
+
+func NewDefaultPlcBrowseRequestResult(Request apiModel.PlcBrowseRequest, Response apiModel.PlcBrowseResponse, Err error) apiModel.PlcBrowseRequestResult {
+ return &DefaultPlcBrowseRequestResult{Request, Response, Err}
+}
+
+func (d *DefaultPlcBrowseRequestResult) GetRequest() apiModel.PlcBrowseRequest {
+ return d.Request
+}
+
+func (d *DefaultPlcBrowseRequestResult) GetResponse() apiModel.PlcBrowseResponse {
+ return d.Response
+}
+
+func (d *DefaultPlcBrowseRequestResult) GetErr() error {
+ return d.Err
+}
diff --git a/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go
new file mode 100644
index 0000000000..8f6b1f3154
--- /dev/null
+++ b/plc4go/spi/model/DefaultPlcBrowseRequestResult_plc4xgen.go
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Code generated by "plc4xgenerator -type=DefaultPlcBrowseRequestResult"; DO NOT EDIT.
+
+package model
+
+import (
+ "context"
+ "encoding/binary"
+ "fmt"
+ "github.com/apache/plc4x/plc4go/spi/utils"
+)
+
+var _ = fmt.Printf
+
+func (d *DefaultPlcBrowseRequestResult) Serialize() ([]byte, error) {
+ wb := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.BigEndian))
+ if err := d.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
+ return nil, err
+ }
+ return wb.GetBytes(), nil
+}
+
+func (d *DefaultPlcBrowseRequestResult) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error {
+ if err := writeBuffer.PushContext("PlcBrowseRequestResult"); err != nil {
+ return err
+ }
+
+ if d.Request != nil {
+ if serializableField, ok := d.Request.(utils.Serializable); ok {
+ if err := writeBuffer.PushContext("request"); err != nil {
+ return err
+ }
+ if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
+ return err
+ }
+ if err := writeBuffer.PopContext("request"); err != nil {
+ return err
+ }
+ } else {
+ stringValue := fmt.Sprintf("%v", d.Request)
+ if err := writeBuffer.WriteString("request", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
+ return err
+ }
+ }
+ }
+
+ if d.Response != nil {
+ if serializableField, ok := d.Response.(utils.Serializable); ok {
+ if err := writeBuffer.PushContext("response"); err != nil {
+ return err
+ }
+ if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
+ return err
+ }
+ if err := writeBuffer.PopContext("response"); err != nil {
+ return err
+ }
+ } else {
+ stringValue := fmt.Sprintf("%v", d.Response)
+ if err := writeBuffer.WriteString("response", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
+ return err
+ }
+ }
+ }
+
+ if d.Err != nil {
+ if err := writeBuffer.WriteString("err", uint32(len(d.Err.Error())*8), "UTF-8", d.Err.Error()); err != nil {
+ return err
+ }
+ }
+ if err := writeBuffer.PopContext("PlcBrowseRequestResult"); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (d *DefaultPlcBrowseRequestResult) String() string {
+ writeBuffer := utils.NewWriteBufferBoxBasedWithOptions(true, true)
+ if err := writeBuffer.WriteSerializable(context.Background(), d); err != nil {
+ return err.Error()
+ }
+ return writeBuffer.GetBox().String()
+}
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go
new file mode 100644
index 0000000000..71a3393e5e
--- /dev/null
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult.go
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package model
+
+import apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
+
+//go:generate go run ../../tools/plc4xgenerator/gen.go -type=DefaultPlcSubscriptionRequestResult
+type DefaultPlcSubscriptionRequestResult struct {
+ Request apiModel.PlcSubscriptionRequest
+ Response apiModel.PlcSubscriptionResponse
+ Err error
+}
+
+func NewDefaultPlcSubscriptionRequestResult(Request apiModel.PlcSubscriptionRequest, Response apiModel.PlcSubscriptionResponse, Err error) apiModel.PlcSubscriptionRequestResult {
+ return &DefaultPlcSubscriptionRequestResult{Request, Response, Err}
+}
+
+func (d *DefaultPlcSubscriptionRequestResult) GetRequest() apiModel.PlcSubscriptionRequest {
+ return d.Request
+}
+
+func (d *DefaultPlcSubscriptionRequestResult) GetResponse() apiModel.PlcSubscriptionResponse {
+ return d.Response
+}
+
+func (d *DefaultPlcSubscriptionRequestResult) GetErr() error {
+ return d.Err
+}
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go
new file mode 100644
index 0000000000..dd04d7bb9f
--- /dev/null
+++ b/plc4go/spi/model/DefaultPlcSubscriptionRequestResult_plc4xgen.go
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Code generated by "plc4xgenerator -type=DefaultPlcSubscriptionRequestResult"; DO NOT EDIT.
+
+package model
+
+import (
+ "context"
+ "encoding/binary"
+ "fmt"
+ "github.com/apache/plc4x/plc4go/spi/utils"
+)
+
+var _ = fmt.Printf
+
+func (d *DefaultPlcSubscriptionRequestResult) Serialize() ([]byte, error) {
+ wb := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.BigEndian))
+ if err := d.SerializeWithWriteBuffer(context.Background(), wb); err != nil {
+ return nil, err
+ }
+ return wb.GetBytes(), nil
+}
+
+func (d *DefaultPlcSubscriptionRequestResult) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error {
+ if err := writeBuffer.PushContext("PlcSubscriptionRequestResult"); err != nil {
+ return err
+ }
+
+ if d.Request != nil {
+ if serializableField, ok := d.Request.(utils.Serializable); ok {
+ if err := writeBuffer.PushContext("request"); err != nil {
+ return err
+ }
+ if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
+ return err
+ }
+ if err := writeBuffer.PopContext("request"); err != nil {
+ return err
+ }
+ } else {
+ stringValue := fmt.Sprintf("%v", d.Request)
+ if err := writeBuffer.WriteString("request", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
+ return err
+ }
+ }
+ }
+
+ if d.Response != nil {
+ if serializableField, ok := d.Response.(utils.Serializable); ok {
+ if err := writeBuffer.PushContext("response"); err != nil {
+ return err
+ }
+ if err := serializableField.SerializeWithWriteBuffer(ctx, writeBuffer); err != nil {
+ return err
+ }
+ if err := writeBuffer.PopContext("response"); err != nil {
+ return err
+ }
+ } else {
+ stringValue := fmt.Sprintf("%v", d.Response)
+ if err := writeBuffer.WriteString("response", uint32(len(stringValue)*8), "UTF-8", stringValue); err != nil {
+ return err
+ }
+ }
+ }
+
+ if d.Err != nil {
+ if err := writeBuffer.WriteString("err", uint32(len(d.Err.Error())*8), "UTF-8", d.Err.Error()); err != nil {
+ return err
+ }
+ }
+ if err := writeBuffer.PopContext("PlcSubscriptionRequestResult"); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (d *DefaultPlcSubscriptionRequestResult) String() string {
+ writeBuffer := utils.NewWriteBufferBoxBasedWithOptions(true, true)
+ if err := writeBuffer.WriteSerializable(context.Background(), d); err != nil {
+ return err.Error()
+ }
+ return writeBuffer.GetBox().String()
+}
diff --git a/plc4go/spi/model/render_test.go b/plc4go/spi/model/render_test.go
index e6987e58f4..1c4e44d1b5 100644
--- a/plc4go/spi/model/render_test.go
+++ b/plc4go/spi/model/render_test.go
@@ -44,6 +44,7 @@ func TestRenderTest(t *testing.T) {
&DefaultPlcBrowseItem{},
&DefaultPlcBrowseRequest{},
&DefaultPlcBrowseRequestBuilder{},
+ &DefaultPlcBrowseRequestResult{},
&DefaultPlcBrowseResponse{},
&DefaultPlcBrowseResponseItem{},
&DefaultPlcConsumerRegistration{},
@@ -55,6 +56,7 @@ func TestRenderTest(t *testing.T) {
&DefaultPlcSubscriptionEventItem{},
&DefaultPlcSubscriptionHandle{},
&DefaultPlcSubscriptionRequest{DefaultPlcTagRequest: NewDefaultPlcTagRequest(nil, nil)},
+ &DefaultPlcSubscriptionRequestResult{},
&DefaultPlcSubscriptionResponse{},
&DefaultPlcSubscriptionResponseItem{},
&DefaultPlcTagRequest{},
[plc4x] 02/03: refactor(plc4go/spi): ignore callbacks in builder for code generation
Posted by sr...@apache.org.
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
}
[plc4x] 01/03: test(plc4go/spi): avoid wobbly test by using elements match
Posted by sr...@apache.org.
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 2d7f0672bfe772f146707df08999fd11caddcd77
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed May 17 14:18:08 2023 +0200
test(plc4go/spi): avoid wobbly test by using elements match
---
plc4go/spi/model/DefaultPlcSubscriptionEvent_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4go/spi/model/DefaultPlcSubscriptionEvent_test.go b/plc4go/spi/model/DefaultPlcSubscriptionEvent_test.go
index dc8432dc09..269f11e4b1 100644
--- a/plc4go/spi/model/DefaultPlcSubscriptionEvent_test.go
+++ b/plc4go/spi/model/DefaultPlcSubscriptionEvent_test.go
@@ -276,7 +276,7 @@ func TestDefaultPlcSubscriptionEvent_GetTagNames(t *testing.T) {
DefaultPlcSubscriptionEventRequirements: tt.fields.DefaultPlcSubscriptionEventRequirements,
values: tt.fields.values,
}
- assert.Equalf(t, tt.want, d.GetTagNames(), "GetTagNames()")
+ assert.ElementsMatchf(t, tt.want, d.GetTagNames(), "GetTagNames()")
})
}
}