You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/09/10 09:50:30 UTC
svn commit: r1382676 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/processor/ compon...
Author: davsclaus
Date: Mon Sep 10 07:50:29 2012
New Revision: 1382676
URL: http://svn.apache.org/viewvc?rev=1382676&view=rev
Log:
CAMEL-3364: Renamed option to better reflect its purpose
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java Mon Sep 10 07:50:29 2012
@@ -169,11 +169,11 @@ public class DefaultErrorHandlerBuilder
/**
* Controls whether to allow redelivery while stopping/shutting down a route that uses error handling.
*
- * @param redeliverWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
+ * @param allowRedeliveryWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
* @return the builder
*/
- public DefaultErrorHandlerBuilder redeliverWhileStopping(boolean redeliverWhileStopping) {
- getRedeliveryPolicy().setRedeliverWhileStopping(redeliverWhileStopping);
+ public DefaultErrorHandlerBuilder allowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) {
+ getRedeliveryPolicy().setAllowRedeliveryWhileStopping(allowRedeliveryWhileStopping);
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java Mon Sep 10 07:50:29 2012
@@ -72,7 +72,7 @@ public class RedeliveryPolicyDefinition
@XmlAttribute
private String delayPattern;
@XmlAttribute
- private String redeliverWhileStopping;
+ private String allowRedeliveryWhileStopping;
public RedeliveryPolicy createRedeliveryPolicy(CamelContext context, RedeliveryPolicy parentPolicy) {
@@ -144,8 +144,8 @@ public class RedeliveryPolicyDefinition
if (delayPattern != null) {
answer.setDelayPattern(delayPattern);
}
- if (redeliverWhileStopping != null) {
- answer.setRedeliverWhileStopping(CamelContextHelper.parseBoolean(context, redeliverWhileStopping));
+ if (allowRedeliveryWhileStopping != null) {
+ answer.setAllowRedeliveryWhileStopping(CamelContextHelper.parseBoolean(context, allowRedeliveryWhileStopping));
}
} catch (Exception e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
@@ -164,6 +164,8 @@ public class RedeliveryPolicyDefinition
/**
* Allow synchronous delayed redelivery.
+ *
+ * @return the builder
*/
public RedeliveryPolicyDefinition asyncDelayedRedelivery() {
setAsyncDelayedRedelivery("true");
@@ -171,17 +173,23 @@ public class RedeliveryPolicyDefinition
}
/**
- * Allow synchronous delayed redelivery.
+ * Controls whether to allow redelivery while stopping/shutting down a route that uses error handling.
+ *
+ * @param allowRedeliveryWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
+ * @return the builder
*/
- public RedeliveryPolicyDefinition redeliverWhileStopping(boolean redeliverWhileStopping) {
- return redeliverWhileStopping(Boolean.toString(redeliverWhileStopping));
+ public RedeliveryPolicyDefinition allowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) {
+ return allowRedeliveryWhileStopping(Boolean.toString(allowRedeliveryWhileStopping));
}
/**
- * Allow synchronous delayed redelivery.
+ * Controls whether to allow redelivery while stopping/shutting down a route that uses error handling.
+ *
+ * @param allowRedeliveryWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
+ * @return the builder
*/
- public RedeliveryPolicyDefinition redeliverWhileStopping(String redeliverWhileStopping) {
- setRedeliverWhileStopping(redeliverWhileStopping);
+ public RedeliveryPolicyDefinition allowRedeliveryWhileStopping(String allowRedeliveryWhileStopping) {
+ setAllowRedeliveryWhileStopping(allowRedeliveryWhileStopping);
return this;
}
@@ -661,11 +669,11 @@ public class RedeliveryPolicyDefinition
this.delayPattern = delayPattern;
}
- public String getRedeliverWhileStopping() {
- return redeliverWhileStopping;
+ public String getAllowRedeliveryWhileStopping() {
+ return allowRedeliveryWhileStopping;
}
- public void setRedeliverWhileStopping(String redeliverWhileStopping) {
- this.redeliverWhileStopping = redeliverWhileStopping;
+ public void setAllowRedeliveryWhileStopping(String allowRedeliveryWhileStopping) {
+ this.allowRedeliveryWhileStopping = allowRedeliveryWhileStopping;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java Mon Sep 10 07:50:29 2012
@@ -87,8 +87,6 @@ public abstract class RedeliveryErrorHan
Predicate handledPredicate = getDefaultHandledPredicate();
Predicate continuedPredicate;
boolean useOriginalInMessage = useOriginalMessagePolicy;
- boolean asyncDelayedRedelivery = redeliveryPolicy.isAsyncDelayedRedelivery();
- boolean redeliverWhileStopping = redeliveryPolicy.isRedeliverWhileStopping();
}
/**
@@ -212,7 +210,7 @@ public abstract class RedeliveryErrorHan
// redelivery policy can control if redelivery is allowed during stopping/shutdown
// but this only applies during a redelivery (counter must > 0)
if (data.redeliveryCounter > 0) {
- if (data.redeliverWhileStopping) {
+ if (data.currentRedeliveryPolicy.allowRedeliveryWhileStopping) {
log.trace("isRunAllowed() -> true (Run allowed as RedeliverWhileStopping is enabled)");
return true;
} else if (preparingShutdown) {
@@ -672,7 +670,6 @@ public abstract class RedeliveryErrorHan
data.continuedPredicate = exceptionPolicy.getContinuedPolicy();
data.retryWhilePredicate = exceptionPolicy.getRetryWhilePolicy();
data.useOriginalInMessage = exceptionPolicy.isUseOriginalMessage();
- data.asyncDelayedRedelivery = exceptionPolicy.isAsyncDelayedRedelivery(exchange.getContext());
// route specific failure handler?
Processor processor = null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Mon Sep 10 07:50:29 2012
@@ -96,7 +96,7 @@ public class RedeliveryPolicy implements
protected boolean logRetryAttempted = true;
protected String delayPattern;
protected boolean asyncDelayedRedelivery;
- protected boolean redeliverWhileStopping = true;
+ protected boolean allowRedeliveryWhileStopping = true;
public RedeliveryPolicy() {
}
@@ -107,7 +107,7 @@ public class RedeliveryPolicy implements
+ ", redeliveryDelay=" + redeliveryDelay
+ ", maximumRedeliveryDelay=" + maximumRedeliveryDelay
+ ", asyncDelayedRedelivery=" + asyncDelayedRedelivery
- + ", redeliverWhileStopping=" + redeliverWhileStopping
+ + ", allowRedeliveryWhileStopping=" + allowRedeliveryWhileStopping
+ ", retriesExhaustedLogLevel=" + retriesExhaustedLogLevel
+ ", retryAttemptedLogLevel=" + retryAttemptedLogLevel
+ ", logRetryAttempted=" + logRetryAttempted
@@ -410,8 +410,8 @@ public class RedeliveryPolicy implements
*
* @param redeliverWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
*/
- public RedeliveryPolicy redeliverWhileStopping(boolean redeliverWhileStopping) {
- setRedeliverWhileStopping(redeliverWhileStopping);
+ public RedeliveryPolicy allowRedeliveryWhileStopping(boolean redeliverWhileStopping) {
+ setAllowRedeliveryWhileStopping(redeliverWhileStopping);
return this;
}
@@ -660,17 +660,17 @@ public class RedeliveryPolicy implements
this.asyncDelayedRedelivery = asyncDelayedRedelivery;
}
- public boolean isRedeliverWhileStopping() {
- return redeliverWhileStopping;
+ public boolean isAllowRedeliveryWhileStopping() {
+ return allowRedeliveryWhileStopping;
}
/**
* Controls whether to allow redelivery while stopping/shutting down a route that uses error handling.
*
- * @param redeliverWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
+ * @param allowRedeliveryWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
*/
- public void setRedeliverWhileStopping(boolean redeliverWhileStopping) {
- this.redeliverWhileStopping = redeliverWhileStopping;
+ public void setAllowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) {
+ this.allowRedeliveryWhileStopping = allowRedeliveryWhileStopping;
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java Mon Sep 10 07:50:29 2012
@@ -51,7 +51,7 @@ public class RedeliveryErrorHandlerNoRed
// this error handler will try up till 20 redelivery attempts with 1 second between.
// however if we are stopping then do not allow any redeliver attempts.
errorHandler(defaultErrorHandler()
- .redeliverWhileStopping(false)
+ .allowRedeliveryWhileStopping(false)
.maximumRedeliveries(20).redeliveryDelay(1000).retryAttemptedLogLevel(LoggingLevel.INFO));
from("seda:foo").routeId("foo")
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java Mon Sep 10 07:50:29 2012
@@ -70,7 +70,7 @@ public abstract class AbstractCamelRedel
@XmlAttribute
private String delayPattern;
@XmlAttribute
- private String redeliverWhileStopping;
+ private String allowRedeliveryWhileStopping;
public RedeliveryPolicy getObject() throws Exception {
RedeliveryPolicy answer = new RedeliveryPolicy();
@@ -135,8 +135,8 @@ public abstract class AbstractCamelRedel
if (delayPattern != null) {
answer.setDelayPattern(CamelContextHelper.parseText(context, delayPattern));
}
- if (redeliverWhileStopping != null) {
- answer.setRedeliverWhileStopping(CamelContextHelper.parseBoolean(context, redeliverWhileStopping));
+ if (allowRedeliveryWhileStopping != null) {
+ answer.setAllowRedeliveryWhileStopping(CamelContextHelper.parseBoolean(context, allowRedeliveryWhileStopping));
}
return answer;
@@ -290,11 +290,11 @@ public abstract class AbstractCamelRedel
this.delayPattern = delayPattern;
}
- public String getRedeliverWhileStopping() {
- return redeliverWhileStopping;
+ public String getAllowRedeliveryWhileStopping() {
+ return allowRedeliveryWhileStopping;
}
- public void setRedeliverWhileStopping(String redeliverWhileStopping) {
- this.redeliverWhileStopping = redeliverWhileStopping;
+ public void setAllowRedeliveryWhileStopping(String allowRedeliveryWhileStopping) {
+ this.allowRedeliveryWhileStopping = allowRedeliveryWhileStopping;
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml?rev=1382676&r1=1382675&r2=1382676&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringRedeliveryErrorHandlerNoRedeliveryOnShutdownTest.xml Mon Sep 10 07:50:29 2012
@@ -34,7 +34,7 @@
<!-- configure error handler, to redeliver up till 10 times, with 1 sec delay
and if we are stopping then do not allow redeliveries, to stop faster -->
<errorHandler id="myErrorHandler" type="DefaultErrorHandler">
- <redeliveryPolicy maximumRedeliveries="20" redeliveryDelay="1000" redeliverWhileStopping="false" retryAttemptedLogLevel="INFO"/>
+ <redeliveryPolicy maximumRedeliveries="20" redeliveryDelay="1000" allowRedeliveryWhileStopping="false" retryAttemptedLogLevel="INFO"/>
</errorHandler>
<route id="foo">