Repository: logging-log4j2 Updated Branches: refs/heads/master 186370a41 -> f128b4425
Allow message factories to be customized with the entry and exit strings used in flow logging. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f128b442 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f128b442 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f128b442 Branch: refs/heads/master Commit: f128b44253f4d1a4fd827e2369f86d6d47a0a3f8 Parents: 186370a Author: ggregory <[email protected]> Authored: Sat Feb 13 15:33:26 2016 -0800 Committer: ggregory <[email protected]> Committed: Sat Feb 13 15:33:26 2016 -0800 ---------------------------------------------------------------------- .../log4j/message/FormattedMessageFactory.java | 17 ++++++++++++++ .../log4j/message/LocalizedMessageFactory.java | 24 ++++++++++++++++++++ .../message/MessageFormatMessageFactory.java | 17 ++++++++++++++ .../message/ParameterizedMessageFactory.java | 17 ++++++++++++++ .../ParameterizedNoReferenceMessageFactory.java | 17 ++++++++++++++ .../message/StringFormatterMessageFactory.java | 17 ++++++++++++++ 6 files changed, 109 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java index 3f213d5..48f75d2 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java @@ -22,6 +22,23 @@ package org.apache.logging.log4j.message; */ public class FormattedMessageFactory extends AbstractMessageFactory { + /** + * Constructs a message factory with default flow strings. + */ + public FormattedMessageFactory() { + super(); + } + + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public FormattedMessageFactory(final String entryText, final String exitText) { + super(entryText, exitText); + } + private static final long serialVersionUID = 1L; /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java ---------------------------------------------------------------------- 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 bdb1ba8..47fa516 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 @@ -35,12 +35,36 @@ public class LocalizedMessageFactory extends AbstractMessageFactory { this.baseName = null; } + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public LocalizedMessageFactory(final ResourceBundle resourceBundle, final String entryText, final String exitText) { + super(entryText, exitText); + this.resourceBundle = resourceBundle; + this.baseName = null; + } + public LocalizedMessageFactory(final String baseName) { this.resourceBundle = null; this.baseName = baseName; } /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public LocalizedMessageFactory(final String baseName, final String entryText, final String exitText) { + super(entryText, exitText); + this.resourceBundle = null; + this.baseName = baseName; + } + + /** * Gets the resource bundle base name if set. * * @return the resource bundle base name if set. May be null. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java index 8f462f0..bf13113 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java @@ -22,6 +22,23 @@ package org.apache.logging.log4j.message; */ public class MessageFormatMessageFactory extends AbstractMessageFactory { + /** + * Constructs a message factory with default flow strings. + */ + public MessageFormatMessageFactory() { + super(); + } + + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public MessageFormatMessageFactory(final String entryText, final String exitText) { + super(entryText, exitText); + } + private static final long serialVersionUID = 1L; /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java index 5e97145..186554d 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java @@ -28,6 +28,23 @@ package org.apache.logging.log4j.message; public final class ParameterizedMessageFactory extends AbstractMessageFactory { /** + * Constructs a message factory with default flow strings. + */ + public ParameterizedMessageFactory() { + super(); + } + + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public ParameterizedMessageFactory(final String entryText, final String exitText) { + super(entryText, exitText); + } + + /** * Instance of StringFormatterMessageFactory. */ public static final ParameterizedMessageFactory INSTANCE = new ParameterizedMessageFactory(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java index 3ffef91..9d03ef8 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java @@ -32,6 +32,23 @@ import org.apache.logging.log4j.status.StatusLogger; public final class ParameterizedNoReferenceMessageFactory extends AbstractMessageFactory { /** + * Constructs a message factory with default flow strings. + */ + public ParameterizedNoReferenceMessageFactory() { + super(); + } + + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public ParameterizedNoReferenceMessageFactory(final String entryText, final String exitText) { + super(entryText, exitText); + } + + /** * Instance of ParameterizedStatusMessageFactory. */ public static final ParameterizedNoReferenceMessageFactory INSTANCE = new ParameterizedNoReferenceMessageFactory(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f128b442/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java index 8acc5d6..cb9b6ed 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java @@ -28,6 +28,23 @@ package org.apache.logging.log4j.message; public final class StringFormatterMessageFactory extends AbstractMessageFactory { /** + * Constructs a message factory with default flow strings. + */ + public StringFormatterMessageFactory() { + super(); + } + + /** + * Constructs a message factory with the given entry and exit strings. + * @param entryText the text to use for trace entry, like {@code "entry"} or {@code "Enter"}. + * @param exitText the text to use for trace exit, like {@code "exit"} or {@code "Exit"}. + * @since 2.6 + */ + public StringFormatterMessageFactory(final String entryText, final String exitText) { + super(entryText, exitText); + } + + /** * Instance of StringFormatterMessageFactory. */ public static final StringFormatterMessageFactory INSTANCE = new StringFormatterMessageFactory();
