svn commit: r686459 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/model/ExceptionType.java main/java/org/apache/camel/model/RedeliveryPolicyType.java test/java/org/apache/camel/builder/ExceptionBuilderTest.java

[da...@apache.org]

Author: davsclaus
Date: Sat Aug 16 00:40:12 2008
New Revision: 686459

URL: http://svn.apache.org/viewvc?rev=686459&view=rev
Log:
CAMEL-821: Added missing option maximumRedeliveryDelay to exception type

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=686459&r1=686458&r2=686459&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Sat Aug 16 00:40:12 2008
@@ -44,10 +44,6 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ExceptionType extends ProcessorType<ProcessorType> {
 
-/*
-    @XmlElementRef
-    private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
     @XmlElement(name = "exception")
     private List<String> exceptions = new ArrayList<String>();
     @XmlElement(name = "redeliveryPolicy", required = false)
@@ -145,6 +141,10 @@
         return this;
     }
 
+    public ExceptionType maximumRedeliveryDelay(long maximumRedeliveryDelay) {
+        getOrCreateRedeliveryPolicy().maximumRedeliveryDelay(maximumRedeliveryDelay);
+        return this;
+    }
 
     // Properties
     //-------------------------------------------------------------------------

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java?rev=686459&r1=686458&r2=686459&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java Sat Aug 16 00:40:12 2008
@@ -36,6 +36,7 @@
     private Boolean useExponentialBackOff;
     private Double collisionAvoidanceFactor;
     private Boolean useCollisionAvoidance;
+    private Long maximumRedeliveryDelay;
 
     public RedeliveryPolicy createRedeliveryPolicy(RedeliveryPolicy parentPolicy) {
         RedeliveryPolicy answer =  parentPolicy.copy();
@@ -59,11 +60,14 @@
         if (useCollisionAvoidance != null) {
             answer.setUseCollisionAvoidance(useCollisionAvoidance);
         }
+        if (maximumRedeliveryDelay != null) {
+            answer.setMaximumRedeliveryDelay(maximumRedeliveryDelay);
+        }
         return answer;
     }
 
     public String toString() {
-        return "RedeliveryPolicy[maxRedeliveries: " + maximumRedeliveries + "]";
+        return "RedeliveryPolicy[maximumRedeliveries: " + maximumRedeliveries + "]";
     }
 
     // Fluent API
@@ -103,6 +107,11 @@
         return this;
     }
 
+    public RedeliveryPolicyType maximumRedeliveryDelay(long maximumRedeliveryDelay) {
+        setMaximumRedeliveryDelay(maximumRedeliveryDelay);
+        return this;
+    }
+
     // Properties
     //-------------------------------------------------------------------------
 
@@ -153,4 +162,12 @@
     public void setUseExponentialBackOff(Boolean useExponentialBackOff) {
         this.useExponentialBackOff = useExponentialBackOff;
     }
+
+    public Long getMaximumRedeliveryDelay() {
+        return maximumRedeliveryDelay;
+    }
+
+    public void setMaximumRedeliveryDelay(Long maximumRedeliveryDelay) {
+        this.maximumRedeliveryDelay = maximumRedeliveryDelay;
+    }
 }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=686459&r1=686458&r2=686459&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java Sat Aug 16 00:40:12 2008
@@ -107,6 +107,7 @@
                 exception(IOException.class)
                     .initialRedeliveryDelay(5000L)
                     .maximumRedeliveries(3)
+                    .maximumRedeliveryDelay(30000L)
                     .backOffMultiplier(1.0)
                     .useExponentialBackOff()
                     .setHeader(MESSAGE_INFO, constant("Damm somekind of IO exception"))