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 2010/10/12 20:04:06 UTC
svn commit: r1021867 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/converter/jaxp/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
components/camel-scala/src/main/scala/org/apache/cam...
Author: davsclaus
Date: Tue Oct 12 18:04:06 2010
New Revision: 1021867
URL: http://svn.apache.org/viewvc?rev=1021867&view=rev
Log:
CAMEL-3222: Definition models dont set default value in attribute to avoid outputting in XML when JAXB marshalling. This reduces the noise in the XML.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Tue Oct 12 18:04:06 2010
@@ -679,7 +679,7 @@ public class XmlConverter {
// else, create a new doc and copy the element inside it
} else {
Document doc = createDocument();
- // import node must no occur concurrent on the same node (must be its owner)
+ // import node must not occur concurrent on the same node (must be its owner)
// so we need to synchronize on it
synchronized (node.getOwnerDocument()) {
doc.appendChild(doc.importNode(node, true));
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Tue Oct 12 18:04:06 2010
@@ -49,7 +49,7 @@ public class DelayDefinition extends Exp
@XmlAttribute
private Boolean asyncDelayed;
@XmlAttribute
- private Boolean callerRunsWhenRejected = Boolean.TRUE;
+ private Boolean callerRunsWhenRejected;
public DelayDefinition() {
}
@@ -90,7 +90,10 @@ public class DelayDefinition extends Exp
if (getAsyncDelayed() != null) {
answer.setAsyncDelayed(getAsyncDelayed());
}
- if (getCallerRunsWhenRejected() != null) {
+ if (getCallerRunsWhenRejected() == null) {
+ // should be default true
+ answer.setCallerRunsWhenRejected(true);
+ } else {
answer.setCallerRunsWhenRejected(getCallerRunsWhenRejected());
}
return answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java Tue Oct 12 18:04:06 2010
@@ -36,8 +36,9 @@ import org.apache.camel.spi.RouteContext
public class DynamicRouterDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode {
public static final String DEFAULT_DELIMITER = ",";
+
@XmlAttribute
- private String uriDelimiter = DEFAULT_DELIMITER;
+ private String uriDelimiter;
@XmlAttribute
private Boolean ignoreInvalidEndpoints;
@@ -66,8 +67,9 @@ public class DynamicRouterDefinition<Typ
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Expression expression = getExpression().createExpression(routeContext);
+ String delimiter = getUriDelimiter() != null ? getUriDelimiter() : DEFAULT_DELIMITER;
- DynamicRouter dynamicRouter = new DynamicRouter(routeContext.getCamelContext(), expression, getUriDelimiter());
+ DynamicRouter dynamicRouter = new DynamicRouter(routeContext.getCamelContext(), expression, delimiter);
if (getIgnoreInvalidEndpoint() != null) {
dynamicRouter.setIgnoreInvalidEndpoints(getIgnoreInvalidEndpoint());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java Tue Oct 12 18:04:06 2010
@@ -40,7 +40,7 @@ public class IdempotentConsumerDefinitio
@XmlAttribute
private String messageIdRepositoryRef;
@XmlAttribute
- private Boolean eager = Boolean.TRUE;
+ private Boolean eager;
@XmlTransient
private IdempotentRepository<?> idempotentRepository;
@@ -140,7 +140,9 @@ public class IdempotentConsumerDefinitio
(IdempotentRepository<String>) resolveMessageIdRepository(routeContext);
Expression expression = getExpression().createExpression(routeContext);
- return new IdempotentConsumer(expression, idempotentRepository, eager, childProcessor);
+ // should be eager by default
+ boolean isEager = isEager() != null ? isEager() : true;
+ return new IdempotentConsumer(expression, idempotentRepository, isEager, childProcessor);
}
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java Tue Oct 12 18:04:06 2010
@@ -50,7 +50,7 @@ public class InterceptSendToEndpointDefi
@XmlAttribute(required = true)
private String uri;
@XmlAttribute(required = false)
- private Boolean skipSendToOriginalEndpoint = Boolean.FALSE;
+ private Boolean skipSendToOriginalEndpoint;
public InterceptSendToEndpointDefinition() {
}
@@ -93,7 +93,8 @@ public class InterceptSendToEndpointDefi
return endpoint;
} else if (getUri() == null || EndpointHelper.matchEndpoint(uri, getUri())) {
// only proxy if the uri is matched decorate endpoint with our proxy
- boolean skip = skipSendToOriginalEndpoint != null ? skipSendToOriginalEndpoint : false;
+ // should be false by default
+ boolean skip = getSkipSendToOriginalEndpoint() != null ? getSkipSendToOriginalEndpoint() : false;
InterceptSendToEndpoint proxy = new InterceptSendToEndpoint(endpoint, skip);
proxy.setDetour(detour);
return proxy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java Tue Oct 12 18:04:06 2010
@@ -43,7 +43,7 @@ public class LogDefinition extends Proce
@XmlAttribute
private String message;
@XmlAttribute
- private LoggingLevel loggingLevel = LoggingLevel.INFO;
+ private LoggingLevel loggingLevel;
@XmlAttribute
private String logName;
@@ -81,7 +81,9 @@ public class LogDefinition extends Proce
if (name == null) {
name = routeContext.getRoute().getId();
}
- Logger logger = new Logger(name, getLoggingLevel());
+ // should be INFO by default
+ LoggingLevel level = getLoggingLevel() != null ? getLoggingLevel() : LoggingLevel.INFO;
+ Logger logger = new Logger(name, level);
return new LogProcessor(exp, logger);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Tue Oct 12 18:04:06 2010
@@ -58,7 +58,7 @@ public class OnCompletionDefinition exte
@XmlAttribute(required = false)
private String executorServiceRef;
@XmlAttribute(name = "useOriginalMessage", required = false)
- private Boolean useOriginalMessagePolicy = Boolean.FALSE;
+ private Boolean useOriginalMessagePolicy;
public OnCompletionDefinition() {
}
@@ -103,8 +103,10 @@ public class OnCompletionDefinition exte
if (executorService == null) {
executorService = routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this, "OnCompletion");
}
+ // should be false by default
+ boolean original = getUseOriginalMessagePolicy() != null ? getUseOriginalMessagePolicy() : false;
OnCompletionProcessor answer = new OnCompletionProcessor(routeContext.getCamelContext(), childProcessor,
- executorService, onCompleteOnly, onFailureOnly, when, useOriginalMessagePolicy);
+ executorService, onCompleteOnly, onFailureOnly, when, original);
return answer;
}
@@ -258,7 +260,7 @@ public class OnCompletionDefinition exte
}
public Boolean getUseOriginalMessagePolicy() {
- return useOriginalMessagePolicy;
+ return useOriginalMessagePolicy != null;
}
public void setUseOriginalMessagePolicy(Boolean useOriginalMessagePolicy) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Tue Oct 12 18:04:06 2010
@@ -69,7 +69,7 @@ public class OnExceptionDefinition exten
@XmlAttribute(name = "onRedeliveryRef", required = false)
private String onRedeliveryRef;
@XmlAttribute(name = "useOriginalMessage", required = false)
- private Boolean useOriginalMessagePolicy = Boolean.FALSE;
+ private Boolean useOriginalMessagePolicy;
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
@@ -674,6 +674,12 @@ public class OnExceptionDefinition exten
return useOriginalMessagePolicy;
}
+ @XmlTransient
+ public boolean isUseOriginalMessage() {
+ // should be false by default
+ return useOriginalMessagePolicy != null ? useOriginalMessagePolicy : false;
+ }
+
public void setUseOriginalMessagePolicy(Boolean useOriginalMessagePolicy) {
this.useOriginalMessagePolicy = useOriginalMessagePolicy;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Tue Oct 12 18:04:06 2010
@@ -81,7 +81,7 @@ public abstract class ProcessorDefinitio
protected final transient Log log = LogFactory.getLog(getClass());
protected ErrorHandlerBuilder errorHandlerBuilder;
protected String errorHandlerRef;
- protected Boolean inheritErrorHandler = Boolean.TRUE;
+ protected Boolean inheritErrorHandler;
private NodeFactory nodeFactory;
private final LinkedList<Block> blocks = new LinkedList<Block>();
private ProcessorDefinition<?> parent;
@@ -242,7 +242,8 @@ public abstract class ProcessorDefinitio
} else if (defn instanceof MulticastDefinition || defn instanceof RecipientListDefinition) {
// do not use error handler for multicast or recipient list based as it offers fine grained error handlers for its outputs
} else {
- if (inheritErrorHandler) {
+ // use error handler by default or if configured to do so
+ if (isInheritErrorHandler() == null || isInheritErrorHandler()) {
if (log.isTraceEnabled()) {
log.trace(defn + " is configured to inheritErrorHandler");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Tue Oct 12 18:04:06 2010
@@ -66,7 +66,7 @@ public class RouteDefinition extends Pro
private String trace;
private String handleFault;
private String delayer;
- private String autoStartup = "true";
+ private String autoStartup;
private Integer startupOrder;
private RoutePolicy routePolicy;
private String routePolicyRef;
@@ -554,6 +554,10 @@ public class RouteDefinition extends Pro
}
public boolean isAutoStartup(CamelContext camelContext) throws Exception {
+ if (getAutoStartup() == null) {
+ // should auto startup by default
+ return true;
+ }
Boolean isAutoStartup = CamelContextHelper.parseBoolean(camelContext, getAutoStartup());
return isAutoStartup != null && isAutoStartup;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java Tue Oct 12 18:04:06 2010
@@ -37,6 +37,7 @@ import org.apache.camel.spi.RouteContext
@XmlAccessorType(XmlAccessType.FIELD)
public class RoutingSlipDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode {
public static final String DEFAULT_DELIMITER = ",";
+
@XmlAttribute
private String uriDelimiter;
@XmlAttribute
@@ -77,7 +78,9 @@ public class RoutingSlipDefinition<Type
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Expression expression = getExpression().createExpression(routeContext);
- RoutingSlip routingSlip = new RoutingSlip(routeContext.getCamelContext(), expression, getUriDelimiter());
+ String delimiter = getUriDelimiter() != null ? getUriDelimiter() : DEFAULT_DELIMITER;
+
+ RoutingSlip routingSlip = new RoutingSlip(routeContext.getCamelContext(), expression, delimiter);
if (getIgnoreInvalidEndpoint() != null) {
routingSlip.setIgnoreInvalidEndpoints(getIgnoreInvalidEndpoint());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java Tue Oct 12 18:04:06 2010
@@ -40,11 +40,11 @@ public class SamplingDefinition extends
// use Long to let it be optional in JAXB so when using XML the default is 1 second
@XmlAttribute()
- private Long samplePeriod = 1L;
+ private Long samplePeriod;
@XmlAttribute()
@XmlJavaTypeAdapter(TimeUnitAdapter.class)
- private TimeUnit units = TimeUnit.SECONDS;
+ private TimeUnit units;
public SamplingDefinition() {
}
@@ -56,7 +56,7 @@ public class SamplingDefinition extends
@Override
public String toString() {
- return "Sample[1 Exchange per " + samplePeriod + " " + units.toString().toLowerCase() + " -> " + getOutputs() + "]";
+ return "Sample[1 Exchange per " + getSamplePeriod() + " " + getUnits().toString().toLowerCase() + " -> " + getOutputs() + "]";
}
@Override
@@ -66,13 +66,17 @@ public class SamplingDefinition extends
@Override
public String getLabel() {
- return "sample[1 Exchange per " + samplePeriod + " " + units.toString().toLowerCase() + "]";
+ return "sample[1 Exchange per " + getSamplePeriod() + " " + getUnits().toString().toLowerCase() + "]";
}
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Processor childProcessor = this.createChildProcessor(routeContext, true);
- return new SamplingThrottler(childProcessor, samplePeriod, units);
+ // should default be 1 sample period
+ long time = getSamplePeriod() != null ? getSamplePeriod() : 1L;
+ // should default be in seconds
+ TimeUnit tu = getUnits() != null ? getUnits() : TimeUnit.SECONDS;
+ return new SamplingThrottler(childProcessor, time, tu);
}
// Fluent API
@@ -103,11 +107,11 @@ public class SamplingDefinition extends
// Properties
// -------------------------------------------------------------------------
- public long getSamplePeriod() {
+ public Long getSamplePeriod() {
return samplePeriod;
}
- public void setSamplePeriod(long samplePeriod) {
+ public void setSamplePeriod(Long samplePeriod) {
this.samplePeriod = samplePeriod;
}
@@ -119,4 +123,7 @@ public class SamplingDefinition extends
this.units = units;
}
+ public TimeUnit getUnits() {
+ return units;
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java Tue Oct 12 18:04:06 2010
@@ -38,7 +38,7 @@ import org.apache.camel.spi.ThreadPoolPr
public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition implements ThreadPoolProfile {
@XmlAttribute()
- private Boolean defaultProfile = false;
+ private Boolean defaultProfile;
@XmlAttribute()
private Integer poolSize;
@XmlAttribute()
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java Tue Oct 12 18:04:06 2010
@@ -66,7 +66,7 @@ public class ThreadsDefinition extends O
@XmlAttribute
private ThreadPoolRejectedPolicy rejectedPolicy;
@XmlAttribute
- private Boolean callerRunsWhenRejected = Boolean.TRUE;
+ private Boolean callerRunsWhenRejected;
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
@@ -95,7 +95,10 @@ public class ThreadsDefinition extends O
}
ThreadsProcessor thread = new ThreadsProcessor(routeContext.getCamelContext(), executorService);
- if (getCallerRunsWhenRejected() != null) {
+ if (getCallerRunsWhenRejected() == null) {
+ // should be true by default
+ thread.setCallerRunsWhenRejected(true);
+ } else {
thread.setCallerRunsWhenRejected(getCallerRunsWhenRejected());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java Tue Oct 12 18:04:06 2010
@@ -39,16 +39,16 @@ import org.apache.camel.util.concurrent.
public class ThrottleDefinition extends OutputDefinition<ThrottleDefinition> implements ExecutorServiceAwareDefinition<ThrottleDefinition> {
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String executorServiceRef;
@XmlAttribute
private Long maximumRequestsPerPeriod;
@XmlAttribute
- private long timePeriodMillis = 1000;
+ private Long timePeriodMillis;
@XmlAttribute
private Boolean asyncDelayed;
@XmlAttribute
- private Boolean callerRunsWhenRejected = Boolean.TRUE;
+ private Boolean callerRunsWhenRejected;
public ThrottleDefinition() {
}
@@ -85,11 +85,16 @@ public class ThrottleDefinition extends
}
}
- Throttler answer = new Throttler(childProcessor, maximumRequestsPerPeriod, timePeriodMillis, scheduled);
+ // should be default 1000 millis
+ long period = getTimePeriodMillis() != null ? getTimePeriodMillis() : 1000L;
+ Throttler answer = new Throttler(childProcessor, getMaximumRequestsPerPeriod(), period, scheduled);
if (getAsyncDelayed() != null) {
answer.setAsyncDelayed(getAsyncDelayed());
}
- if (getCallerRunsWhenRejected() != null) {
+ if (getCallerRunsWhenRejected() == null) {
+ // should be true by default
+ answer.setCallerRunsWhenRejected(true);
+ } else {
answer.setCallerRunsWhenRejected(getCallerRunsWhenRejected());
}
return answer;
@@ -164,11 +169,11 @@ public class ThrottleDefinition extends
this.maximumRequestsPerPeriod = maximumRequestsPerPeriod;
}
- public long getTimePeriodMillis() {
+ public Long getTimePeriodMillis() {
return timePeriodMillis;
}
- public void setTimePeriodMillis(long timePeriodMillis) {
+ public void setTimePeriodMillis(Long timePeriodMillis) {
this.timePeriodMillis = timePeriodMillis;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java Tue Oct 12 18:04:06 2010
@@ -52,7 +52,7 @@ public class WireTapDefinition extends S
@XmlAttribute
private String executorServiceRef;
@XmlAttribute
- private Boolean copy = Boolean.TRUE;
+ private Boolean copy;
public WireTapDefinition() {
}
@@ -74,7 +74,12 @@ public class WireTapDefinition extends S
executorService = routeContext.getCamelContext().getExecutorServiceStrategy().newDefaultThreadPool(this, "WireTap");
}
WireTapProcessor answer = new WireTapProcessor(endpoint, getPattern(), executorService);
- answer.setCopy(isCopy());
+ if (isCopy() == null) {
+ // should default be true
+ answer.setCopy(true);
+ } else {
+ answer.setCopy(isCopy());
+ }
if (newExchangeProcessorRef != null) {
newExchangeProcessor = routeContext.lookup(newExchangeProcessorRef, Processor.class);
@@ -158,7 +163,7 @@ public class WireTapDefinition extends S
}
public Boolean isCopy() {
- return copy != null && copy;
+ return copy;
}
public void setCopy(Boolean copy) {
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=1021867&r1=1021866&r2=1021867&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 Tue Oct 12 18:04:06 2010
@@ -513,7 +513,7 @@ public abstract class RedeliveryErrorHan
data.handledPredicate = exceptionPolicy.getHandledPolicy();
data.continuedPredicate = exceptionPolicy.getContinuedPolicy();
data.retryWhilePredicate = exceptionPolicy.getRetryWhilePolicy();
- data.useOriginalInMessage = exceptionPolicy.getUseOriginalMessagePolicy();
+ data.useOriginalInMessage = exceptionPolicy.isUseOriginalMessage();
data.asyncDelayedRedelivery = exceptionPolicy.isAsyncDelayedRedelivery();
// route specific failure handler?
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala?rev=1021867&r1=1021866&r2=1021867&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala Tue Oct 12 18:04:06 2010
@@ -27,7 +27,7 @@ case class SThrottleDefinition(override
/**
* Time period in milliseconds
*/
- def per(period: Int) = {
+ def per(period: Long) = {
target.setTimePeriodMillis(period)
this
}
@@ -36,13 +36,13 @@ case class SThrottleDefinition(override
def milliseconds = ms
def sec = {
- valueInMs *= 1000
+ valueInMs = valueInMs.longValue * 1000
this
}
def seconds = sec
def min = {
- valueInMs *= (60 * 1000)
+ valueInMs = valueInMs.longValue * (60 * 1000)
this
}
def minutes = min