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:27:12 UTC
[maven] branch MNG-7271 updated (4190414 -> 25cf157)
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.
discard 4190414 [MNG-7271] - Code Improvement
new 25cf157 [MNG-7271] - Code Improvement
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4190414)
\
N -- N -- N refs/heads/MNG-7271 (25cf157)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../org/apache/maven/graph/DefaultProjectDependencyGraph.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
[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 25cf1576cc9d5a94bc293fa3e79bfbd4091d5e33
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Sep 29 22:23:32 2021 +0200
[MNG-7271] - Code Improvement
---
.../maven/graph/DefaultProjectDependencyGraph.java | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 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..de4ea73 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,6 +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;
@@ -166,15 +167,10 @@ 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;
+ return projectIds.stream()
+ .map( id -> projects.get( id ) )
+ .sorted( Comparator.comparingInt( order::get ) )
+ .collect( Collectors.toList() );
}
@Override
@@ -183,12 +179,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 );
- }
- }
}