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 54095d0d62 refactor(plc4go/spi): cleanup browse query
54095d0d62 is described below
commit 54095d0d629ec49960c294f7faddd3418027a0b7
Author: Sebastian Rühl <[email protected]>
AuthorDate: Tue Apr 4 18:31:39 2023 +0200
refactor(plc4go/spi): cleanup browse query
---
plc4go/internal/ads/Browser.go | 8 ++++----
plc4go/internal/cbus/Browser.go | 2 +-
plc4go/internal/knxnetip/Browser.go | 6 +++---
plc4go/spi/default/DefaultBrowser.go | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/plc4go/internal/ads/Browser.go b/plc4go/internal/ads/Browser.go
index e78616a75d..3dae7e8bdd 100644
--- a/plc4go/internal/ads/Browser.go
+++ b/plc4go/internal/ads/Browser.go
@@ -46,7 +46,7 @@ func (m *Connection) BrowseWithInterceptor(ctx
context.Context, browseRequest ap
results := map[string][]apiModel.PlcBrowseItem{}
for _, queryName := range browseRequest.GetQueryNames() {
query := browseRequest.GetQuery(queryName)
- responseCodes[queryName], results[queryName] =
m.BrowseQuery(ctx, browseRequest, interceptor, queryName, query)
+ responseCodes[queryName], results[queryName] =
m.BrowseQuery(ctx, interceptor, queryName, query)
}
browseResponse :=
internalModel.NewDefaultPlcBrowseResponse(browseRequest, results, responseCodes)
result <- &internalModel.DefaultPlcBrowseRequestResult{
@@ -58,16 +58,16 @@ func (m *Connection) BrowseWithInterceptor(ctx
context.Context, browseRequest ap
return result
}
-func (m *Connection) BrowseQuery(ctx context.Context, browseRequest
apiModel.PlcBrowseRequest, interceptor func(result apiModel.PlcBrowseItem)
bool, queryName string, query apiModel.PlcQuery) (apiModel.PlcResponseCode,
[]apiModel.PlcBrowseItem) {
+func (m *Connection) BrowseQuery(_ context.Context, _ func(result
apiModel.PlcBrowseItem) bool, _ string, query apiModel.PlcQuery)
(apiModel.PlcResponseCode, []apiModel.PlcBrowseItem) {
switch query.(type) {
case SymbolicPlcQuery:
- return m.executeSymbolicAddressQuery(ctx,
query.(SymbolicPlcQuery))
+ return m.executeSymbolicAddressQuery(query.(SymbolicPlcQuery))
default:
return apiModel.PlcResponseCode_INTERNAL_ERROR, nil
}
}
-func (m *Connection) executeSymbolicAddressQuery(ctx context.Context, query
SymbolicPlcQuery) (apiModel.PlcResponseCode, []apiModel.PlcBrowseItem) {
+func (m *Connection) executeSymbolicAddressQuery(query SymbolicPlcQuery)
(apiModel.PlcResponseCode, []apiModel.PlcBrowseItem) {
// Process the data type and symbol tables to produce the response.
tags := m.filterSymbols(query.GetSymbolicAddressPattern())
return apiModel.PlcResponseCode_OK, tags
diff --git a/plc4go/internal/cbus/Browser.go b/plc4go/internal/cbus/Browser.go
index 0266e591c1..214e399c10 100644
--- a/plc4go/internal/cbus/Browser.go
+++ b/plc4go/internal/cbus/Browser.go
@@ -51,7 +51,7 @@ func NewBrowser(connection *Connection, messageCodec
spi.MessageCodec) *Browser
return &browser
}
-func (m Browser) BrowseQuery(ctx context.Context, browseRequest
apiModel.PlcBrowseRequest, interceptor func(result apiModel.PlcBrowseItem)
bool, queryName string, query apiModel.PlcQuery) (apiModel.PlcResponseCode,
[]apiModel.PlcBrowseItem) {
+func (m Browser) BrowseQuery(ctx context.Context, interceptor func(result
apiModel.PlcBrowseItem) bool, queryName string, query apiModel.PlcQuery)
(apiModel.PlcResponseCode, []apiModel.PlcBrowseItem) {
var queryResults []apiModel.PlcBrowseItem
switch query := query.(type) {
case *unitInfoQuery:
diff --git a/plc4go/internal/knxnetip/Browser.go
b/plc4go/internal/knxnetip/Browser.go
index 295d056d00..19d5e84561 100644
--- a/plc4go/internal/knxnetip/Browser.go
+++ b/plc4go/internal/knxnetip/Browser.go
@@ -56,10 +56,10 @@ func NewBrowser(connection *Connection, messageCodec
spi.MessageCodec) *Browser
return &browser
}
-func (m Browser) BrowseQuery(ctx context.Context, browseRequest
apiModel.PlcBrowseRequest, interceptor func(result apiModel.PlcBrowseItem)
bool, queryName string, query apiModel.PlcQuery) (apiModel.PlcResponseCode,
[]apiModel.PlcBrowseItem) {
+func (m Browser) BrowseQuery(ctx context.Context, interceptor func(result
apiModel.PlcBrowseItem) bool, _ string, query apiModel.PlcQuery)
(apiModel.PlcResponseCode, []apiModel.PlcBrowseItem) {
switch query.(type) {
case DeviceQuery:
- queryResults, err := m.executeDeviceQuery(ctx,
query.(DeviceQuery), browseRequest, queryName, interceptor)
+ queryResults, err := m.executeDeviceQuery(ctx,
query.(DeviceQuery), interceptor)
if err != nil {
log.Warn().Err(err).Msg("Error executing device query")
return apiModel.PlcResponseCode_INTERNAL_ERROR, nil
@@ -79,7 +79,7 @@ func (m Browser) BrowseQuery(ctx context.Context,
browseRequest apiModel.PlcBrow
}
}
-func (m Browser) executeDeviceQuery(ctx context.Context, query DeviceQuery,
browseRequest apiModel.PlcBrowseRequest, queryName string, interceptor
func(result apiModel.PlcBrowseItem) bool) ([]apiModel.PlcBrowseItem, error) {
+func (m Browser) executeDeviceQuery(ctx context.Context, query DeviceQuery,
interceptor func(result apiModel.PlcBrowseItem) bool)
([]apiModel.PlcBrowseItem, error) {
// Create a list of address strings, which doesn't contain any ranges,
lists or wildcards
knxAddresses, err := m.calculateAddresses(query)
if err != nil {
diff --git a/plc4go/spi/default/DefaultBrowser.go
b/plc4go/spi/default/DefaultBrowser.go
index 5124fc26eb..b5adf1f79d 100644
--- a/plc4go/spi/default/DefaultBrowser.go
+++ b/plc4go/spi/default/DefaultBrowser.go
@@ -29,7 +29,7 @@ import (
// DefaultBrowserRequirements adds required methods to Browser that are needed
when using DefaultBrowser
type DefaultBrowserRequirements interface {
- BrowseQuery(ctx context.Context, browseRequest
apiModel.PlcBrowseRequest, interceptor func(result apiModel.PlcBrowseItem)
bool, queryName string, query apiModel.PlcQuery) (apiModel.PlcResponseCode,
[]apiModel.PlcBrowseItem)
+ BrowseQuery(ctx context.Context, interceptor func(result
apiModel.PlcBrowseItem) bool, queryName string, query apiModel.PlcQuery)
(apiModel.PlcResponseCode, []apiModel.PlcBrowseItem)
}
type DefaultBrowser interface {
@@ -71,7 +71,7 @@ func (m *defaultBrowser) BrowseWithInterceptor(ctx
context.Context, browseReques
results := map[string][]apiModel.PlcBrowseItem{}
for _, queryName := range browseRequest.GetQueryNames() {
query := browseRequest.GetQuery(queryName)
- responseCodes[queryName], results[queryName] =
m.BrowseQuery(ctx, browseRequest, interceptor, queryName, query)
+ responseCodes[queryName], results[queryName] =
m.BrowseQuery(ctx, interceptor, queryName, query)
}
browseResponse :=
model.NewDefaultPlcBrowseResponse(browseRequest, results, responseCodes)
result <- &model.DefaultPlcBrowseRequestResult{
