Reduce excessive reformatting of source files in various junit recipes

Author: sambsnyd

src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java

@@ -128,7 +128,7 @@ public ClassDeclaration visitClassDeclaration(ClassDeclaration classDecl, Execut
                     if (!modifierComments.isEmpty()) {
                         c = c.withComments(ListUtils.concatAll(c.getComments(), modifierComments));
                     }
-                    c = maybeAutoFormat(c, c.withModifiers(modifiers), executionContext, getCursor().dropParentUntil(J.class::isInstance));
+                    c = maybeAutoFormat(c, c.withModifiers(modifiers), c.getName(), executionContext, getCursor().getParentTreeCursor());
                 }
             }
             return c;

src/main/java/org/openrewrite/java/testing/junit5/CategoryToTag.java

@@ -73,7 +73,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                 maybeRemoveImport("org.junit.experimental.categories.Category");
                 maybeAddImport(tagType);
             }
-            cd = maybeAutoFormat(classDecl, cd, ctx);
+            cd = maybeAutoFormat(classDecl, cd, cd.getName(), ctx, getCursor().getParentTreeCursor());
             return cd;
         }
 
@@ -89,7 +89,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                 maybeRemoveImport("org.junit.experimental.categories.Category");
                 maybeAddImport(tagType);
             }
-            m = maybeAutoFormat(method, m, ctx);
+            m = maybeAutoFormat(method, m, m.getName(), ctx, getCursor().getParentTreeCursor());
             return m;
         }
 

src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java

@@ -271,7 +271,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
             if (initMethods.contains(m.getSimpleName()) || initMethodReferences.containsValue(m.getSimpleName())) {
                 if (m.getModifiers().stream().noneMatch(it -> J.Modifier.Type.Static.equals(it.getType()))) {
                     J.Modifier staticModifier = new J.Modifier(UUID.randomUUID(), Space.format(" "), Markers.EMPTY, J.Modifier.Type.Static, new ArrayList<>());
-                    m = maybeAutoFormat(m, m.withModifiers(ListUtils.concat(m.getModifiers(), staticModifier)), executionContext, getCursor().dropParentUntil(J.class::isInstance));
+                    m = maybeAutoFormat(m, m.withModifiers(ListUtils.concat(m.getModifiers(), staticModifier)), executionContext, getCursor().getParentTreeCursor());
                 }
             }
             return m;

src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java

@@ -275,11 +275,14 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
             if (initMethodDeclarationTemplate != null) {
                 cd = cd.withBody(cd.getBody().withTemplate(initMethodDeclarationTemplate,
                         cd.getBody().getCoordinates().lastStatement()));
+                J.Block finalBody = cd.getBody();
                 cd = cd.withBody(cd.getBody().withStatements(ListUtils.map(cd.getBody().getStatements(), stmt -> {
                     if (stmt instanceof J.MethodDeclaration) {
                         J.MethodDeclaration md = (J.MethodDeclaration) stmt;
                         if (md.getName().getSimpleName().equals(initMethodName)) {
-                            return md.withParameters(parameterizedTestMethodParameters);
+                            J.Block body = md.getBody(); // Preserve body formatting
+                            return autoFormat(md.withParameters(parameterizedTestMethodParameters).withBody(null),
+                                    executionContext, new Cursor(getCursor(), finalBody)).withBody(body);
                         }
                     }
                     return stmt;
@@ -289,18 +292,19 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
             // if a constructor was converted to an init method then remove final modifiers from any associated field variables.
             final Set<String> fieldNames = getCursor().pollMessage("INIT_VARS");
             if (fieldNames != null && !fieldNames.isEmpty()) {
+                J.Block finalBody = cd.getBody();
                 cd = cd.withBody(cd.getBody().withStatements(ListUtils.map(cd.getBody().getStatements(), statement -> {
                     if (statement instanceof J.VariableDeclarations) {
                         J.VariableDeclarations varDecls = (J.VariableDeclarations) statement;
                         if (varDecls.getVariables().stream().anyMatch(it -> fieldNames.contains(it.getSimpleName()))
                                 && (varDecls.hasModifier(J.Modifier.Type.Final))) {
-                            statement = varDecls.withModifiers(ListUtils.map(varDecls.getModifiers(), mod -> mod.getType() == J.Modifier.Type.Final ? null : mod));
+                            varDecls = varDecls.withModifiers(ListUtils.map(varDecls.getModifiers(), mod -> mod.getType() == J.Modifier.Type.Final ? null : mod));
+                            statement = maybeAutoFormat(statement, varDecls, executionContext, new Cursor(getCursor(), finalBody));
                         }
                     }
                     return statement;
                 })));
             }
-            cd = maybeAutoFormat(classDecl, cd, executionContext);
             return cd;
         }
 
@@ -356,14 +360,14 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                 assert m.getBody() != null;
                 JavaCoordinates newStatementCoordinates = !m.getBody().getStatements().isEmpty() ? m.getBody().getStatements().get(0).getCoordinates().before() : m.getBody().getCoordinates().lastStatement();
                 m = m.withTemplate(initMethodStatementTemplate, newStatementCoordinates, initStatementParamString);
-                m = maybeAutoFormat(m, m.withParameters(parameterizedTestMethodParameters), executionContext, getCursor().dropParentUntil(J.class::isInstance));
+                m = maybeAutoFormat(m, m.withParameters(parameterizedTestMethodParameters), m.getName(), executionContext, getCursor().getParentTreeCursor());
             }
 
             // Change constructor to test init method
             if (initMethodDeclarationTemplate == null && m.isConstructor()) {
                 m = m.withName(m.getName().withSimpleName(initMethodName));
                 m = maybeAutoFormat(m, m.withReturnTypeExpression(new J.Primitive(randomId(), Space.EMPTY, Markers.EMPTY, JavaType.Primitive.Void)),
-                        executionContext, getCursor().dropParentUntil(J.class::isInstance));
+                        m.getName(), executionContext, getCursor().getParentTreeCursor());
 
                 // converting a constructor to a void init method may require removing final modifiers from field vars.
                 if (m.getBody() != null) {

src/test/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.java

@@ -131,8 +131,8 @@ public void testSerialization(String firstName, String lastName, Integer id) {
                             
                   public static List<Object[]> parameters() {
                       return Arrays.asList(
-                              new Object[]{"Otis", "TheDog", 124},
-                              new Object[]{"Garfield", "TheBoss", 126});
+                          new Object[] { "Otis", "TheDog", 124 },
+                          new Object[] { "Garfield", "TheBoss", 126 });
                   }
               }
               """
@@ -215,8 +215,8 @@ public void testSerialization(String firstName, String lastName, Integer id) {
                             
                   public static List<Object[]> parameters() {
                       return Arrays.asList(
-                              new Object[]{"Otis", "TheDog", 124},
-                              new Object[]{"Garfield", "TheBoss", 126});
+                          new Object[] { "Otis", "TheDog", 124 },
+                          new Object[] { "Garfield", "TheBoss", 126 });
                   }
               }
               """