Adapt ReusableMessage to be used in 3.x

Author: ppkarwasz

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

@@ -18,6 +18,7 @@
 
 import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.apache.logging.log4j.util.StringBuilderFormattable;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Messages implementing this interface are reused between logging calls.
@@ -29,6 +30,7 @@
  * @since 2.6
  */
 @PerformanceSensitive("allocation")
+@ProviderType
 public interface ReusableMessage extends Message, StringBuilderFormattable {
 
     /**
@@ -69,4 +71,10 @@ public interface ReusableMessage extends Message, StringBuilderFormattable {
      * @return an immutable snapshot of this message
      */
     Message memento();
+
+    /**
+     * Resets the object to a clean state.
+     * @since 2.24.0
+     */
+    void clear();
 }

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

@@ -135,34 +135,35 @@ private static Throwable determineThrowable(final Object[] args, final int argCo
         return null;
     }
 
-    ReusableParameterizedMessage set(final String messagePattern, final Object... arguments) {
+    public 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) {
+    public 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) {
+    public 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) {
+    public ReusableParameterizedMessage set(
+            final String messagePattern, final Object p0, final Object p1, final Object p2) {
         params[0] = p0;
         params[1] = p1;
         params[2] = p2;
         init(messagePattern, 3, params);
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern, final Object p0, final Object p1, final Object p2, final Object p3) {
         params[0] = p0;
         params[1] = p1;
@@ -172,7 +173,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,
@@ -188,7 +189,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,
@@ -206,7 +207,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,
@@ -226,7 +227,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,
@@ -248,7 +249,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,
@@ -272,7 +273,7 @@ ReusableParameterizedMessage set(
         return this;
     }
 
-    ReusableParameterizedMessage set(
+    public ReusableParameterizedMessage set(
             final String messagePattern,
             final Object p0,
             final Object p1,

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

@@ -22,7 +22,7 @@
 /**
  * Bumped to 2.22.0, since FormattedMessage behavior changed.
  */
-@Version("2.22.0")
+@Version("2.24.0")
 package org.apache.logging.log4j.message;
 
 import org.osgi.annotation.bundle.Export;