improvements for CAMEL-619 to avoid showing null nodeID and to show t…

…he body java class too

git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@671914 13f79535-47bb-0310-9956-ffa450edef68

camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java

@@ -18,6 +18,7 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.spi.UnitOfWork;
 
 /**
@@ -30,6 +31,7 @@ public class TraceFormatter {
     private boolean showProperties = true;
     private boolean showHeaders = true;
     private boolean showBody = true;
+    private boolean showBodyType = true;
 
     public Object format(TraceInterceptor interceptor, Exchange exchange) {
         Message in = exchange.getIn();
@@ -41,6 +43,7 @@ public Object format(TraceInterceptor interceptor, Exchange exchange) {
                 + (showExchangeId ? " Id: " + exchange.getExchangeId() : "")
                 + (showProperties ? " Properties:" + exchange.getProperties() : "")
                 + (showHeaders ? " Headers:" + in.getHeaders() : "")
+                + (showBodyType ? " BodyType:" + ObjectHelper.className(in.getBody()) : "")
                 + (showBody ? " Body:" + getBodyAsString(in) : "")
                 + (exception != null ? " Exception: " + exception : "");
     }
@@ -53,6 +56,14 @@ public void setShowBody(boolean showBody) {
         this.showBody = showBody;
     }
 
+    public boolean isShowBodyType() {
+        return showBodyType;
+    }
+
+    public void setShowBodyType(boolean showBodyType) {
+        this.showBodyType = showBodyType;
+    }
+
     public boolean isShowBreadCrumb() {
         return showBreadCrumb;
     }
@@ -109,7 +120,7 @@ protected Object getBodyAsString(Message in) {
     }
 
     protected String getNodeMessage(TraceInterceptor interceptor) {
-        return interceptor.getNode().getId();
+        return interceptor.getNode().idOrCreate();
     }
 
 }