You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/02/15 18:38:13 UTC

logging-log4j2 git commit: Remove method org.apache.logging.log4j.Logger.traceExit(Supplier, R), it is redundant with org.apache.logging.log4j.Logger.traceExit(MessageSupplier, R)

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 01efb530e -> 9a15ee4bf


Remove method org.apache.logging.log4j.Logger.traceExit(Supplier<?
extends Message>, R), it is redundant with
org.apache.logging.log4j.Logger.traceExit(MessageSupplier, R)

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9a15ee4b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9a15ee4b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9a15ee4b

Branch: refs/heads/master
Commit: 9a15ee4bfcc36338b2f618ab37ca94f90ec40353
Parents: 01efb53
Author: ggregory <gg...@apache.org>
Authored: Mon Feb 15 09:38:11 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Mon Feb 15 09:38:11 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/Logger.java   | 21 --------------------
 .../logging/log4j/spi/AbstractLogger.java       | 13 ------------
 2 files changed, 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a15ee4b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
index 5095cd5..b9b4bfa 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
@@ -1883,27 +1883,6 @@ public interface Logger {
     <R> R traceExit(MessageSupplier messageSupplier, R result);
 
     /**
-     * Logs exiting from a method with the result. Used when construction of the Message might be
-     * expensive. This may be coded as:
-     *
-     * <pre>
-     * return LOGGER.traceExit(
-     *     () -> new ParameterizedMessage(
-     *            "MyResult: field1: {}, field2: {}", 
-     *            myResult.field1.toString(), myResult.field2.toString()),
-     *     myResult);
-     * </pre>
-     * @param supplier The supplier of the Message.
-     * @param result The result being returned from the method call.
-     *
-     * @param <R> The type of the parameter and object being returned.
-     * @return the result.
-     * 
-     * @since 2.6
-     */
-    <R> R traceExit(Supplier<? extends Message> supplier, R result);
-
-    /**
      * Logs exiting from a method with no result. Allows custom formatting of the result. This may be coded as:
      *
      * <pre>

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a15ee4b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index f605ae7..f539a25 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -1373,19 +1373,6 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
-    public <R> R traceExit(final Supplier<? extends Message> messageSupplier, final R result) {
-        if (isEnabled(Level.TRACE, EXIT_MARKER, messageSupplier, null)) {
-            logMessage(FQCN, Level.TRACE, EXIT_MARKER, new MessageSupplier() {
-                @Override
-                public Message get() {
-                    return messageFactory.newExitMessage(result, messageSupplier.get());
-                };
-            }, null);
-        }
-        return result;
-    }
-
-    @Override
     public void traceExit(final EntryMessage message) {
         if (isEnabled(Level.TRACE, EXIT_MARKER, message, null)) {
             logMessage(FQCN, Level.TRACE, EXIT_MARKER, new MessageSupplier() {