You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2021/09/29 20:24:20 UTC
[maven] branch MNG-7271 created (now 4190414)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-7271
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 4190414 [MNG-7271] - Code Improvement
This branch includes the following new commits:
new 4190414 [MNG-7271] - Code Improvement
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: [MNG-7271] - Code Improvement
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7271
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4190414caf846157713c499e6e3858417ca00db0
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Sep 29 22:23:32 2021 +0200
[MNG-7271] - Code Improvement
---
.../maven/graph/DefaultProjectDependencyGraph.java | 26 +++++-----------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index 71cac01..e5145ce 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-
+import java.util.stream.Collectors;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
@@ -164,17 +164,11 @@ public class DefaultProjectDependencyGraph
}
}
- private List<MavenProject> getSortedProjects( Set<String> projectIds )
- {
- List<MavenProject> result = new ArrayList<>( projectIds.size() );
- for ( String projectId : projectIds )
- {
- result.add( projects.get( projectId ) );
- }
-
- Collections.sort( result, new MavenProjectComparator() );
-
- return result;
+ private List<MavenProject> getSortedProjects( Set<String> projectIds ) {
+ return projectIds.stream()
+ .map(id -> projects.get(id))
+ .sorted(Comparator.comparingInt(order::get))
+ .collect(Collectors.toList());
}
@Override
@@ -183,12 +177,4 @@ public class DefaultProjectDependencyGraph
return sorter.getSortedProjects().toString();
}
- private class MavenProjectComparator implements Comparator<MavenProject>
- {
- @Override
- public int compare( MavenProject o1, MavenProject o2 )
- {
- return order.get( o1 ) - order.get( o2 );
- }
- }
}