From 5256f3628c553081e674f7b27e93a97350141715 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 2 Sep 2022 11:32:16 +0300 Subject: [PATCH] Properly make MessageFormatter and FormattingTuple public (#12763) Motivation: _Taken from #12761_ Classes `io.netty.util.internal.logging.FormattingTuple` and `io.netty.util.internal.logging.MessageFormatter` are public classes, but the latters's format methods are package-private while the former's constructor is package-private making their use in custom in InternalLoggerFactory implementations impossible. Modification: Make necessary methods public Result: Fixes #12761. --- .../io/netty/util/internal/logging/FormattingTuple.java | 2 +- .../io/netty/util/internal/logging/MessageFormatter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/io/netty/util/internal/logging/FormattingTuple.java b/common/src/main/java/io/netty/util/internal/logging/FormattingTuple.java index c18a3a3b2ca..95a554c96b0 100644 --- a/common/src/main/java/io/netty/util/internal/logging/FormattingTuple.java +++ b/common/src/main/java/io/netty/util/internal/logging/FormattingTuple.java @@ -47,7 +47,7 @@ public final class FormattingTuple { private final String message; private final Throwable throwable; - FormattingTuple(String message, Throwable throwable) { + public FormattingTuple(String message, Throwable throwable) { this.message = message; this.throwable = throwable; } diff --git a/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java index 4301c3adea6..9bfa1251bcd 100644 --- a/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java +++ b/common/src/main/java/io/netty/util/internal/logging/MessageFormatter.java @@ -129,7 +129,7 @@ public final class MessageFormatter { * @param arg The argument to be substituted in place of the formatting anchor * @return The formatted message */ - static FormattingTuple format(String messagePattern, Object arg) { + public static FormattingTuple format(String messagePattern, Object arg) { return arrayFormat(messagePattern, new Object[]{arg}); } @@ -152,7 +152,7 @@ static FormattingTuple format(String messagePattern, Object arg) { * anchor * @return The formatted message */ - static FormattingTuple format(final String messagePattern, + public static FormattingTuple format(final String messagePattern, Object argA, Object argB) { return arrayFormat(messagePattern, new Object[]{argA, argB}); } @@ -167,7 +167,7 @@ static FormattingTuple format(final String messagePattern, * anchors * @return The formatted message */ - static FormattingTuple arrayFormat(final String messagePattern, + public static FormattingTuple arrayFormat(final String messagePattern, final Object[] argArray) { if (argArray == null || argArray.length == 0) { return new FormattingTuple(messagePattern, null);