You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/01/11 19:04:27 UTC
(logging-log4j2) branch main updated: Remove redundant parameter passing in `MessageResolver` (#2183)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 40d18b15eb Remove redundant parameter passing in `MessageResolver` (#2183)
40d18b15eb is described below
commit 40d18b15eb1f22c4946cf96164c1a96978d14f89
Author: Yuepeng Pan <fl...@126.com>
AuthorDate: Fri Jan 12 01:39:00 2024 +0800
Remove redundant parameter passing in `MessageResolver` (#2183)
---
.../log4j/layout/template/json/resolver/MessageResolver.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
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
index 53437b1615..143cfe4183 100644
--- 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,7 +99,7 @@ public final class MessageResolver implements EventResolver {
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
@@ -107,9 +107,8 @@ public final class MessageResolver implements EventResolver {
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) {