[camel] branch master updated: add missing attributes in RedeliveryPolicyFactoryBean

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5d968e3  add missing attributes in RedeliveryPolicyFactoryBean
5d968e3 is described below

commit 5d968e3e088f528b1f701b81a2440be71e5cab6d
Author: Thibaut Robert <th...@worldline.com>
AuthorDate: Tue Feb 20 14:49:53 2018 +0100

    add missing attributes in RedeliveryPolicyFactoryBean
---
 .../apache/camel/processor/RedeliveryPolicy.java   |  1 +
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  | 31 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
index 8b835f2..24c05c9 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
@@ -50,6 +50,7 @@ import org.slf4j.LoggerFactory;
  *   <li>logHandled = false</li>
  *   <li>logExhausted = true</li>
  *   <li>logExhaustedMessageHistory = true</li>
+ *   <li>logExhaustedMessageBody = false</li>
  *   <li>logNewException = true</li>
  *   <li>allowRedeliveryWhileStopping = true</li>
  * </ul>
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
index 4431dc6..3ff146c 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
@@ -79,6 +79,9 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
     @Metadata(defaultValue = "false", description = "Sets whether errors should be logged even if its handled")
     private String logHandled;
     @XmlAttribute
+    @Metadata(defaultValue = "true", description = "Sets whether errors should be logged when a new exception occurred during handling a previous exception")
+    private String logNewException;
+    @XmlAttribute
     @Metadata(defaultValue = "false", description = "Sets whether errors should be logged even if its continued")
     private String logContinued;
     @XmlAttribute
@@ -88,6 +91,9 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
     @Metadata(defaultValue = "false", description = "Sets whether to log exhausted errors including message history")
     private String logExhaustedMessageHistory;
     @XmlAttribute
+    @Metadata(defaultValue = "false", description = "Sets whether exhausted message body/headers should be logged with message history included")
+    private String logExhaustedMessageBody;
+    @XmlAttribute
     @Metadata(defaultValue = "false", description = "Disables redelivery by setting maximum redeliveries to 0.")
     private String disableRedelivery;
     @XmlAttribute
@@ -146,6 +152,9 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
         if (logHandled != null) {
             answer.setLogHandled(CamelContextHelper.parseBoolean(context, logHandled));
         }
+        if (logNewException != null) {
+            answer.setLogNewException(CamelContextHelper.parseBoolean(context, logNewException));
+        }
         if (logContinued != null) {
             answer.setLogContinued(CamelContextHelper.parseBoolean(context, logContinued));
         }
@@ -158,6 +167,9 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
         if (logExhaustedMessageHistory != null) {
             answer.setLogExhaustedMessageHistory(CamelContextHelper.parseBoolean(context, logExhaustedMessageHistory));
         }
+        if (logExhaustedMessageBody != null) {
+            answer.setLogExhaustedMessageBody(CamelContextHelper.parseBoolean(context, logExhaustedMessageBody));
+        }
         if (disableRedelivery != null) {
             if (CamelContextHelper.parseBoolean(context, disableRedelivery)) {
                 answer.setMaximumRedeliveries(0);
@@ -292,6 +304,14 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
         this.logHandled = logHandled;
     }
 
+    public String getLogNewException() {
+        return logNewException;
+    }
+
+    public void setLogNewException(String logNewException) {
+        this.logNewException = logNewException;
+    }
+
     public String getLogContinued() {
         return logContinued;
     }
@@ -316,10 +336,21 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
         this.logExhaustedMessageHistory = logExhaustedMessageHistory;
     }
 
+    public String getLogExhaustedMessageBody() {
+        return logExhaustedMessageBody;
+    }
+
+    public void setLogExhaustedMessageBody(String logExhaustedMessageBody) {
+        this.logExhaustedMessageBody = logExhaustedMessageBody;
+    }
+
     public String getDisableRedelivery() {
         return disableRedelivery;
     }
 
+    /**
+     * Disables redelivery (same as setting maximum redeliveries to 0)
+     */
     public void setDisableRedelivery(String disableRedelivery) {
         this.disableRedelivery = disableRedelivery;
     }

-- 
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.