Revert "Match upstream Maven recipe changes to ChangeDependency (#151)" (#152)

This reverts commit fa0b361.

Author: Jenson3210

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

@@ -18,15 +18,13 @@
 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 ScanningRecipe<ChangeDependency.Accumulator> {
+public class ChangeDependency extends Recipe {
     // 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.",
@@ -92,30 +90,25 @@ public String getDescription() {
     @Override
     public Validated<Object> validate(ExecutionContext ctx) {
         return super.validate(ctx)
-                .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());
+                .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());
     }
 
     @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor(Accumulator acc) {
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            final TreeVisitor<?, ExecutionContext> mavenVisitor = getChangeMavenDependency().getVisitor(acc.getMavenAccumulator());
-            final TreeVisitor<?, ExecutionContext> gradleVisitor = getChangeGradleDependency().getVisitor();
+            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();
 
             @Override
             public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
@@ -128,29 +121,13 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
                     return tree;
                 }
                 SourceFile s = (SourceFile) tree;
-                if (mavenVisitor.isAcceptable(s, ctx)) {
-                    s = (SourceFile) mavenVisitor.visitNonNull(s, ctx);
-                } else if (gradleVisitor.isAcceptable(s, ctx)) {
+                if (gradleVisitor.isAcceptable(s, ctx)) {
                     s = (SourceFile) gradleVisitor.visitNonNull(s, ctx);
+                } else if (mavenVisitor.isAcceptable(s, ctx)) {
+                    s = (SourceFile) mavenVisitor.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,7 +221,9 @@ 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(changeDependency(this, groupId, artifactId, newGroupId, newArtifactId, ctx));
+                                doAfterVisit(new ChangeDependency(
+                                        groupId, artifactId, newGroupId, newArtifactId,
+                                        "latest.release", null, null, null).getVisitor());
                             } else {
                                 return getSearchResultFound(tree, relocation);
                             }
@@ -263,7 +265,9 @@ 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(changeDependency(this, groupId, artifactId, newGroupId, newArtifactId, ctx));
+                                doAfterVisit(new ChangeDependency(
+                                        groupId, artifactId, newGroupId, newArtifactId,
+                                        "latest.release", null, null, null).getVisitor());
                             } else {
                                 return getSearchResultFound(tree, relocation);
                             }
@@ -300,12 +304,4 @@ 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);
-    }
 }