Merge pull request #6846 from sdedic/sdedic/dependency-filter-fix

Return root node even though everything is filtered.
apache · Dec 20, 2023 · 795e3a7 · 795e3a7
2 parents f874870 + f978710
commit 795e3a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java
@@ -86,7 +86,7 @@ public final boolean equals(Object obj) {
         if (obj == null) {
             return false;
         }
-        if (getClass() != obj.getClass()) {
+        if (!(obj instanceof Scope)) {
             return false;
         }
         final Scope other = (Scope) obj;

diff --git a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
@@ -264,10 +264,10 @@ private void findRealNodes(org.apache.maven.shared.dependency.tree.DependencyNod
     private Dependency convertDependencies(org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Set<ArtifactSpec> broken) {
         Map<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> realNodes = new HashMap<>();
         findRealNodes(n, realNodes);
-        return convert2(n, filter, realNodes, broken);
+        return convert2(true, n, filter, realNodes, broken);
     }
 
-    private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Map<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> realNodes, Set<ArtifactSpec> broken) {
+    private Dependency convert2(boolean root, org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Map<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> realNodes, Set<ArtifactSpec> broken) {
         List<Dependency> ch = new ArrayList<>();
 
         List<org.apache.maven.shared.dependency.tree.DependencyNode> children = null;
@@ -286,7 +286,7 @@ private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNo
         }
 
         for (org.apache.maven.shared.dependency.tree.DependencyNode c : children) {
-            Dependency cd = convert2(c, filter, realNodes, broken);
+            Dependency cd = convert2(false, c, filter, realNodes, broken);
             if (cd != null) {
                 ch.add(cd);
             }
@@ -303,7 +303,7 @@ private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNo
         }
         Scope s = scope(a);
 
-        if (!filter.accept(s, aspec)) {
+        if (!root && !filter.accept(s, aspec)) {
             return null;
         }