Fix ChangeLogLevel to accommodate string concatenations

openrewrite · Jul 12, 2023 · dbbd155 · dbbd155
1 parent 92576cc
commit dbbd155
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 6 deletions.
diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/ChangeLogLevel.java b/src/main/java/org/openrewrite/java/logging/slf4j/ChangeLogLevel.java
@@ -83,12 +83,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 if(args.size() == 0) {
                     return m;
                 }
-                Expression arg = args.get(0);
-                if(!(arg instanceof J.Literal)) {
-                    return m;
-                }
-                J.Literal lit = (J.Literal) arg;
-                if(lit.getValue() == null) {
+                J.Literal lit = leftMostLiteral(args.get(0));
+                if(lit == null || lit.getValue() == null) {
                     return m;
                 }
                 if(!StringUtils.isBlank(startsWith) && !lit.getValue().toString().startsWith(startsWith)) {
@@ -101,4 +97,15 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             }
         });
     }
+
+    @Nullable
+    J.Literal leftMostLiteral(Expression arg) {
+        if(arg instanceof J.Literal) {
+            return (J.Literal) arg;
+        }
+        if(arg instanceof J.Binary) {
+            return leftMostLiteral(((J.Binary) arg).getLeft());
+        }
+        return null;
+    }
 }
diff --git a/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java b/src/test/java/org/openrewrite/java/logging/slf4j/ChangeLogLevelTest.java
@@ -61,4 +61,38 @@ void test() {
             """)
         );
     }
+
+    @Test
+    void concatenatedString() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+                import org.slf4j.Logger;
+                import org.slf4j.LoggerFactory;
+                
+                class Test {
+                    private static final Logger log = LoggerFactory.getLogger(Test.class);
+                    
+                    void test() {
+                        log.info("LaunchDarkly " + 1 + "Hello");
+                    }
+                }
+            """,
+            """
+                import org.slf4j.Logger;
+                import org.slf4j.LoggerFactory;
+                
+                class Test {
+                    private static final Logger log = LoggerFactory.getLogger(Test.class);
+                    
+                    void test() {
+                        log.debug("LaunchDarkly " + 1 + "Hello");
+                    }
+                }
+            """)
+        );
+    }
+
+
 }