You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/05/16 14:38:07 UTC

[camel] 03/03: (chores) camel-support: cleanup code duplications

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit bba65f2cb2fb92b7b566f17baf25ed42c41f8c98
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue May 16 15:19:19 2023 +0200

    (chores) camel-support: cleanup code duplications
---
 .../org/apache/camel/support/MessageHelper.java    | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index b45106f8eb6..e76322ff8f7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -179,14 +179,7 @@ public final class MessageHelper {
      * @see            org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
      */
     public static String extractValueForLogging(Object value, Message message) {
-        boolean streams = false;
-        if (message.getExchange() != null) {
-            String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
-            if (globalOption != null) {
-                streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
-                        globalOption);
-            }
-        }
+        boolean streams = isStreams(message);
 
         // default to 1000 chars
         int maxChars = 1000;
@@ -201,6 +194,18 @@ public final class MessageHelper {
         return extractValueForLogging(value, message, streams, false, maxChars);
     }
 
+    private static boolean isStreams(Message message) {
+        boolean streams = false;
+        if (message.getExchange() != null) {
+            String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
+            if (globalOption != null) {
+                streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
+                        globalOption);
+            }
+        }
+        return streams;
+    }
+
     /**
      * Extracts the body for logging purpose.
      * <p/>
@@ -213,14 +218,7 @@ public final class MessageHelper {
      * @see            org.apache.camel.Exchange#LOG_DEBUG_BODY_MAX_CHARS
      */
     public static String extractBodyForLogging(Message message, String prepend) {
-        boolean streams = false;
-        if (message.getExchange() != null) {
-            String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
-            if (globalOption != null) {
-                streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(),
-                        globalOption);
-            }
-        }
+        boolean streams = isStreams(message);
         return extractBodyForLogging(message, prepend, streams, false);
     }