Skip to content

Commit b9722ee

Browse files
committed
Make set methods in ReusableParameterizedMessage protected
1 parent 0c5f364 commit b9722ee

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,34 +152,35 @@ private static Throwable determineThrowable(final Object[] args, final int argCo
152152
return null;
153153
}
154154

155-
ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) {
155+
protected ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) {
156156
init(messagePattern, arguments == null ? 0 : arguments.length, arguments);
157157
varargs = arguments;
158158
return this;
159159
}
160160

161-
ReusableParameterizedMessage set(final String messagePattern, final Object p0) {
161+
protected ReusableParameterizedMessage set(final String messagePattern, final Object p0) {
162162
params[0] = p0;
163163
init(messagePattern, 1, params);
164164
return this;
165165
}
166166

167-
ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1) {
167+
protected ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1) {
168168
params[0] = p0;
169169
params[1] = p1;
170170
init(messagePattern, 2, params);
171171
return this;
172172
}
173173

174-
ReusableParameterizedMessage set(final String messagePattern, final Object p0, final Object p1, final Object p2) {
174+
protected ReusableParameterizedMessage set(
175+
final String messagePattern, final Object p0, final Object p1, final Object p2) {
175176
params[0] = p0;
176177
params[1] = p1;
177178
params[2] = p2;
178179
init(messagePattern, 3, params);
179180
return this;
180181
}
181182

182-
ReusableParameterizedMessage set(
183+
protected ReusableParameterizedMessage set(
183184
final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3) {
184185
params[0] = p0;
185186
params[1] = p1;
@@ -189,7 +190,7 @@ ReusableParameterizedMessage set(
189190
return this;
190191
}
191192

192-
ReusableParameterizedMessage set(
193+
protected ReusableParameterizedMessage set(
193194
final String messagePattern,
194195
final Object p0,
195196
final Object p1,
@@ -205,7 +206,7 @@ ReusableParameterizedMessage set(
205206
return this;
206207
}
207208

208-
ReusableParameterizedMessage set(
209+
protected ReusableParameterizedMessage set(
209210
final String messagePattern,
210211
final Object p0,
211212
final Object p1,
@@ -223,7 +224,7 @@ ReusableParameterizedMessage set(
223224
return this;
224225
}
225226

226-
ReusableParameterizedMessage set(
227+
protected ReusableParameterizedMessage set(
227228
final String messagePattern,
228229
final Object p0,
229230
final Object p1,
@@ -243,7 +244,7 @@ ReusableParameterizedMessage set(
243244
return this;
244245
}
245246

246-
ReusableParameterizedMessage set(
247+
protected ReusableParameterizedMessage set(
247248
final String messagePattern,
248249
final Object p0,
249250
final Object p1,
@@ -265,7 +266,7 @@ ReusableParameterizedMessage set(
265266
return this;
266267
}
267268

268-
ReusableParameterizedMessage set(
269+
protected ReusableParameterizedMessage set(
269270
final String messagePattern,
270271
final Object p0,
271272
final Object p1,
@@ -289,7 +290,7 @@ ReusableParameterizedMessage set(
289290
return this;
290291
}
291292

292-
ReusableParameterizedMessage set(
293+
protected ReusableParameterizedMessage set(
293294
final String messagePattern,
294295
final Object p0,
295296
final Object p1,

src/site/_release-notes/_3.x.x.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ This release contains...
3030
[#release-notes-3-x-x-changed]
3131
=== Changed
3232
33+
* 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])
3334
* Split off YAML configuration into a new `log4j-config-yaml` module.
3435
* Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2102[2102])
3536
* Update `com.google.guava:guava` to version `33.0.0-jre` (https://github.com/apache/logging-log4j2/pull/2108[2108])
3637
3738
[#release-notes-3-x-x-fixed]
3839
=== Fixed
3940
41+
* Rewrote message parameter formatter with improved escape handling (https://github.com/apache/logging-log4j2/issues/1626[1626])
4042
* The MongoDb4 appender now supports long values to configure `collectionSize` (https://github.com/apache/logging-log4j2/issues/1747[1747])
4143
* Mark `JdkMapAdapterStringMap` as frozen if map is immutable. (https://github.com/apache/logging-log4j2/issues/2098[2098])
4244
* Prevents ClassCastException when trying to assign a SimpleLoggerContext to a core LoggerContext (https://issues.apache.org/jira/browse/LOG4J2-1921[LOG4J2-1921])

0 commit comments

Comments
 (0)