Author: akarpe Date: Fri Oct 15 15:53:01 2010 New Revision: 1022977 URL: http://svn.apache.org/viewvc?rev=1022977&view=rev Log: CAMEL-3197 Added support for Spring Unit tests
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java 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=1022977&r1=1022976&r2=1022977&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 Fri Oct 15 15:53:01 2010 @@ -17,10 +17,13 @@ package org.apache.camel.model.loadbalancer; import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; @@ -37,11 +40,11 @@ import org.apache.camel.spi.RouteContext @XmlAccessorType(XmlAccessType.FIELD) public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition { - @XmlElement(name = "roundRobin", required = true) - private boolean roundRobin; + @XmlAttribute(name = "roundRobin", required = false) + private Boolean roundRobin = Boolean.FALSE; - @XmlElement(name = "distributionRatios", required = true) - private ArrayList<Integer> distributionRatioList; + @XmlAttribute(name = "distributionRatio", required = true) + private List<Integer> distributionRatioList = new ArrayList<Integer>(); @Override protected LoadBalancer createLoadBalancer(RouteContext routeContext) { @@ -59,19 +62,19 @@ public class WeightedLoadBalancerDefinit return loadBalancer; } - public boolean isRoundRobin() { + public Boolean isRoundRobin() { return roundRobin; } - public void setRoundRobin(boolean roundRobin) { + public void setRoundRobin(Boolean roundRobin) { this.roundRobin = roundRobin; } - public ArrayList<Integer> getDistributionRatioList() { + public List<Integer> getDistributionRatioList() { return distributionRatioList; } - public void setDistributionRatioList(ArrayList<Integer> distributionRatioList) { + public void setDistributionRatioList(List<Integer> distributionRatioList) { this.distributionRatioList = distributionRatioList; } Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java?rev=1022977&r1=1022976&r2=1022977&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java Fri Oct 15 15:53:01 2010 @@ -25,21 +25,21 @@ import org.apache.commons.logging.LogFac public abstract class WeightedLoadBalancer extends QueueLoadBalancer { private static final transient Log LOG = LogFactory.getLog(WeightedLoadBalancer.class); - private ArrayList<Integer> distributionRatioList = new ArrayList<Integer>(); + private List<Integer> distributionRatioList = new ArrayList<Integer>(); private ArrayList<DistributionRatio> runtimeRatios = new ArrayList<DistributionRatio>(); - public WeightedLoadBalancer(ArrayList<Integer> distributionRatios) { + public WeightedLoadBalancer(List<Integer> distributionRatios) { deepCloneDistributionRatios(distributionRatios); loadRuntimeRatios(distributionRatios); } - protected void deepCloneDistributionRatios(ArrayList<Integer> distributionRatios) { + protected void deepCloneDistributionRatios(List<Integer> distributionRatios) { for (Integer value : distributionRatios) { this.distributionRatioList.add(value); } } - protected void loadRuntimeRatios(ArrayList<Integer> distributionRatios) { + protected void loadRuntimeRatios(List<Integer> distributionRatios) { int position = 0; for (Integer value : distributionRatios) { @@ -82,11 +82,11 @@ public abstract class WeightedLoadBalanc } } - public ArrayList<Integer> getDistributionRatioList() { + public List<Integer> getDistributionRatioList() { return distributionRatioList; } - public void setDistributionRatioList(ArrayList<Integer> distributionRatioList) { + public void setDistributionRatioList(List<Integer> distributionRatioList) { this.distributionRatioList = distributionRatioList; } Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java?rev=1022977&r1=1022976&r2=1022977&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java Fri Oct 15 15:53:01 2010 @@ -16,7 +16,6 @@ */ package org.apache.camel.processor.loadbalancer; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -26,8 +25,8 @@ import org.apache.camel.Processor; public class WeightedRandomLoadBalancer extends WeightedLoadBalancer { private int randomCounter; - public WeightedRandomLoadBalancer(ArrayList<Integer> distributionRatios) { - super(distributionRatios); + public WeightedRandomLoadBalancer(List<Integer> distributionRatioList) { + super(distributionRatioList); } /* (non-Javadoc) Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java?rev=1022977&r1=1022976&r2=1022977&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java Fri Oct 15 15:53:01 2010 @@ -16,7 +16,6 @@ */ package org.apache.camel.processor.loadbalancer; -import java.util.ArrayList; import java.util.List; import org.apache.camel.Exchange; @@ -25,7 +24,7 @@ import org.apache.camel.Processor; public class WeightedRoundRobinLoadBalancer extends WeightedLoadBalancer { private int counter; - public WeightedRoundRobinLoadBalancer(ArrayList<Integer> distributionRatios) { + public WeightedRoundRobinLoadBalancer(List<Integer> distributionRatios) { super(distributionRatios); }