Remove redundant parameter passing in MessageResolver (#2183)

RocMarshal · vy · commit 40d18b15eb1f · 2024-01-11T20:03:49.000+01:00
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolver.java
@@ -99,17 +99,16 @@ private static EventResolver createInternalResolver(final TemplateResolverConfig
         if (stringified && fallbackKey != null) {
             throw new IllegalArgumentException("fallbackKey is not allowed when stringified is enable: " + config);
         }
-        return stringified ? createStringResolver(fallbackKey) : createObjectResolver(fallbackKey);
+        return stringified ? createStringResolver() : createObjectResolver(fallbackKey);
     }
 
     @Override
     public void resolve(final LogEvent logEvent, final JsonWriter jsonWriter) {
         internalResolver.resolve(logEvent, jsonWriter);
     }
 
-    private static EventResolver createStringResolver(final String fallbackKey) {
-        return (final LogEvent logEvent, final JsonWriter jsonWriter) ->
-                resolveString(fallbackKey, logEvent, jsonWriter);
+    private static EventResolver createStringResolver() {
+        return (final LogEvent logEvent, final JsonWriter jsonWriter) -> resolveString(null, logEvent, jsonWriter);
     }
 
     private static void resolveString(final String fallbackKey, final LogEvent logEvent, final JsonWriter jsonWriter) {

Original file line number	Diff line number	Diff line change
`@@ -99,17 +99,16 @@ private static EventResolver createInternalResolver(final TemplateResolverConfig`
`99`	`99`	`if (stringified && fallbackKey != null) {`
`100`	`100`	`throw new IllegalArgumentException("fallbackKey is not allowed when stringified is enable: " + config);`
`101`	`101`	`}`
`102`		`- return stringified ? createStringResolver(fallbackKey) : createObjectResolver(fallbackKey);`
	`102`	`+ return stringified ? createStringResolver() : createObjectResolver(fallbackKey);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override`
`106`	`106`	`public void resolve(final LogEvent logEvent, final JsonWriter jsonWriter) {`
`107`	`107`	`internalResolver.resolve(logEvent, jsonWriter);`
`108`	`108`	`}`
`109`	`109`
`110`		`- private static EventResolver createStringResolver(final String fallbackKey) {`
`111`		`- return (final LogEvent logEvent, final JsonWriter jsonWriter) ->`
`112`		`- resolveString(fallbackKey, logEvent, jsonWriter);`
	`110`	`+ private static EventResolver createStringResolver() {`
	`111`	`+ return (final LogEvent logEvent, final JsonWriter jsonWriter) -> resolveString(null, logEvent, jsonWriter);`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`private static void resolveString(final String fallbackKey, final LogEvent logEvent, final JsonWriter jsonWriter) {`