This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 0298e47 Fixed CS for Camel-Zookeeper 0298e47 is described below commit 0298e47361c3de29d2160f706be784bf2db390e2 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Jan 28 14:48:11 2019 +0100 Fixed CS for Camel-Zookeeper --- .../org/apache/camel/component/zookeeper/ZooKeeperComponent.java | 2 +- .../org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java | 2 +- .../zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java index 272b1bb..014e2b1 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.camel.CamelException; import org.apache.camel.Endpoint; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.spi.Metadata; /** * Component that creates {@link ZooKeeperEndpoint}s for interacting with a ZooKeeper cluster. diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java index f45198f..efef69d 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java @@ -24,9 +24,9 @@ import org.apache.camel.Producer; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.support.DefaultEndpoint; /** * The zookeeper component allows interaction with a ZooKeeper cluster. diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java index 4f4250e..587be5e 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/MultiMasterCuratorLeaderRoutePolicyTest.java @@ -272,8 +272,10 @@ public class MultiMasterCuratorLeaderRoutePolicyTest extends ZooKeeperTestSuppor first.shutdown(); // let's find out who's active now: - CuratorMultiMasterLeaderRoutePolicy routePolicySecond = (CuratorMultiMasterLeaderRoutePolicy) arr[0].controlledContext.adapt(ModelCamelContext.class).getRouteDefinition(secondDestination).getRoutePolicies().get(0); - CuratorMultiMasterLeaderRoutePolicy routePolicyThird = (CuratorMultiMasterLeaderRoutePolicy) arr[1].controlledContext.adapt(ModelCamelContext.class).getRouteDefinition(thirdDestination).getRoutePolicies().get(0); + CuratorMultiMasterLeaderRoutePolicy routePolicySecond = (CuratorMultiMasterLeaderRoutePolicy) arr[0].controlledContext.adapt(ModelCamelContext.class) + .getRouteDefinition(secondDestination).getRoutePolicies().get(0); + CuratorMultiMasterLeaderRoutePolicy routePolicyThird = (CuratorMultiMasterLeaderRoutePolicy) arr[1].controlledContext.adapt(ModelCamelContext.class) + .getRouteDefinition(thirdDestination).getRoutePolicies().get(0); MultiMasterZookeeperPolicyEnforcedContext newMaster = null; MultiMasterZookeeperPolicyEnforcedContext slave = null;