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 2022/08/08 14:29:14 UTC
[plc4x] branch develop updated: fix(plc4go): fixed browse query builder
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 c142f78f8 fix(plc4go): fixed browse query builder
c142f78f8 is described below
commit c142f78f8c18965c6582664c87e82ab8617fb539
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Aug 8 16:29:06 2022 +0200
fix(plc4go): fixed browse query builder
---
plc4go/internal/cbus/Connection.go | 2 +-
plc4go/internal/knxnetip/Connection.go | 2 +-
plc4go/internal/spi/model/DefaultPlcBrowseRequest.go | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/plc4go/internal/cbus/Connection.go b/plc4go/internal/cbus/Connection.go
index f5dd9895f..5bed3562c 100644
--- a/plc4go/internal/cbus/Connection.go
+++ b/plc4go/internal/cbus/Connection.go
@@ -157,7 +157,7 @@ func (c *Connection) UnsubscriptionRequestBuilder() apiModel.PlcUnsubscriptionRe
}
func (c *Connection) BrowseRequestBuilder() apiModel.PlcBrowseRequestBuilder {
- return internalModel.NewDefaultPlcBrowseRequestBuilder(NewBrowser(c, c.messageCodec))
+ return internalModel.NewDefaultPlcBrowseRequestBuilder(c.GetPlcFieldHandler(), NewBrowser(c, c.messageCodec))
}
func (c *Connection) addSubscriber(subscriber *Subscriber) {
diff --git a/plc4go/internal/knxnetip/Connection.go b/plc4go/internal/knxnetip/Connection.go
index cdce17e54..65e0d729d 100644
--- a/plc4go/internal/knxnetip/Connection.go
+++ b/plc4go/internal/knxnetip/Connection.go
@@ -471,7 +471,7 @@ func (m *Connection) SubscriptionRequestBuilder() apiModel.PlcSubscriptionReques
}
func (m *Connection) BrowseRequestBuilder() apiModel.PlcBrowseRequestBuilder {
- return internalModel.NewDefaultPlcBrowseRequestBuilder(NewBrowser(m, m.messageCodec))
+ return internalModel.NewDefaultPlcBrowseRequestBuilder(m.fieldHandler, NewBrowser(m, m.messageCodec))
}
func (m *Connection) UnsubscriptionRequestBuilder() apiModel.PlcUnsubscriptionRequestBuilder {
diff --git a/plc4go/internal/spi/model/DefaultPlcBrowseRequest.go b/plc4go/internal/spi/model/DefaultPlcBrowseRequest.go
index 06cb5bc94..beeb2fbc4 100644
--- a/plc4go/internal/spi/model/DefaultPlcBrowseRequest.go
+++ b/plc4go/internal/spi/model/DefaultPlcBrowseRequest.go
@@ -35,10 +35,11 @@ type DefaultPlcBrowseRequestBuilder struct {
fieldNames []string
}
-func NewDefaultPlcBrowseRequestBuilder(browser spi.PlcBrowser) *DefaultPlcBrowseRequestBuilder {
+func NewDefaultPlcBrowseRequestBuilder(fieldHandler spi.PlcFieldHandler, browser spi.PlcBrowser) *DefaultPlcBrowseRequestBuilder {
return &DefaultPlcBrowseRequestBuilder{
- browser: browser,
- queries: map[string]string{},
+ fieldHandler: fieldHandler,
+ browser: browser,
+ queries: map[string]string{},
}
}