Match upstream Maven recipe changes to ChangeDependency (#151)

* Fix ChangeDependencyTest.changeMavenDependency() test failure

The upstream Maven recipe was converted to a ScanningRecipe, which requires
updating ChangeDependency to also be a ScanningRecipe to properly invoke
the scanning phase. This change delegates to the Maven recipe's scanning
implementation to fix the failing test.

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* rename method

* Adapt RelocatedDependencyCheck to use ChangeDependency as ScanningRecipe

Extract a helper method to properly invoke ChangeDependency's scanning phase
only for the current file, maintaining the existing behavior while accommodating
the recipe's conversion to ScanningRecipe.

* Extract a method for Gradle too; check Maven acceptable first (cheaper)

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 3 people

src/main/java/org/openrewrite/java/dependencies/ChangeDependency.java

@@ -18,13 +18,15 @@
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Value;
 import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
+import org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId;
 
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
-public class ChangeDependency extends Recipe {
+public class ChangeDependency extends ScanningRecipe<ChangeDependency.Accumulator> {
     // Gradle and Maven shared parameters
     @Option(displayName = "Old group ID",
             description = "The old group ID to replace. The group ID is the first part of a dependency coordinate 'com.google.guava:guava:VERSION'. Supports glob expressions.",
@@ -90,25 +92,30 @@ public String getDescription() {
     @Override
     public Validated<Object> validate(ExecutionContext ctx) {
         return super.validate(ctx)
-                .and(((Recipe) new org.openrewrite.gradle.ChangeDependency(
-                        oldGroupId, oldArtifactId, newGroupId, newArtifactId, newVersion, versionPattern, overrideManagedVersion, changeManagedDependency)).validate())
-                .and(((Recipe) new org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId(
-                        oldGroupId, oldArtifactId, newGroupId, newArtifactId, newVersion, versionPattern, overrideManagedVersion, changeManagedDependency)).validate());
+                .and(getChangeMavenDependency().validate())
+                .and(getChangeGradleDependency().validate());
+    }
+
+    @Value
+    public static class Accumulator {
+        ChangeDependencyGroupIdAndArtifactId.Accumulator mavenAccumulator;
+    }
+
+    @Override
+    public Accumulator getInitialValue(ExecutionContext ctx) {
+        return new Accumulator(getChangeMavenDependency().getInitialValue(ctx));
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getScanner(Accumulator acc) {
+        return getChangeMavenDependency().getScanner(acc.getMavenAccumulator());
     }
 
     @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor() {
+    public TreeVisitor<?, ExecutionContext> getVisitor(Accumulator acc) {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            final TreeVisitor<?, ExecutionContext> mavenVisitor = new org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId(
-                    oldGroupId, oldArtifactId,
-                    newGroupId, newArtifactId,
-                    newVersion, versionPattern,
-                    overrideManagedVersion, changeManagedDependency).getVisitor();
-            final TreeVisitor<?, ExecutionContext> gradleVisitor = new org.openrewrite.gradle.ChangeDependency(
-                    oldGroupId, oldArtifactId,
-                    newGroupId, newArtifactId,
-                    newVersion, versionPattern,
-                    overrideManagedVersion).getVisitor();
+            final TreeVisitor<?, ExecutionContext> mavenVisitor = getChangeMavenDependency().getVisitor(acc.getMavenAccumulator());
+            final TreeVisitor<?, ExecutionContext> gradleVisitor = getChangeGradleDependency().getVisitor();
 
             @Override
             public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
@@ -121,13 +128,29 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
                     return tree;
                 }
                 SourceFile s = (SourceFile) tree;
-                if (gradleVisitor.isAcceptable(s, ctx)) {
-                    s = (SourceFile) gradleVisitor.visitNonNull(s, ctx);
-                } else if (mavenVisitor.isAcceptable(s, ctx)) {
+                if (mavenVisitor.isAcceptable(s, ctx)) {
                     s = (SourceFile) mavenVisitor.visitNonNull(s, ctx);
+                } else if (gradleVisitor.isAcceptable(s, ctx)) {
+                    s = (SourceFile) gradleVisitor.visitNonNull(s, ctx);
                 }
                 return s;
             }
         };
     }
+
+    private org.openrewrite.gradle.ChangeDependency getChangeGradleDependency() {
+        return new org.openrewrite.gradle.ChangeDependency(
+                oldGroupId, oldArtifactId,
+                newGroupId, newArtifactId,
+                newVersion, versionPattern,
+                overrideManagedVersion, changeManagedDependency);
+    }
+
+    private ChangeDependencyGroupIdAndArtifactId getChangeMavenDependency() {
+        return new ChangeDependencyGroupIdAndArtifactId(
+                oldGroupId, oldArtifactId,
+                newGroupId, newArtifactId,
+                newVersion, versionPattern,
+                overrideManagedVersion, changeManagedDependency);
+    }
 }

src/main/java/org/openrewrite/java/dependencies/RelocatedDependencyCheck.java

@@ -221,9 +221,7 @@ private <T extends Tree> T maybeUpdate(T tree, String groupId, @Nullable String
                             if (Boolean.TRUE.equals(changeDependencies) && artifactId != null) {
                                 String newGroupId = relocation.getTo().getGroupId();
                                 String newArtifactId = Optional.ofNullable(relocation.getTo().getArtifactId()).orElse(artifactId);
-                                doAfterVisit(new ChangeDependency(
-                                        groupId, artifactId, newGroupId, newArtifactId,
-                                        "latest.release", null, null, null).getVisitor());
+                                doAfterVisit(changeDependency(this, groupId, artifactId, newGroupId, newArtifactId, ctx));
                             } else {
                                 return getSearchResultFound(tree, relocation);
                             }
@@ -265,9 +263,7 @@ private <T extends Tree> T maybeUpdate(T tree, String groupId, @Nullable String
                             if (Boolean.TRUE.equals(changeDependencies) && artifactId != null) {
                                 String newGroupId = relocation.getTo().getGroupId();
                                 String newArtifactId = Optional.ofNullable(relocation.getTo().getArtifactId()).orElse(artifactId);
-                                doAfterVisit(new ChangeDependency(
-                                        groupId, artifactId, newGroupId, newArtifactId,
-                                        "latest.release", null, null, null).getVisitor());
+                                doAfterVisit(changeDependency(this, groupId, artifactId, newGroupId, newArtifactId, ctx));
                             } else {
                                 return getSearchResultFound(tree, relocation);
                             }
@@ -304,4 +300,12 @@ private <T extends Tree> T getSearchResultFound(T tree, Relocation relocation) {
             }
         };
     }
+
+    private static TreeVisitor<?, ExecutionContext> changeDependency(TreeVisitor<?, ExecutionContext> visitor, String oldGroupId, String oldArtifactId, String newGroupId, String newArtifactId, ExecutionContext ctx) {
+        //call scanner only for the current file as we need the recipe to behave like a non-scanning recipe for now. Later we can change this to support parent poms etc...
+        ChangeDependency changeDependency = new ChangeDependency(oldGroupId, oldArtifactId, newGroupId, newArtifactId, "latest.release", null, null, null);
+        ChangeDependency.Accumulator acc = changeDependency.getInitialValue(ctx);
+        changeDependency.getScanner(acc).visit(visitor.getCursor().firstEnclosingOrThrow(SourceFile.class), ctx);
+        return changeDependency.getVisitor(acc);
+    }
 }