You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/14 12:57:39 UTC
svn commit: r594843 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/model/
main/java/org/apache/camel/processor/loadbalancer/
main/resources/org/apache/camel/model/ test/java/org/apache/camel/processor/
Author: jstrachan
Date: Wed Nov 14 03:57:36 2007
New Revision: 594843
URL: http://svn.apache.org/viewvc?rev=594843&view=rev
Log:
applied patch from Willem with thanks for https://issues.apache.org/activemq/browse/CAMEL-215
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (with props)
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java (with props)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=594843&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java Wed Nov 14 03:57:36 2007
@@ -0,0 +1,125 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
+import org.apache.camel.impl.RouteContext;
+import org.apache.camel.processor.ChoiceProcessor;
+import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
+import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
+import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
+import org.apache.camel.util.CollectionStringBuffer;
+
+@XmlRootElement(name = "loadBalance")
+@XmlAccessorType(XmlAccessType.NONE)
+public class LoadBalanceType extends OutputType<LoadBalanceType> {
+
+ // how to define it in XML
+ private LoadBalancer loadBalancer;
+
+
+ protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType<?>> outputs)
+ throws Exception {
+ assert loadBalancer != null;
+ for (ProcessorType processorType : outputs) {
+ //The outputs should be the SendProcessor
+ SendProcessor processor =(SendProcessor) processorType.createProcessor(routeContext);
+
+ loadBalancer.addProcessor(processor);
+ }
+ return loadBalancer;
+ }
+
+ // when this method will be called
+ @Override
+ public Processor createProcessor(RouteContext routeContext) throws Exception {
+ assert loadBalancer != null;
+ for (ProcessorType processorType : getOutputs()) {
+ //The outputs should be the SendProcessor
+ SendProcessor processor =(SendProcessor) processorType.createProcessor(routeContext);
+
+ loadBalancer.addProcessor(processor);
+ }
+
+ return loadBalancer;
+ }
+
+ // Fluent API
+ // -------------------------------------------------------------------------
+ public LoadBalanceType setLoadBalancer(LoadBalancer loadBalancer) {
+ this.loadBalancer = loadBalancer;
+ return this;
+ }
+
+ public LoadBalanceType roundRobin() {
+ loadBalancer = new RoundRobinLoadBalancer();
+ return this;
+ }
+
+ public LoadBalanceType random() {
+ loadBalancer = new RoundRobinLoadBalancer();
+ return this;
+ }
+
+ public LoadBalanceType sticky(Expression<Exchange> correlationExpression) {
+ loadBalancer = new StickyLoadBalancer(correlationExpression);
+ return this;
+ }
+
+ public LoadBalanceType topic() {
+ loadBalancer = new TopicLoadBalancer();
+ return this;
+ }
+
+
+ @Override
+ public String getLabel() {
+ CollectionStringBuffer buffer = new CollectionStringBuffer();
+ List<ProcessorType<?>> list = getOutputs();
+ for (ProcessorType<?> processorType : list) {
+ buffer.append(processorType.getLabel());
+ }
+ return buffer.toString();
+ }
+
+ @Override
+ public String toString() {
+ return "LoadBanlance[ " + getOutputs() + "]";
+ }
+
+
+
+
+
+}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=594843&r1=594842&r2=594843&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Wed Nov 14 03:57:36 2007
@@ -294,7 +294,14 @@
public FilterType filter(String language, String expression) {
return filter(new LanguageExpression(language, expression));
}
-
+
+ public LoadBalanceType loadBalance() {
+ LoadBalanceType answer = new LoadBalanceType();
+ answer.setParent(this);
+ addOutput(answer);
+ return answer;
+ }
+
/**
* Creates a choice of one or more predicates with an otherwise clause
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java?rev=594843&r1=594842&r2=594843&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java Wed Nov 14 03:57:36 2007
@@ -20,13 +20,15 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.camel.Processor;
+import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.util.ServiceHelper;
/**
* A default base class for a {@link LoadBalancer} implementation
*
* @version $Revision: 1.1 $
*/
-public abstract class LoadBalancerSupport implements LoadBalancer {
+public abstract class LoadBalancerSupport extends ServiceSupport implements LoadBalancer {
private List<Processor> processors = new CopyOnWriteArrayList<Processor>();
public void addProcessor(Processor processor) {
@@ -39,5 +41,13 @@
public List<Processor> getProcessors() {
return processors;
+ }
+
+ protected void doStart() throws Exception {
+ ServiceHelper.startServices(processors);
+ }
+
+ protected void doStop() throws Exception {
+ ServiceHelper.stopServices(processors);
}
}
Modified: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?rev=594843&r1=594842&r2=594843&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index Wed Nov 14 03:57:36 2007
@@ -27,6 +27,7 @@
IdempotentConsumerType
InterceptType
InterceptorRef
+LoadBalanceType
MarshalType
MulticastType
OtherwiseType
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java?rev=594843&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java Wed Nov 14 03:57:36 2007
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+public class LoadBalanceTest extends ContextTestSupport {
+ protected MockEndpoint x;
+ protected MockEndpoint y;
+ protected MockEndpoint z;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ x = getMockEndpoint("mock:x");
+ y = getMockEndpoint("mock:y");
+ z = getMockEndpoint("mock:z");
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").loadBalance().
+ roundRobin().to("mock:x", "mock:y", "mock:z");
+ };
+ };
+ }
+
+ public void testRoundRobin() throws Exception {
+ String body = "<one/>";
+ x.expectedBodiesReceived(body);
+ expectsMessageCount(0, y, z);
+ sendMessage("bar", body);
+ assertMockEndpointsSatisifed();
+
+ body = "<two/>";
+ y.expectedBodiesReceived(body);
+ expectsMessageCount(0, x, z);
+ sendMessage("bar", body);
+ assertMockEndpointsSatisifed();
+
+ body = "<three/>";
+ z.expectedBodiesReceived(body);
+ expectsMessageCount(0, x, y);
+ sendMessage("bar", body);
+ assertMockEndpointsSatisifed();
+
+ }
+
+ protected void sendMessage(final Object headerValue, final Object body) throws Exception {
+ template.sendBodyAndHeader("direct:start", body, "foo", headerValue);
+ }
+
+
+}
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native