Inline MethodAcc

Author: timo-a

src/main/java/org/openrewrite/java/migrate/lombok/NormalizeSetter.java

@@ -35,7 +35,7 @@
 
 @Value
 @EqualsAndHashCode(callSuper = false)
-public class NormalizeSetter extends ScanningRecipe<NormalizeSetter.MethodAcc> {
+public class NormalizeSetter extends ScanningRecipe<List<NormalizeSetter.RenameRecord>> {
 
     private final static String DO_NOT_RENAME = "DO_NOT_RENAME";
 
@@ -54,23 +54,19 @@ public String getDescription() {
                 "E.g. `int getFoo() { return ba; } int getBa() { return foo; }` stays as it is.";
     }
 
-    public static class MethodAcc {
-        List<RenameRecord> renameRecords = new ArrayList<>();
-    }
-
     @Value
-    private static class RenameRecord {
+    public static class RenameRecord {
         String methodPattern;
         String newMethodName;
     }
 
     @Override
-    public MethodAcc getInitialValue(ExecutionContext ctx) {
-        return new MethodAcc();
+    public List<RenameRecord> getInitialValue(ExecutionContext ctx) {
+        return new ArrayList<>();
     }
 
     @Override
-    public TreeVisitor<?, ExecutionContext> getScanner(MethodAcc acc) {
+    public TreeVisitor<?, ExecutionContext> getScanner(List<RenameRecord> renameRecords) {
         return new JavaIsoVisitor<ExecutionContext>() {
             @Override
             public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
@@ -107,7 +103,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                     return method;
                 }
 
-                acc.renameRecords.add(new RenameRecord(MethodMatcher.methodPattern(method), expectedMethodName));
+                renameRecords.add(new RenameRecord(MethodMatcher.methodPattern(method), expectedMethodName));
                 doNotRename.remove(method.getSimpleName()); //actual method name becomes available again
                 doNotRename.add(expectedMethodName); //expected method name now blocked
                 return method;
@@ -133,11 +129,11 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
     }
 
     @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor(MethodAcc acc) {
+    public TreeVisitor<?, ExecutionContext> getVisitor(List<RenameRecord> renameRecords) {
         return new TreeVisitor<Tree, ExecutionContext>() {
             @Override
             public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
-                for (RenameRecord rr : acc.renameRecords) {
+                for (RenameRecord rr : renameRecords) {
                     tree = new ChangeMethodName(rr.methodPattern, rr.newMethodName, true, null)
                             .getVisitor().visit(tree, ctx);
                 }

src/test/java/org/openrewrite/java/migrate/lombok/NormalizeSetterTest.java

@@ -268,7 +268,6 @@ void shouldNotRenameTwoToTheSame() {
         rewriteRun(// language=java
           java(
             """
-
               class A {
 
                   private long foo;
@@ -283,7 +282,6 @@ public void secondToBeRenamed(long foo) {
               }
               """,
             """
-
               class A {
 
                   private long foo;
@@ -309,7 +307,6 @@ void shouldWorkOnInnerClasses() {
         rewriteRun(// language=java
           java(
             """
-
               class A {
 
                   class B {
@@ -323,7 +320,6 @@ public void storeFoo(long foo) {
               }
               """,
             """
-
               class A {
 
                   class B {
@@ -345,7 +341,6 @@ void shouldWorkOnInnerClasses2() {
         rewriteRun(// language=java
           java(
             """
-
               class A {
 
                   class B {
@@ -361,7 +356,6 @@ public void giveFoo(long foo) {
               }
               """,
             """
-
               class A {
 
                   class B {
@@ -389,7 +383,6 @@ void shouldWorkDespiteInnerClassesSameNameMethods() {
         rewriteRun(// language=java
           java(
             """
-
               class A {
 
                   private long foo;
@@ -409,7 +402,6 @@ public void storeFoo(long foo) {
               }
               """,
             """
-
               class A {
 
                   private long foo;
@@ -440,7 +432,6 @@ void shouldWorkDespiteInnerClassesDifferentNameMethods() {
         rewriteRun(// language=java
           java(
             """
-
               class A {
 
                   private long foo;
@@ -460,7 +451,6 @@ public void storeBa(long ba) {
               }
               """,
             """
-
               class A {
 
                   private long foo;