This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8125c3494c0f0ce4df3aa27d09d16c66313d2512 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Mon Oct 8 14:27:10 2018 +0200 Move some cluster classes to o.a.c.support.cluster --- .../apache/camel/component/file/cluster/FileLockClusterView.java | 2 +- .../org/apache/camel/impl/cluster/ClusteredRouteController.java | 4 ++-- .../java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java | 4 ++-- .../apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java | 2 +- .../org/apache/camel/management/mbean/ManagedClusterService.java | 2 +- .../camel/{impl => support}/cluster/AbstractCamelClusterView.java | 2 +- .../org/apache/camel/support}/cluster/ClusterServiceHelper.java | 3 ++- .../apache/camel/support}/cluster/ClusterServiceSelectors.java | 8 +++++--- .../org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java | 7 ++++--- .../org/apache/camel/impl/cluster/ClusterServiceViewTest.java | 1 + .../apache/camel/component/atomix/cluster/AtomixClusterView.java | 2 +- .../apache/camel/component/consul/cluster/ConsulClusterView.java | 2 +- .../camel/component/jgroups/cluster/JGroupsLockClusterView.java | 2 +- .../camel/component/kubernetes/cluster/KubernetesClusterView.java | 2 +- .../java/org/apache/camel/component/master/MasterComponent.java | 4 ++-- .../camel/component/zookeeper/cluster/ZooKeeperClusterView.java | 2 +- 16 files changed, 27 insertions(+), 22 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java index 5a3128d..c49332b 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java @@ -31,7 +31,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.apache.camel.cluster.CamelClusterMember; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.IOHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java index 332a4fe..1e2b040 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java @@ -35,13 +35,13 @@ import org.apache.camel.NamedNode; import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.cluster.ClusterServiceSelectors; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.impl.DefaultRouteController; import org.apache.camel.meta.Experimental; import org.apache.camel.model.RouteDefinition; import org.apache.camel.spi.RoutePolicy; import org.apache.camel.spi.RoutePolicyFactory; -import org.apache.camel.cluster.ClusterServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceHelper; import org.apache.camel.support.ServiceHelper; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java index 57330bb..3c2f134 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java @@ -36,13 +36,13 @@ import org.apache.camel.cluster.CamelClusterEventListener; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.cluster.CamelClusterView; -import org.apache.camel.cluster.ClusterServiceSelectors; import org.apache.camel.model.RouteDefinition; -import org.apache.camel.cluster.ClusterServiceHelper; import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent; import org.apache.camel.support.EventNotifierSupport; import org.apache.camel.support.RoutePolicySupport; +import org.apache.camel.support.cluster.ClusterServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ReferenceCount; diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java index ff058a2..ffa7828 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.NamedNode; import org.apache.camel.RuntimeCamelException; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.cluster.ClusterServiceSelectors; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.spi.RoutePolicy; import org.apache.camel.spi.RoutePolicyFactory; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java index 52b8cb5..9839de5 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java @@ -25,7 +25,7 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.StatefulService; import org.apache.camel.api.management.mbean.ManagedClusterServiceMBean; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.cluster.ClusterServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceHelper; import org.apache.camel.spi.ManagementStrategy; public class ManagedClusterService implements ManagedClusterServiceMBean { diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java b/camel-core/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java similarity index 99% rename from camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java rename to camel-core/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java index 92faa38..ccb730e 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java +++ b/camel-core/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterView.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.impl.cluster; +package org.apache.camel.support.cluster; import java.util.ArrayList; import java.util.List; diff --git a/camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceHelper.java b/camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceHelper.java similarity index 95% rename from camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceHelper.java rename to camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceHelper.java index 1571e0f..1cb34c5 100644 --- a/camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceHelper.java +++ b/camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceHelper.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.cluster; +package org.apache.camel.support.cluster; import java.util.Optional; import java.util.Set; import org.apache.camel.CamelContext; +import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.util.ObjectHelper; public final class ClusterServiceHelper { diff --git a/camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceSelectors.java b/camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceSelectors.java similarity index 94% rename from camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceSelectors.java rename to camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceSelectors.java index 485f648..65d6bc4 100644 --- a/camel-api/src/main/java/org/apache/camel/cluster/ClusterServiceSelectors.java +++ b/camel-core/src/main/java/org/apache/camel/support/cluster/ClusterServiceSelectors.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.cluster; +package org.apache.camel.support.cluster; import java.util.Collection; import java.util.Comparator; @@ -23,18 +23,20 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import org.apache.camel.cluster.CamelClusterService; +import org.apache.camel.cluster.CamelClusterService.Selector; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public final class ClusterServiceSelectors { - public static final CamelClusterService.Selector DEFAULT_SELECTOR = new SelectSingle(); + public static final Selector DEFAULT_SELECTOR = new SelectSingle(); private static final Logger LOGGER = LoggerFactory.getLogger(ClusterServiceSelectors.class); private ClusterServiceSelectors() { } - public static final class SelectSingle implements CamelClusterService.Selector { + public static final class SelectSingle implements Selector { @Override public Optional<CamelClusterService> select(Collection<CamelClusterService> services) { if (services != null && services.size() == 1) { diff --git a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java index d0897da..ac6f902 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java @@ -24,14 +24,15 @@ import org.apache.camel.CamelContext; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.cluster.CamelClusterView; -import org.apache.camel.cluster.ClusterServiceSelectors; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.component.file.cluster.FileLockClusterService; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.junit.Assert; import org.junit.Test; -import static org.apache.camel.cluster.ClusterServiceHelper.lookupService; -import static org.apache.camel.cluster.ClusterServiceHelper.mandatoryLookupService; +import static org.apache.camel.support.cluster.ClusterServiceHelper.lookupService; +import static org.apache.camel.support.cluster.ClusterServiceHelper.mandatoryLookupService; public class ClusterServiceSelectorTest { diff --git a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java index bf9d278..9b4f0a3 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java @@ -31,6 +31,7 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.cluster.CamelClusterEventListener; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.junit.Assert; import org.junit.Test; diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java index 64852ba..f1661de 100644 --- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java +++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java @@ -29,7 +29,7 @@ import io.atomix.group.LocalMember; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.component.atomix.AtomixConfiguration; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.ObjectHelper; final class AtomixClusterView extends AbstractCamelClusterView { diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java index bfd6dfd..b07e523 100644 --- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java +++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java @@ -34,7 +34,7 @@ import com.orbitz.consul.model.session.ImmutableSession; import com.orbitz.consul.model.session.SessionInfo; import com.orbitz.consul.option.QueryOptions; import org.apache.camel.cluster.CamelClusterMember; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java index 9d3edc24..be7988e 100644 --- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java +++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java @@ -25,7 +25,7 @@ import java.util.concurrent.locks.Lock; import org.apache.camel.CamelContext; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.ObjectHelper; import org.jgroups.JChannel; import org.jgroups.blocks.locking.LockService; diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java index 7ace336..12aeb43 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java @@ -34,7 +34,7 @@ import org.apache.camel.component.kubernetes.KubernetesHelper; import org.apache.camel.component.kubernetes.cluster.lock.KubernetesClusterEvent; import org.apache.camel.component.kubernetes.cluster.lock.KubernetesLeadershipController; import org.apache.camel.component.kubernetes.cluster.lock.KubernetesLockConfiguration; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.ObjectHelper; /** diff --git a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java index 8f31a07..ce726bf 100644 --- a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java +++ b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java @@ -22,8 +22,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.impl.cluster.ClusterServiceHelper; -import org.apache.camel.cluster.ClusterServiceSelectors; +import org.apache.camel.support.cluster.ClusterServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java index b8a3813..2f549ea 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java @@ -25,7 +25,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration; -import org.apache.camel.impl.cluster.AbstractCamelClusterView; +import org.apache.camel.support.cluster.AbstractCamelClusterView; import org.apache.camel.util.ObjectHelper; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.leader.LeaderSelector;