Update LoggersNamedForEnclosingClass to convert `LoggerFactory#getLog…

…ger(..)` method parameters which are not J.FieldAccess instances. (fixes: #69)
openrewrite · Aug 30, 2022 · 4923215 · 4923215
1 parent 1665961
commit 4923215
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClass.java b/src/main/java/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClass.java
@@ -70,9 +70,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 }
 
                 String enclosingClazzName = firstEnclosingClass.getSimpleName() + ".class";
-                String argumentClazzName = ((J.FieldAccess) mi.getArguments().get(0)).toString();
-                if (enclosingClazzName.equals(argumentClazzName)) {
-                    return mi;
+                if (mi.getArguments().get(0) instanceof J.FieldAccess) {
+                    String argumentClazzName = ((J.FieldAccess) mi.getArguments().get(0)).toString();
+                    if (enclosingClazzName.equals(argumentClazzName)) {
+                        return mi;
+                    }
                 }
 
                 return mi.withTemplate(JavaTemplate.builder(this::getCursor, "LoggerFactory.getLogger(#{})")

diff --git a/src/test/kotlin/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.kt b/src/test/kotlin/org/openrewrite/java/logging/slf4j/LoggersNamedForEnclosingClassTest.kt
@@ -21,6 +21,7 @@ import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
 
+@Suppress("RedundantSlf4jDefinition")
 class LoggersNamedForEnclosingClassTest : JavaRecipeTest {
     override val parser: JavaParser
         get() = JavaParser.fromJavaVersion().classpath("slf4j-api").build()
@@ -48,7 +49,27 @@ class LoggersNamedForEnclosingClassTest : JavaRecipeTest {
             }
         """
     )
-
+   @Issue("https://github.com/openrewrite/rewrite-logging-frameworks/issues/69")
+    @Test
+    fun shouldRenameLoggerFromMethodInvocationToClass() = assertChanged(
+        before = """
+            import org.slf4j.Logger;
+            import org.slf4j.LoggerFactory;
+            class WrongClass {}
+            class A {
+                private Logger logger = LoggerFactory.getLogger(getClass());
+            }
+        """,
+        after = """
+            import org.slf4j.Logger;
+            import org.slf4j.LoggerFactory;
+            class WrongClass {}
+            class A {
+                private Logger logger = LoggerFactory.getLogger(A.class);
+            }
+        """
+    )
+
     @Test
     fun shouldNotChangeCorrectLoggername() = assertUnchanged(
         before = """