Merge pull request #300 from aloubyansky/break-cyclic-deps

Break cyclic dependencies when manifesting
quarkusio · Nov 17, 2023 · 18dd86e · 18dd86e
2 parents 09d1add + 35741ea
commit 18dd86e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 61 deletions.
diff --git a/domino/api/src/main/java/io/quarkus/domino/manifest/Playground.java b/domino/api/src/main/java/io/quarkus/domino/manifest/Playground.java
diff --git a/domino/api/src/main/java/io/quarkus/domino/manifest/PurgingDependencyTreeVisitor.java b/domino/api/src/main/java/io/quarkus/domino/manifest/PurgingDependencyTreeVisitor.java
@@ -50,8 +50,8 @@ List<VisitedComponent> getRoots() {
     }
 
     private void purge() {
-        log.infof("Roots total: %s", roots.size());
-        log.infof("Nodes total: %s", nodesTotal);
+        //log.infof("Roots total: %s", roots.size());
+        //log.infof("Nodes total: %s", nodesTotal);
 
         for (VisitedComponentImpl root : roots) {
             // we want to process each tree separately due to possible variations across different trees
@@ -84,8 +84,8 @@ private void purge() {
                 }
             }
         }
-        log.infof("Unique roots total: %s", roots.size());
-        log.infof("Unique nodes total: %s", uniqueNodesTotal);
+        //log.infof("Unique roots total: %s", roots.size());
+        //log.infof("Unique nodes total: %s", uniqueNodesTotal);
     }
 
     private ParallelTreeProcessor<Long, VisitedComponentImpl, VisitedComponentImpl> newTreeProcessor() {
@@ -246,21 +246,32 @@ private void linkParent(VisitedComponentImpl parent) {
 
         private void resolveLinkedDependencies(Map<ArtifactCoords, VisitedComponentImpl> treeComponents) {
             if (linkedDeps != null) {
-                log.debugf("Resolving linked dependencies of %s", coords.toCompactCoords());
+                log.debugf("Resolving linked dependencies of %s", coords);
+                // check for circular dependencies
+                for (var linked : linkedDeps) {
+                    if (isCyclicDependency(linked)) {
+                        log.debugf("- %s skipped to avoid a circular dependency", linked);
+                        return;
+                    }
+                }
                 for (var linked : linkedDeps) {
                     var c = treeComponents.get(linked);
                     if (c == null) {
                         throw new IllegalStateException("Failed to resolve linked dependency " + linked.toCompactCoords()
                                 + " of " + this.coords.toCompactCoords() + " among " + treeComponents.keySet());
                     }
-                    log.debugf("- %s", c.coords.toCompactCoords());
+                    log.debugf("- %s", c.coords);
                     addChild(c);
                     c.linkParent(this);
                 }
                 linkedDeps = null;
             }
         }
 
+        private boolean isCyclicDependency(ArtifactCoords coords) {
+            return isSameGav(this.coords, coords) || parent != null && parent.isCyclicDependency(coords);
+        }
+
         private void swap(VisitedComponentImpl other) {
             if (!coords.equals(other.coords)) {
                 throw new IllegalArgumentException("Expected " + coords + " but got " + other.coords);
@@ -377,6 +388,12 @@ public String toString() {
         }
     }
 
+    private static boolean isSameGav(ArtifactCoords c1, ArtifactCoords c2) {
+        return c1.getArtifactId().equals(c2.getArtifactId())
+                && c1.getVersion().equals(c2.getVersion())
+                && c1.getGroupId().equals(c2.getGroupId());
+    }
+
     static PackageURL getPurl(ArtifactCoords coords) {
         final TreeMap<String, String> qualifiers = new TreeMap<>();
         qualifiers.put("type", coords.getType());