FindTypes finds .class references

wrapping fix for classes with annotations and no modifiers that already have a newline

Author: Greg Adams

rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java

@@ -94,13 +94,15 @@ public Statement visitStatement(Statement statement, P p) {
             } else {
                 J.ClassDeclaration.Padding padding = j.getPadding();
                 JLeftPadded<J.ClassDeclaration.Kind> kind = padding.getKind();
-                j = padding.withKind(
-                        kind.withBefore(
-                                kind.getBefore().withWhitespace(
-                                        "\n" + kind.getBefore().getWhitespace()
-                                )
-                        )
-                );
+                if (!kind.getBefore().getWhitespace().contains("\n")) {
+                    j = padding.withKind(
+                            kind.withBefore(
+                                    kind.getBefore().withWhitespace(
+                                            "\n" + kind.getBefore().getWhitespace()
+                                    )
+                            )
+                    );
+                }
             }
 
         }

rewrite-java/src/main/java/org/openrewrite/java/search/FindTypes.java

@@ -56,6 +56,17 @@ public <N extends NameTree> N visitTypeName(N name, ExecutionContext ctx) {
                 }
                 return n;
             }
+
+            @Override
+            public J visitFieldAccess(J.FieldAccess fieldAccess, ExecutionContext executionContext) {
+                J.FieldAccess fa = (J.FieldAccess) super.visitFieldAccess(fieldAccess, executionContext);
+                JavaType.Class targetClass = TypeUtils.asClass(fa.getTarget().getType());
+                if (targetClass != null && targetClass.getFullyQualifiedName().equals(fullyQualifiedTypeName) &&
+                    fa.getName().getSimpleName().equals("class")) {
+                    return fa.withMarker(new RecipeSearchResult(FindTypes.this));
+                }
+                return fa;
+            }
         };
     }
 
@@ -75,6 +86,17 @@ public <N extends NameTree> N visitTypeName(N name, Set<NameTree> ns) {
                 }
                 return n;
             }
+
+            @Override
+            public J.FieldAccess visitFieldAccess(J.FieldAccess fieldAccess, Set<NameTree> ns) {
+                J.FieldAccess fa = super.visitFieldAccess(fieldAccess, ns);
+                JavaType.Class targetClass = TypeUtils.asClass(fa.getTarget().getType());
+                if (targetClass != null && targetClass.getFullyQualifiedName().equals(fullyQualifiedClassName) &&
+                        fa.getName().getSimpleName().equals("class")) {
+                    ns.add(fieldAccess);
+                }
+                return fa;
+            }
         };
 
         Set<NameTree> ts = new HashSet<>();

rewrite-test/src/main/kotlin/org/openrewrite/java/format/WrappingAndBracesTest.kt

@@ -48,12 +48,12 @@ interface WrappingAndBracesTest : RecipeTest {
 
     @Test
     fun blockEndOnOwnLine(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
+            jp,
+            before = """
             class Test {
                 int n = 0;}
         """,
-        after = """
+            after = """
             class Test {
                 int n = 0;
             }
@@ -194,6 +194,16 @@ interface WrappingAndBracesTest : RecipeTest {
             """
     )
 
+    @Test
+    fun annotatedClassDeclAlreadyCorrect(jp: JavaParser) = assertUnchanged(
+            jp,
+            before = """
+                @SuppressWarnings({"ALL"}) 
+                class Test {
+                }
+            """
+    )
+
     @Test
     fun annotatedClassDeclWithModifiers(jp: JavaParser) = assertChanged(
             jp,

rewrite-test/src/main/kotlin/org/openrewrite/java/search/FindTypesTest.kt

@@ -246,6 +246,24 @@ interface FindTypesTest : RecipeTest {
         dependsOn = arrayOf(a1)
     )
 
+    @Test
+    fun classReference(jp: JavaParser) = assertChanged(
+            jp,
+            before = """
+                import a.A1;
+                class B {
+                    Class<?> clazz = A1.class;
+                }
+            """,
+            after = """
+                import a.A1;
+                class B {
+                    Class<?> clazz = ~~>A1.class;
+                }
+            """,
+            dependsOn = arrayOf(a1)
+    )
+
     @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
     @Test
     fun checkValidation() {