Prevent logger.traceEntry(null)

openrewrite · Dec 12, 2023 · a69a8b8 · a69a8b8
1 parent 88b96ad
commit a69a8b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/org/openrewrite/java/logging/log4j/ConvertJulEntering.java b/src/main/java/org/openrewrite/java/logging/log4j/ConvertJulEntering.java
@@ -70,12 +70,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                             }
                             List<Expression> modifiedArgs = new ArrayList<>();
                             List<JavaType> modifiedTypes = new ArrayList<>();
-                            modifiedArgs.add(buildNullString());
-                            modifiedTypes.add(Primitive.String);
-                            if (originalArgCount > 2) {
-                                JavaType varargType = JavaType.buildType("java.lang.Object[]");
+                            if (2 < originalArgCount) {
+                                modifiedArgs.add(buildNullString());
+                                modifiedTypes.add(Primitive.String);
                                 modifiedArgs.add(originalArgs.get(2));
-                                modifiedTypes.add(varargType);
+                                modifiedTypes.add(JavaType.buildType("java.lang.Object[]"));
                             }
                             Method mt = m.getMethodType().withParameterTypes(modifiedTypes);
                             JavaType.FullyQualified dt = mt.getDeclaringType().withFullyQualifiedName("org.apache.logging.log4j.Logger");

diff --git a/src/test/java/org/openrewrite/java/logging/log4j/ConvertJulEnteringTest.java b/src/test/java/org/openrewrite/java/logging/log4j/ConvertJulEnteringTest.java
@@ -54,7 +54,7 @@ void method(Logger logger) {
 
               class Test {
                   void method(Logger logger) {
-                    logger.traceEntry(null);
+                    logger.traceEntry();
                     logger.traceEntry(null, "param");
                     logger.traceEntry(null, new Object[]{"param1", "param2"});
                   }