Fix JavaTemplate annotation insertion sometimes adding an unnecessary…

… space in front of modifiers
openrewrite · Nov 11, 2024 · f50e53b · f50e53b
1 parent a126fc8
commit f50e53b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaTemplateTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaTemplateTest.java
@@ -26,13 +26,44 @@
 
 import java.util.List;
 
+import static java.util.Comparator.comparing;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.java.Assertions.java;
 import static org.openrewrite.test.RewriteTest.toRecipe;
 
 @SuppressWarnings({"ConstantConditions", "PatternVariableCanBeUsed", "UnnecessaryBoxing", "StatementWithEmptyBody", "UnusedAssignment", "SizeReplaceableByIsEmpty", "ResultOfMethodCallIgnored", "RedundantOperationOnEmptyContainer"})
 class JavaTemplateTest implements RewriteTest {
 
+    @Test
+    void addAnnotation() {
+       rewriteRun(
+            spec -> spec.recipe(toRecipe(() -> new JavaIsoVisitor<>() {
+                private final JavaTemplate template = JavaTemplate.builder("@SuppressWarnings({\"ALL\"})")
+                  .build();
+                @Override
+                public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
+                    J.ClassDeclaration cd = classDecl;
+                    if(!cd.getLeadingAnnotations().isEmpty()) {
+                        return cd;
+                    }
+                    cd = template.apply(updateCursor(cd), cd.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName)));
+                    return cd;
+                }
+            })),
+         java(
+           """
+             public class A {
+             }
+             """,
+           """
+             @SuppressWarnings({"ALL"})
+             public class A {
+             }
+             """
+         )
+       );
+    }
+
     @Issue("https://github.com/openrewrite/rewrite/issues/2090")
     @Test
     void assignmentWithinIfPredicate() {
@@ -371,7 +402,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
           java(
             """
               import java.util.Arrays;
-
+              
               class T {
                   void m() {
                       Object l = Arrays.asList(new java.util.HashMap<String, String>() {
@@ -383,7 +414,7 @@ void foo() {
               """,
             """
               import java.util.Collections;
-
+              
               class T {
                   void m() {
                       Object l = Collections.singletonList(new java.util.HashMap<String, String>() {
@@ -427,7 +458,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integ
           java(
             """
               import java.util.Arrays;
-
+              
               class T<T> {
                   void m(T o) {
                       Object l = Arrays.asList(o);
@@ -436,7 +467,7 @@ void m(T o) {
               """,
             """
               import java.util.Collections;
-
+              
               class T<T> {
                   void m(T o) {
                       Object l = Collections.singletonList(o);
@@ -480,7 +511,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integ
             """
               import java.util.Arrays;
               import java.util.Collection;
-
+              
               class T<T> {
                   void m(Collection<T> o) {
                       Object l = Arrays.asList(o);
@@ -490,7 +521,7 @@ void m(Collection<T> o) {
             """
               import java.util.Collection;
               import java.util.Collections;
-
+              
               class T<T> {
                   void m(Collection<T> o) {
                       Object l = Collections.singletonList(o);

diff --git a/...-java/src/main/java/org/openrewrite/java/internal/template/JavaTemplateJavaExtension.java b/...-java/src/main/java/org/openrewrite/java/internal/template/JavaTemplateJavaExtension.java
@@ -157,8 +157,7 @@ public J visitClassDeclaration(J.ClassDeclaration classDecl, Integer p) {
                                             getComparatorOrThrow()));
                                 }
                             }
-                            return autoFormat(c, c.getLeadingAnnotations().get(c.getLeadingAnnotations().size() - 1), p,
-                                    getCursor().getParentOrThrow());
+                            return autoFormat(c, c.getName(), p, getCursor().getParentOrThrow());
                         }
                         case EXTENDS: {
                             TypeTree anExtends = substitutions.unsubstitute(templateParser.parseExtends(getCursor(), substitutedTemplate));