This is an automated email from the ASF dual-hosted git repository.
cdutz 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 360d30e80d refactor: Added the queryName to the browse request
interceptor interface.
360d30e80d is described below
commit 360d30e80dff99db99a9e2d711c7b1722436274b
Author: Christofer Dutz <[email protected]>
AuthorDate: Wed Dec 31 13:23:39 2025 +0100
refactor: Added the queryName to the browse request interceptor interface.
---
RELEASE_NOTES | 3 ++-
.../apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java | 2 +-
.../java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java | 4 ++--
.../src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java | 2 +-
.../apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java | 2 +-
.../plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java | 2 --
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8e803bb99b..a52a9c8d8c 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -20,7 +20,8 @@ Incompatible changes
Java 17 to allow alternate driver implementations to support
Java 17.
- Updated the signature of the PlcBrowseRequestInterceptor to
- also accept a tag and item instead of just an item.
+ also accept a queryName, query and item instead of just an
+ item.
Bug Fixes
---------
diff --git
a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java
b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java
index 893987de86..598eee3343 100644
---
a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java
+++
b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java
@@ -22,6 +22,6 @@ import org.apache.plc4x.java.api.model.PlcQuery;
public interface PlcBrowseRequestInterceptor {
- boolean intercept(PlcQuery query, PlcBrowseItem item);
+ boolean intercept(String queryName, PlcQuery query, PlcBrowseItem item);
}
diff --git
a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
index eb604f254e..8885e1792e 100644
---
a/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
+++
b/plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java
@@ -492,7 +492,7 @@ public class AdsProtocolLogic extends
Plc4xProtocolBase<AmsTCPPacket> implements
@Override
public CompletableFuture<PlcBrowseResponse> browse(PlcBrowseRequest
browseRequest) {
- return browseWithInterceptor(browseRequest, (query, item) -> true);
+ return browseWithInterceptor(browseRequest, (queryName, query, item)
-> true);
}
public CompletableFuture<PlcBrowseResponse>
browseWithInterceptor(PlcBrowseRequest browseRequest,
PlcBrowseRequestInterceptor interceptor) {
@@ -540,7 +540,7 @@ public class AdsProtocolLogic extends
Plc4xProtocolBase<AmsTCPPacket> implements
true, !symbol.getFlagReadOnly(), true, false,
itemArrayInfo, childMap, options);
// Check if this item should be added to the result
- if (interceptor.intercept(query, item)) {
+ if (interceptor.intercept(queryName, query, item)) {
// Add the type itself.
resultsForQuery.add(item);
}
diff --git
a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java
b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java
index 8efeb14c93..fa5d5f5d68 100644
---
a/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java
+++
b/plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java
@@ -31,7 +31,7 @@ public class ManualAdsBrowse {
PlcBrowseResponse plcBrowseResponse =
connection.browseRequestBuilder()
//.addQuery("all", "**")
.addQuery("allMain", "MAIN.*")
- .build().executeWithInterceptor((tag, item) -> {
+ .build().executeWithInterceptor((gueryName, query, item) -> {
outputItem(item, 0);
return true;
}).get();
diff --git
a/plc4j/drivers/ctrlx/src/main/java/org/apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java
b/plc4j/drivers/ctrlx/src/main/java/org/apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java
index 58c4a54ba8..c4affe182b 100644
---
a/plc4j/drivers/ctrlx/src/main/java/org/apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java
+++
b/plc4j/drivers/ctrlx/src/main/java/org/apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java
@@ -205,7 +205,7 @@ public class CtrlXConnection implements PlcConnection,
PlcPinger, PlcBrowser {
@Override
public CompletableFuture<PlcBrowseResponse> browse(PlcBrowseRequest
browseRequest) {
- return browseWithInterceptor(browseRequest, (query, item) -> true);
+ return browseWithInterceptor(browseRequest, (queryName,query, item) ->
true);
}
@Override
diff --git
a/protocols/bacnetip/src/test/java/org/apache/plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java
b/protocols/bacnetip/src/test/java/org/apache/plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java
index 47be5d7419..96fcc1e58b 100644
---
a/protocols/bacnetip/src/test/java/org/apache/plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java
+++
b/protocols/bacnetip/src/test/java/org/apache/plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java
@@ -27,8 +27,6 @@ import
org.apache.plc4x.plugins.codegenerator.types.fields.PropertyField;
import org.apache.plc4x.plugins.codegenerator.types.fields.ValidationField;
import org.junit.jupiter.api.*;
import org.opentest4j.TestAbortedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.regex.Matcher;
