From 9f4d8198e48cb9c2f5a0e274673004e1dfb899b2 Mon Sep 17 00:00:00 2001
From: Michael Keppler <Michael.Keppler@gmx.de>
Date: Mon, 6 May 2024 11:16:32 +0200
Subject: [PATCH] Sort dependency tree root nodes

Also indent the unmapped IUs for better readability.

Fixes #3817
---
 .../tycho/p2/tools/P2DependencyTreeGenerator.java        | 8 ++++----
 .../eclipse/tycho/plugins/p2/DependenciesTreeMojo.java   | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/P2DependencyTreeGenerator.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/P2DependencyTreeGenerator.java
index 814aadf7c5..0693ca4a18 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/P2DependencyTreeGenerator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/P2DependencyTreeGenerator.java
@@ -68,7 +68,7 @@ public P2DependencyTreeGenerator(InstallableUnitGenerator generator, TychoProjec
      * Calculates and returns the dependency tree of the given Maven project. The list that is
      * returned by this method corresponds to the IUs which are directly required by the given
      * project.
-     * 
+     *
      * @param project
      *            One of the Maven projects of the current reactor build. If this project is not a
      *            Tycho project (e.g. the parent pom), an empty list is returned.
@@ -107,7 +107,7 @@ public List<DependencyTreeNode> buildDependencyTree(MavenProject project, Set<II
      * parent. Each IU is unique and must only appear once in the dependency tree.
      */
     public static class DependencyTreeNode {
-        private static final Comparator<IInstallableUnit> COMPARATOR = Comparator.comparing(IInstallableUnit::getId,
+        public static final Comparator<IInstallableUnit> COMPARATOR = Comparator.comparing(IInstallableUnit::getId,
                 String.CASE_INSENSITIVE_ORDER);
         private final IInstallableUnit iu;
         private final IRequirement satisfies;
@@ -144,7 +144,7 @@ public String toString() {
          * each IU of {@code initial}. The children of a node correspond to all IUs that are
          * (directly) required by the parent IU. Each IU in {@code units} only appears once, even if
          * it required by multiple IUs.
-         * 
+         *
          * @param initial
          *            The "direct" IUs referenced by a given artifact.
          * @param units
@@ -175,7 +175,7 @@ private static List<DependencyTreeNode> create(List<IInstallableUnit> initial, S
          * is found, it is removed from {@code units}, meaning that each IU can only show up once in
          * the dependency tree. The children of each node are sorted lexicographically according to
          * {@link #COMPARATOR}.
-         * 
+         *
          * @param node
          *            The (intermediate) head of the dependency tree.
          * @param units
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
index 6109353856..a12ce7ed0b 100644
--- a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
+++ b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
@@ -10,6 +10,7 @@
 package org.eclipse.tycho.plugins.p2;
 
 import java.util.AbstractMap.SimpleEntry;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -76,14 +77,16 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             throw new MojoFailureException(e);
         }
 
-        for (DependencyTreeNode rootNode : dependencyTree) {
+        for (DependencyTreeNode rootNode : dependencyTree.stream()
+                .sorted(Comparator.comparing(DependencyTreeNode::getInstallableUnit, DependencyTreeNode.COMPARATOR))
+                .toList()) {
             printUnit(rootNode, projectMap, 0);
         }
 
         if (!unmapped.isEmpty()) {
             getLog().info("Units that cannot be matched to any requirement:");
-            for (IInstallableUnit unit : unmapped) {
-                getLog().info(unit.toString());
+            for (IInstallableUnit unit : unmapped.stream().sorted(DependencyTreeNode.COMPARATOR).toList()) {
+                getLog().info("   " + unit.toString());
             }
         }