Ensure that ExcludeDependency can complete its work within a single cycle even when there are multiple places an exclusion is called for

Author: sambsnyd

rewrite-core/src/main/java/org/openrewrite/Repeat.java

@@ -17,6 +17,8 @@
 
 import org.jspecify.annotations.Nullable;
 
+import java.util.function.Supplier;
+
 public class Repeat {
 
     /**
@@ -29,20 +31,25 @@ public static TreeVisitor<?, ExecutionContext> repeatUntilStable(TreeVisitor<?,
         return repeatUntilStable(v, 3);
     }
 
+    public static TreeVisitor<?, ExecutionContext> repeatUntilStable(Supplier<TreeVisitor<?, ExecutionContext>> v) {
+        return repeatUntilStable(v, 3);
+    }
+
     /**
      * Returns a new visitor which runs the supplied visitor in a loop until no more changes are made, or the maximum
      * number of cycles is reached.
      * Convenient when a visitor is designed to recursively apply itself to a tree to achieve its desired result.
      * Stops early if the visitor ceases to make changes to the tree before the maximum number of cycles is reached.
      */
     public static TreeVisitor<?, ExecutionContext> repeatUntilStable(TreeVisitor<?, ExecutionContext> v, int maxCycles) {
+        return repeatUntilStable(() -> v, maxCycles);
+    }
+
+    public static TreeVisitor<?, ExecutionContext> repeatUntilStable(Supplier<TreeVisitor<?, ExecutionContext>> vp, int maxCycles) {
         return new TreeVisitor<Tree, ExecutionContext>() {
+
             @Override
             public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
-                if (tree instanceof SourceFile && !v.isAcceptable((SourceFile) tree, ctx)) {
-                    return tree;
-                }
-
                 if (tree != null && !(tree instanceof SourceFile) && getCursor().isRoot()) {
                     throw new IllegalArgumentException(
                             String.format(
@@ -56,6 +63,10 @@ public static TreeVisitor<?, ExecutionContext> repeatUntilStable(TreeVisitor<?,
                 Tree previous = tree;
                 Tree current = null;
                 for (int i = 0; i < maxCycles; i++) {
+                    TreeVisitor<?, ExecutionContext> v = vp.get();
+                    if (tree instanceof SourceFile && !v.isAcceptable((SourceFile) tree, ctx)) {
+                        return tree;
+                    }
                     current = v.visit(previous, ctx);
                     if (current == previous) {
                         break;
@@ -68,13 +79,13 @@ public static TreeVisitor<?, ExecutionContext> repeatUntilStable(TreeVisitor<?,
 
             @Override
             public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx, Cursor parent) {
-                if (tree instanceof SourceFile && !v.isAcceptable((SourceFile) tree, ctx)) {
-                    return tree;
-                }
-
                 Tree previous = tree;
                 Tree current = null;
                 for (int i = 0; i < maxCycles; i++) {
+                    final TreeVisitor<?, ExecutionContext> v = vp.get();
+                    if (tree instanceof SourceFile && !v.isAcceptable((SourceFile) tree, ctx)) {
+                        return tree;
+                    }
                     current = v.visit(previous, ctx, parent);
                     if (current == previous) {
                         break;

rewrite-maven/src/main/java/org/openrewrite/maven/ExcludeDependency.java

@@ -86,15 +86,15 @@ public String getDescription() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new MavenVisitor<ExecutionContext>() {
+        return Repeat.repeatUntilStable(() -> new MavenVisitor<ExecutionContext>() {
             @Nullable
             private final Scope scope = ExcludeDependency.this.scope == null ? null : Scope.fromName(ExcludeDependency.this.scope);
 
             @Override
             public Xml visitDocument(Xml.Document document, ExecutionContext ctx) {
                 Xml xml = super.visitDocument(document, ctx);
                 if (xml != document) {
-                    maybeUpdateModel();
+                    xml = new UpdateMavenModel<>().visitNonNull(xml, ctx);
                 }
                 return xml;
             }
@@ -120,6 +120,7 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                                         "<artifactId>" + artifactId + "</artifactId>\n" +
                                         "</exclusion>"))
                                         .visitNonNull(exclusions, ctx, getCursor());
+                                //noinspection unchecked
                                 tag = tag.withContent(ListUtils.map((List<Content>) tag.getContent(), t -> t == exclusions ? newExclusions : t));
                             }
                         } else {
@@ -137,6 +138,6 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 }
                 return super.visitTag(tag, ctx);
             }
-        };
+        });
     }
 }

rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java

@@ -196,8 +196,7 @@ void respectTransitiveDependencyOriginalScopeWhenDeterminingIfExclusionIsNecessa
     @Test
     void excludeAlsoWhereConflictOmitted() {
         rewriteRun(
-          spec -> spec.expectedCyclesThatMakeChanges(2)
-            .recipe(new ExcludeDependency("org.apache.logging.log4j", "log4j-api", null)),
+          spec -> spec.recipe(new ExcludeDependency("org.apache.logging.log4j", "log4j-api", null)),
           pomXml(
             """
               <project>