Author: jstrachan
Date: Wed Feb 9 16:55:34 2011
New Revision: 1068971
URL: http://svn.apache.org/viewvc?rev=1068971&view=rev
Log:
removed a bunch more default JAXB default values so that by default we only
marshal attributes which are actually configured by hand. this avoids the XML
representation of the model being unnecessarily verbose
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
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=1068971&r1=1068970&r2=1068971&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
Wed Feb 9 16:55:34 2011
@@ -46,9 +46,9 @@ import org.apache.camel.util.concurrent.
public class OnCompletionDefinition extends
ProcessorDefinition<OnCompletionDefinition> implements
ExecutorServiceAwareDefinition<OnCompletionDefinition> {
@XmlAttribute(required = false)
- private Boolean onCompleteOnly = Boolean.FALSE;
+ private Boolean onCompleteOnly;
@XmlAttribute(required = false)
- private Boolean onFailureOnly = Boolean.FALSE;
+ private Boolean onFailureOnly;
@XmlElement(name = "onWhen", required = false)
private WhenDefinition onWhen;
@XmlElementRef
@@ -85,7 +85,7 @@ public class OnCompletionDefinition exte
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
- if (onCompleteOnly && onFailureOnly) {
+ if (isOnCompleteOnly() && isOnFailureOnly()) {
throw new IllegalArgumentException("Both onCompleteOnly and
onFailureOnly cannot be true. Only one of them can be true. On node: " + this);
}
@@ -106,7 +106,7 @@ public class OnCompletionDefinition exte
// should be false by default
boolean original = getUseOriginalMessagePolicy() != null ?
getUseOriginalMessagePolicy() : false;
OnCompletionProcessor answer = new
OnCompletionProcessor(routeContext.getCamelContext(), childProcessor,
- executorService, onCompleteOnly, onFailureOnly, when,
original);
+ executorService, isOnCompleteOnly(), isOnFailureOnly(), when,
original);
return answer;
}
@@ -141,7 +141,7 @@ public class OnCompletionDefinition exte
* @return the builder
*/
public OnCompletionDefinition onCompleteOnly() {
- if (onFailureOnly) {
+ if (isOnFailureOnly()) {
throw new IllegalArgumentException("Both onCompleteOnly and
onFailureOnly cannot be true. Only one of them can be true. On node: " + this);
}
// must define return type as OutputDefinition and not this type to
avoid end user being able
@@ -157,7 +157,7 @@ public class OnCompletionDefinition exte
* @return the builder
*/
public OnCompletionDefinition onFailureOnly() {
- if (onCompleteOnly) {
+ if (isOnCompleteOnly()) {
throw new IllegalArgumentException("Both onCompleteOnly and
onFailureOnly cannot be true. Only one of them can be true. On node: " + this);
}
// must define return type as OutputDefinition and not this type to
avoid end user being able
@@ -225,6 +225,10 @@ public class OnCompletionDefinition exte
this.outputs = outputs;
}
+ public boolean isOnCompleteOnly() {
+ return onCompleteOnly != null && onCompleteOnly.booleanValue();
+ }
+
public Boolean getOnCompleteOnly() {
return onCompleteOnly;
}
@@ -233,6 +237,10 @@ public class OnCompletionDefinition exte
this.onCompleteOnly = onCompleteOnly;
}
+ public boolean isOnFailureOnly() {
+ return onFailureOnly != null && onFailureOnly.booleanValue();
+ }
+
public Boolean getOnFailureOnly() {
return onFailureOnly;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
Wed Feb 9 16:55:34 2011
@@ -281,7 +281,7 @@ public class ResequenceDefinition extend
Processor processor = this.createChildProcessor(routeContext, true);
Resequencer resequencer = new
Resequencer(routeContext.getCamelContext(), processor,
resolveExpressionList(routeContext),
- config.getAllowDuplicates(), config.getReverse());
+ config.isAllowDuplicates(), config.isReverse());
resequencer.setBatchSize(config.getBatchSize());
resequencer.setBatchTimeout(config.getBatchTimeout());
return resequencer;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
Wed Feb 9 16:55:34 2011
@@ -52,7 +52,7 @@ public class SplitDefinition extends Exp
@XmlAttribute(required = false)
private String executorServiceRef;
@XmlAttribute(required = false)
- private Boolean streaming = false;
+ private Boolean streaming;
@XmlAttribute(required = false)
private Boolean stopOnException;
@XmlAttribute(required = false)
@@ -235,7 +235,11 @@ public class SplitDefinition extends Exp
return streaming != null ? streaming : false;
}
- public void setStreaming(boolean streaming) {
+ public Boolean getStreaming() {
+ return streaming;
+ }
+
+ public void setStreaming(Boolean streaming) {
this.streaming = streaming;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
Wed Feb 9 16:55:34 2011
@@ -63,10 +63,10 @@ public class BatchResequencerConfig {
private Long batchTimeout; // optional XML attribute requires wrapper
object
@XmlAttribute
- private Boolean allowDuplicates = Boolean.FALSE;
+ private Boolean allowDuplicates;
@XmlAttribute
- private Boolean reverse = Boolean.FALSE;
+ private Boolean reverse;
/**
* Creates a new {@link BatchResequencerConfig} instance using default
@@ -118,6 +118,10 @@ public class BatchResequencerConfig {
this.batchTimeout = batchTimeout;
}
+ public boolean isAllowDuplicates() {
+ return allowDuplicates != null && allowDuplicates.booleanValue();
+ }
+
public Boolean getAllowDuplicates() {
return allowDuplicates;
}
@@ -126,6 +130,10 @@ public class BatchResequencerConfig {
this.allowDuplicates = allowDuplicates;
}
+ public boolean isReverse() {
+ return reverse != null && reverse.booleanValue();
+ }
+
public Boolean getReverse() {
return reverse;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
Wed Feb 9 16:55:34 2011
@@ -36,7 +36,7 @@ public class CastorDataFormat extends Da
@XmlAttribute(required = false)
private String mappingFile;
@XmlAttribute(required = false)
- private Boolean validation = Boolean.TRUE;
+ private Boolean validation;
@XmlAttribute(required = false)
private String encoding;
@XmlAttribute(required = false)
@@ -48,7 +48,12 @@ public class CastorDataFormat extends Da
super("castor");
}
- public Boolean isValidation() {
+ public boolean isValidation() {
+ // defaults to true if not configured
+ return validation == null || validation.booleanValue();
+ }
+
+ public Boolean getValidation() {
return validation;
}
@@ -93,9 +98,8 @@ public class CastorDataFormat extends Da
if (mappingFile != null) {
setProperty(dataFormat, "mappingFile", mappingFile);
}
- if (validation != null) {
- setProperty(dataFormat, "validation", validation);
- }
+ setProperty(dataFormat, "validation", isValidation());
+
if (encoding != null) {
setProperty(dataFormat, "encoding", encoding);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
Wed Feb 9 16:55:34 2011
@@ -34,13 +34,18 @@ import org.apache.camel.spi.DataFormat;
public class HL7DataFormat extends DataFormatDefinition {
@XmlAttribute(required = false)
- private Boolean validate = Boolean.TRUE;
+ private Boolean validate;
public HL7DataFormat() {
super("hl7");
}
- public Boolean isValidate() {
+ public boolean isValidate() {
+ // defaults to true if not configured
+ return validate == null || validate.booleanValue();
+ }
+
+ public Boolean getValidate() {
return validate;
}
@@ -50,9 +55,7 @@ public class HL7DataFormat extends DataF
@Override
protected void configureDataFormat(DataFormat dataFormat) {
- if (validate != null) {
- setProperty(dataFormat, "validate", validate);
- }
+ setProperty(dataFormat, "validate", isValidate());
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
Wed Feb 9 16:55:34 2011
@@ -39,7 +39,7 @@ public class FailoverLoadBalancerDefinit
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlAttribute
- private Boolean roundRobin = Boolean.FALSE;
+ private Boolean roundRobin;
@XmlAttribute
private Integer maximumFailoverAttempts;
@@ -64,8 +64,8 @@ public class FailoverLoadBalancerDefinit
if (getMaximumFailoverAttempts() != null) {
answer.setMaximumFailoverAttempts(getMaximumFailoverAttempts());
}
- if (isRoundRobin() != null) {
- answer.setRoundRobin(isRoundRobin());
+ if (roundRobin != null) {
+ answer.setRoundRobin(roundRobin);
}
return answer;
@@ -79,7 +79,11 @@ public class FailoverLoadBalancerDefinit
this.exceptions = exceptions;
}
- public Boolean isRoundRobin() {
+ public boolean isRoundRobin() {
+ return roundRobin != null && roundRobin.booleanValue();
+ }
+
+ public Boolean getRoundRobin() {
return roundRobin;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java?rev=1068971&r1=1068970&r2=1068971&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
Wed Feb 9 16:55:34 2011
@@ -41,7 +41,7 @@ import org.apache.camel.spi.RouteContext
public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
@XmlAttribute(name = "roundRobin", required = false)
- private Boolean roundRobin = Boolean.FALSE;
+ private Boolean roundRobin;
@XmlAttribute(name = "distributionRatio", required = true)
private String distributionRatio;
@@ -64,7 +64,7 @@ public class WeightedLoadBalancerDefinit
distributionRatioList.add(new Integer(ratio.trim()));
}
- if (!roundRobin) {
+ if (!isRoundRobin()) {
loadBalancer = new
WeightedRandomLoadBalancer(distributionRatioList);
} else {
loadBalancer = new
WeightedRoundRobinLoadBalancer(distributionRatioList);
@@ -75,7 +75,11 @@ public class WeightedLoadBalancerDefinit
return loadBalancer;
}
- public Boolean isRoundRobin() {
+ public boolean isRoundRobin() {
+ return roundRobin != null && roundRobin.booleanValue();
+ }
+
+ public Boolean getRoundRobin() {
return roundRobin;
}
@@ -93,7 +97,7 @@ public class WeightedLoadBalancerDefinit
@Override
public String toString() {
- if (!roundRobin) {
+ if (!isRoundRobin()) {
return "WeightedRandomLoadBalancer[" + distributionRatio + "]";
} else {
return "WeightedRoundRobinLoadBalancer[" + distributionRatio + "]";
