refactor: Added the queryName to the browse request interceptor interface.

Author: chrisdutz

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
 ---------

plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcBrowseRequestInterceptor.java

@@ -22,6 +22,6 @@
 
 public interface PlcBrowseRequestInterceptor {
 
-    boolean intercept(PlcQuery query, PlcBrowseItem item);
+    boolean intercept(String queryName, PlcQuery query, PlcBrowseItem item);
 
 }

plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/protocol/AdsProtocolLogic.java

@@ -492,7 +492,7 @@ public void onDisconnect(ConversationContext<AmsTCPPacket> context) {
 
     @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 CompletableFuture<PlcBrowseResponse> browseWithInterceptor(PlcBrowseReque
                     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);
                 }

plc4j/drivers/ads/src/test/java/org/apache/plc4x/protocol/ads/ManualAdsBrowse.java

@@ -31,7 +31,7 @@ public static void main(String[] args) throws Exception {
             PlcBrowseResponse plcBrowseResponse = connection.browseRequestBuilder()
                 //.addQuery("all", "**")
                 .addQuery("allMain", "MAIN.*")
-                .build().executeWithInterceptor((tag, item) -> {
+                .build().executeWithInterceptor((gueryName, query, item) -> {
                     outputItem(item, 0);
                     return true;
                 }).get();

plc4j/drivers/ctrlx/src/main/java/org/apache/plc4x/java/ctrlx/readwrite/connection/CtrlXConnection.java

@@ -205,7 +205,7 @@ public CompletableFuture<PlcPingResponse> ping(PlcPingRequest pingRequest) {
 
     @Override
     public CompletableFuture<PlcBrowseResponse> browse(PlcBrowseRequest browseRequest) {
-        return browseWithInterceptor(browseRequest, (query, item) -> true);
+        return browseWithInterceptor(browseRequest, (queryName,query, item) -> true);
     }
 
     @Override

protocols/bacnetip/src/test/java/org/apache/plc4x/protocol/bacnetip/ObjectPropertyDeDuplicationTest.java

@@ -27,8 +27,6 @@
 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;