Do not replace if literals are evaluated to null

JnRouvignac · May 28, 2021 · 4f9c5c6 · 4f9c5c6
1 parent a906ff7
commit 4f9c5c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/...n/java/org/autorefactor/jdt/internal/ui/fix/LogParametersRatherThanLogMessageCleanUp.java b/...n/java/org/autorefactor/jdt/internal/ui/fix/LogParametersRatherThanLogMessageCleanUp.java
@@ -96,7 +96,7 @@ private boolean maybeReplaceConcatenation(final MethodInvocation visited, final
 				hasLiteral= true;
 				String literal= (String) string.resolveConstantExpressionValue();
 
-				if (literal != null && (literal.contains("{") || literal.contains("}"))) { //$NON-NLS-1$ //$NON-NLS-2$
+				if (literal == null || literal.contains("{") || literal.contains("}")) { //$NON-NLS-1$ //$NON-NLS-2$
 					return true;
 				}
 

diff --git a/...rg/autorefactor/refactoring/rules/samples_in/LogParametersRatherThanLogMessageSample.java b/...rg/autorefactor/refactoring/rules/samples_in/LogParametersRatherThanLogMessageSample.java
@@ -25,6 +25,8 @@
  */
 package org.autorefactor.refactoring.rules.samples_in;
 
+import java.util.List;
+
 import org.slf4j.Logger;
 
 public class LogParametersRatherThanLogMessageSample {
@@ -93,4 +95,8 @@ public void doNotReplaceConcatenateSplitLiteral(Logger slf4jLog) {
         slf4jLog.debug("This text is very long and it can't be kept on a single line"
                 + " so we have to break it in order to keep readability.");
     }
+
+    public void doNotReplaceIfLiteralsAreEvaluatedToNull(Logger slf4jLog) {
+        slf4jLog.debug("aa" + "aa" + 1);
+    }
 }
diff --git a/...g/autorefactor/refactoring/rules/samples_out/LogParametersRatherThanLogMessageSample.java b/...g/autorefactor/refactoring/rules/samples_out/LogParametersRatherThanLogMessageSample.java
@@ -25,6 +25,8 @@
  */
 package org.autorefactor.refactoring.rules.samples_out;
 
+import java.util.List;
+
 import org.slf4j.Logger;
 
 public class LogParametersRatherThanLogMessageSample {
@@ -93,4 +95,8 @@ public void doNotReplaceConcatenateSplitLiteral(Logger slf4jLog) {
         slf4jLog.debug("This text is very long and it can't be kept on a single line"
                 + " so we have to break it in order to keep readability.");
     }
+
+    public void doNotReplaceIfLiteralsAreEvaluatedToNull(Logger slf4jLog) {
+        slf4jLog.debug("aa" + "aa" + 1);
+    }
 }