You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/01/26 11:59:22 UTC
(logging-log4j2) branch main updated (4f379fb621 -> b9722ee0e2)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 4f379fb621 Fix compilation
new 0c5f364503 LOG4J2-2850
new b9722ee0e2 Make `set` methods in `ReusableParameterizedMessage` protected
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../log4j/message/LocalizedMessageFactory.java | 2 +-
.../message/ReusableParameterizedMessage.java | 23 +++++++++++-----------
src/site/_release-notes/_3.x.x.adoc | 2 ++
3 files changed, 15 insertions(+), 12 deletions(-)
(logging-log4j2) 02/02: Make `set` methods in `ReusableParameterizedMessage` protected
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b9722ee0e27345aca017e48f11bb0d3acd51781c
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Jan 26 12:18:11 2024 +0100
Make `set` methods in `ReusableParameterizedMessage` protected
---
.../message/ReusableParameterizedMessage.java | 23 +++++++++++-----------
src/site/_release-notes/_3.x.x.adoc | 2 ++
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index db209f866d..ea074c5db1 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -152,26 +152,27 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return null;
}
- ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) {
+ protected ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) {
init(messagePattern, arguments == null ? 0 : arguments.length, arguments);
varargs = arguments;
return this;
}
- ReusableParameterizedMessage set(final String messagePattern, final Object p0) {
+ protected ReusableParameterizedMessage set(final String messagePattern, final Object p0) {
params[0] = p0;
init(messagePattern, 1, params);
return this;
}
- ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1) {
+ protected ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1) {
params[0] = p0;
params[1] = p1;
init(messagePattern, 2, params);
return this;
}
- ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2) {
+ protected ReusableParameterizedMessage set(
+ final String messagePattern, final Object p0, final Object p1, final Object p2) {
params[0] = p0;
params[1] = p1;
params[2] = p2;
@@ -179,7 +180,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3) {
params[0] = p0;
params[1] = p1;
@@ -189,7 +190,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -205,7 +206,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -223,7 +224,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -243,7 +244,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -265,7 +266,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -289,7 +290,7 @@ public class ReusableParameterizedMessage implements ReusableMessage, ParameterV
return this;
}
- ReusableParameterizedMessage set(
+ protected ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
diff --git a/src/site/_release-notes/_3.x.x.adoc b/src/site/_release-notes/_3.x.x.adoc
index 45092864e2..7ff71077bd 100644
--- a/src/site/_release-notes/_3.x.x.adoc
+++ b/src/site/_release-notes/_3.x.x.adoc
@@ -30,6 +30,7 @@ This release contains...
[#release-notes-3-x-x-changed]
=== Changed
+* Change the order of evaluation of `FormattedMessage` formatters. Messages are evaluated using `java.util.Format` only if they don't comply to the `java.text.MessageFormat` or `ParameterizedMessage` format. (https://github.com/apache/logging-log4j2/issues/1223[1223])
* Split off YAML configuration into a new `log4j-config-yaml` module.
* Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2102[2102])
* Update `com.google.guava:guava` to version `33.0.0-jre` (https://github.com/apache/logging-log4j2/pull/2108[2108])
@@ -37,6 +38,7 @@ This release contains...
[#release-notes-3-x-x-fixed]
=== Fixed
+* Rewrote message parameter formatter with improved escape handling (https://github.com/apache/logging-log4j2/issues/1626[1626])
* The MongoDb4 appender now supports long values to configure `collectionSize` (https://github.com/apache/logging-log4j2/issues/1747[1747])
* Mark `JdkMapAdapterStringMap` as frozen if map is immutable. (https://github.com/apache/logging-log4j2/issues/2098[2098])
* Prevents ClassCastException when trying to assign a SimpleLoggerContext to a core LoggerContext (https://issues.apache.org/jira/browse/LOG4J2-1921[LOG4J2-1921])
(logging-log4j2) 01/02: LOG4J2-2850
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0c5f364503c8e2d80838b0457f087474bbfcfb03
Author: Sandeep Barnwal <sa...@gmail.com>
AuthorDate: Sun Nov 8 15:12:05 2020 +0100
LOG4J2-2850
LOG4J2-2850 : LocalizedMessageFactory creates new message with baseName as messagePattern
(cherry picked from commit c94d5d0f30efa3af341543260635cfdcccdf3f92)
---
.../java/org/apache/logging/log4j/message/LocalizedMessageFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
index bb67efd04e..aea9c1333c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
@@ -68,7 +68,7 @@ public class LocalizedMessageFactory implements MessageFactory {
@Override
public Message newMessage(final String key) {
if (resourceBundle == null) {
- return new LocalizedMessage(baseName, key);
+ return new LocalizedMessage(baseName, key, null);
}
return new LocalizedMessage(resourceBundle, key);
}