This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch cache-filtering-visitor-results
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git

commit 40bfbf3c6dfcbdce68a5d998dc4575f8b4457035
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Thu Nov 19 12:57:17 2026 +0000

    Evaluate node filter once per traversal
---
 .../traversal/FilteringDependencyNodeVisitor.java  | 31 ++++----
 .../FilteringDependencyNodeVisitorTest.java        | 83 ++++++++++++++++++++++
 2 files changed, 101 insertions(+), 13 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
 
b/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
index e530344..8dfcb65 100644
--- 
a/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
+++ 
b/src/main/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitor.java
@@ -18,6 +18,10 @@
  */
 package org.apache.maven.shared.dependency.graph.traversal;
 
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
 import org.apache.maven.shared.dependency.graph.DependencyNode;
 import org.apache.maven.shared.dependency.graph.filter.DependencyNodeFilter;
 
@@ -41,6 +45,8 @@ public class FilteringDependencyNodeVisitor implements 
DependencyNodeVisitor {
      */
     private final DependencyNodeFilter filter;
 
+    private final Map<DependencyNode, Boolean> acceptedNodes = 
Collections.synchronizedMap(new IdentityHashMap<>());
+
     // constructors -----------------------------------------------------------
 
     /**
@@ -62,15 +68,13 @@ public class FilteringDependencyNodeVisitor implements 
DependencyNodeVisitor {
      */
     @Override
     public boolean visit(DependencyNode node) {
-        boolean visit;
+        boolean accepted = filter.accept(node);
+        acceptedNodes.put(node, accepted);
 
-        if (filter.accept(node)) {
-            visit = visitor.visit(node);
-        } else {
-            visit = true;
+        if (accepted) {
+            return visitor.visit(node);
         }
-
-        return visit;
+        return true;
     }
 
     /**
@@ -78,15 +82,16 @@ public class FilteringDependencyNodeVisitor implements 
DependencyNodeVisitor {
      */
     @Override
     public boolean endVisit(DependencyNode node) {
-        boolean visit;
+        Boolean accepted = acceptedNodes.remove(node);
 
-        if (filter.accept(node)) {
-            visit = visitor.endVisit(node);
-        } else {
-            visit = true;
+        if (accepted == null) {
+            accepted = filter.accept(node);
         }
 
-        return visit;
+        if (accepted) {
+            return visitor.endVisit(node);
+        }
+        return true;
     }
 
     // public methods ---------------------------------------------------------
diff --git 
a/src/test/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitorTest.java
 
b/src/test/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitorTest.java
new file mode 100644
index 0000000..3879d2e
--- /dev/null
+++ 
b/src/test/java/org/apache/maven/shared/dependency/graph/traversal/FilteringDependencyNodeVisitorTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ *
+ *   http://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 org.apache.maven.shared.dependency.graph.traversal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.dependency.graph.filter.DependencyNodeFilter;
+import org.apache.maven.shared.dependency.graph.internal.DefaultDependencyNode;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FilteringDependencyNodeVisitorTest {
+
+    @Test
+    void evaluatesFilterOncePerNode() {
+        DefaultDependencyNode root = node("root", null);
+        DefaultDependencyNode child = node("child", root);
+        DefaultDependencyNode grandchild = node("grandchild", child);
+        root.setChildren(Collections.singletonList(child));
+        child.setChildren(Collections.singletonList(grandchild));
+        grandchild.setChildren(Collections.emptyList());
+
+        AtomicInteger filterCalls = new AtomicInteger();
+        DependencyNodeFilter filter = node -> {
+            filterCalls.incrementAndGet();
+            return !"child".equals(node.getArtifact().getArtifactId());
+        };
+
+        List<String> delegateCalls = new ArrayList<>();
+        DependencyNodeVisitor delegate = new DependencyNodeVisitor() {
+            @Override
+            public boolean visit(DependencyNode node) {
+                delegateCalls.add("visit:" + artifactId(node));
+                return true;
+            }
+
+            @Override
+            public boolean endVisit(DependencyNode node) {
+                delegateCalls.add("endVisit:" + artifactId(node));
+                return true;
+            }
+        };
+
+        root.accept(new FilteringDependencyNodeVisitor(delegate, filter));
+
+        assertEquals(3, filterCalls.get());
+        assertEquals(
+                Arrays.asList("visit:root", "visit:grandchild", 
"endVisit:grandchild", "endVisit:root"), delegateCalls);
+    }
+
+    private static DefaultDependencyNode node(String artifactId, 
DefaultDependencyNode parent) {
+        Artifact artifact = new DefaultArtifact("group", artifactId, "1.0", 
"compile", "jar", "", null);
+        return new DefaultDependencyNode(parent, artifact, null, null, null);
+    }
+
+    private static String artifactId(DependencyNode node) {
+        return node.getArtifact().getArtifactId();
+    }
+}

Reply via email to