(maven-resolver) branch master updated: [MRESOLVER-483] Classpath generation bugfix (addendum)

[cs...@apache.org]

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

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 23e524a8 [MRESOLVER-483] Classpath generation bugfix (addendum)
23e524a8 is described below

commit 23e524a85bae33b652d7d127f0e466a24b39ea2b
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Feb 1 14:53:47 2024 +0100

    [MRESOLVER-483] Classpath generation bugfix (addendum)
    
    A nasty bug creeped in: there are two very same methods
    returning same thing "usually", but not always.
    
    Use proper method that is also non-null in reality.
---
 .../java/org/eclipse/aether/util/graph/visitor/NodeListGenerator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/NodeListGenerator.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/NodeListGenerator.java
index c4b38c33..44d45831 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/NodeListGenerator.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/NodeListGenerator.java
@@ -118,8 +118,8 @@ public final class NodeListGenerator implements Consumer<DependencyNode> {
 
     static List<Dependency> getDependencies(List<DependencyNode> nodes, boolean includeUnresolved) {
         return getNodesWithDependencies(nodes).stream()
-                .filter(d -> includeUnresolved || d.getArtifact().getFile() != null)
                 .map(DependencyNode::getDependency)
+                .filter(d -> includeUnresolved || d.getArtifact().getFile() != null)
                 .collect(toList());
     }