Repository: camel Updated Branches: refs/heads/master 1d20e3314 -> 32354c1fb
Revert "CAMEL-9539: toString of Exchange/Message should only output id" This reverts commit 66a2a34700fdcf0031f14aa4ddb094a852c47ef4. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32354c1f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32354c1f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32354c1f Branch: refs/heads/master Commit: 32354c1fb2d987e1e9fcdfb68178c81ffbc72d82 Parents: 2cabc80b Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jan 27 14:30:33 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jan 27 14:30:56 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/DefaultExchange.java | 3 +-- .../src/main/java/org/apache/camel/impl/DefaultMessage.java | 5 +++++ .../src/main/java/org/apache/camel/impl/MessageSupport.java | 7 ------- 3 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32354c1f/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java index 00b8f00..58aa50b 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java @@ -80,8 +80,7 @@ public final class DefaultExchange implements Exchange { @Override public String toString() { - // do not output details from message body/headers etc as it may contain sensitive data - return String.format("Exchange[%s]", exchangeId == null ? "" : exchangeId); + return String.format("Exchange[%s][%s]", exchangeId == null ? "" : exchangeId, out == null ? in : out); } public Exchange copy() { http://git-wip-us.apache.org/repos/asf/camel/blob/32354c1f/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java index 2ed3276..24ba1ec 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java @@ -42,6 +42,11 @@ public class DefaultMessage extends MessageSupport { private Map<String, Object> headers; private Map<String, DataHandler> attachments; + @Override + public String toString() { + return MessageHelper.extractBodyForLogging(this); + } + public boolean isFault() { return fault; } http://git-wip-us.apache.org/repos/asf/camel/blob/32354c1f/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java index 747859d..369196c 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java +++ b/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java @@ -223,11 +223,4 @@ public abstract class MessageSupport implements Message { } return uuid; } - - @Override - public String toString() { - // do not output details from message body/headers etc as it may contain sensitive data - return String.format("Message[%s]", messageId == null ? "" : messageId); - } - }
