Repository: camel Updated Branches: refs/heads/camel-2.14.x 329666bd1 -> a47daab68
Fix Camel-7501 Only one ZooKeeperRoutePolicy possible Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a47daab6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a47daab6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a47daab6 Branch: refs/heads/camel-2.14.x Commit: a47daab680fb3daa153f82d87e044816ded2f001 Parents: 329666b Author: Andrea Cosentino <anco...@gmail.com> Authored: Sat May 2 14:09:15 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sat May 2 17:13:02 2015 +0200 ---------------------------------------------------------------------- .../zookeeper/policy/ZooKeeperElection.java | 2 +- ...ZookeeperDoubleRouteAndDoublePolicyTest.java | 57 ++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a47daab6/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java index 3fb3eb1..79e6a19 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java @@ -219,7 +219,7 @@ public class ZooKeeperElection { * status changes. This will require enhancing the consumer to allow * custom operation lists. */ - from(zep).id("election-route-" + candidateName.substring(0, 8)).sort(body(), comparator).process(new Processor() { + from(zep).id("election-route-" + candidateName).sort(body(), comparator).process(new Processor() { @Override public void process(Exchange e) throws Exception { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/camel/blob/a47daab6/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperDoubleRouteAndDoublePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperDoubleRouteAndDoublePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperDoubleRouteAndDoublePolicyTest.java new file mode 100644 index 0000000..0cdb180 --- /dev/null +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperDoubleRouteAndDoublePolicyTest.java @@ -0,0 +1,57 @@ +/** + * 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.component.zookeeper.policy; + +import java.util.concurrent.TimeUnit; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.zookeeper.ZooKeeperTestSupport; +import org.junit.Test; + +public class ZookeeperDoubleRouteAndDoublePolicyTest extends ZooKeeperTestSupport { + + @Test + public void routeDoublePoliciesAndTwoRoutes() throws Exception { + // set up the parent used to control the election + client.createPersistent("/someapp", "App node to contain policy election nodes..."); + client.createPersistent("/someapp/somepolicy", "Policy node used by route policy to control routes..."); + client.createPersistent("/someapp/someotherpolicy", "Policy node used by route policy to control routes..."); + context.addRoutes(new ZooKeeperPolicyEnforcedRoute()); + + MockEndpoint mockedpolicy = getMockEndpoint("mock:controlled"); + mockedpolicy.setExpectedMessageCount(1); + sendBody("direct:policy-controlled", "This is a test"); + mockedpolicy.await(5, TimeUnit.SECONDS); + mockedpolicy.assertIsSatisfied(); + + MockEndpoint mockedpolicy1 = getMockEndpoint("mock:controlled-1"); + mockedpolicy1.setExpectedMessageCount(1); + sendBody("direct:policy-controlled-1", "This is a test"); + mockedpolicy1.await(5, TimeUnit.SECONDS); + mockedpolicy1.assertIsSatisfied(); + } + + public static class ZooKeeperPolicyEnforcedRoute extends RouteBuilder { + public void configure() throws Exception { + ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zookeeper:localhost:" + getServerPort() + "/someapp/somepolicy", 1); + from("direct:policy-controlled").routePolicy(policy).to("mock:controlled"); + ZooKeeperRoutePolicy policy2 = new ZooKeeperRoutePolicy("zookeeper:localhost:" + getServerPort() + "/someapp/someotherpolicy", 1); + from("direct:policy-controlled-1").routePolicy(policy2).to("mock:controlled-1"); + } + }; +}
