camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nferr...@apache.org
Subject camel git commit: clustered-route-policy: fix typo
Date Mon, 26 Jun 2017 10:57:35 GMT
Repository: camel
Updated Branches:
  refs/heads/master b20319938 -> 2993c5145


clustered-route-policy: fix typo


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2993c514
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2993c514
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2993c514

Branch: refs/heads/master
Commit: 2993c5145a78a540f21505ab3cd0a01e5174f96e
Parents: b203199
Author: Nicola Ferraro <ni.ferraro@gmail.com>
Authored: Mon Jun 26 12:57:17 2017 +0200
Committer: Nicola Ferraro <ni.ferraro@gmail.com>
Committed: Mon Jun 26 12:57:17 2017 +0200

----------------------------------------------------------------------
 .../camel/ha/CameClusterEventListener.java      | 32 --------------------
 .../camel/ha/CamelClusterEventListener.java     | 32 ++++++++++++++++++++
 .../org/apache/camel/ha/CamelClusterView.java   |  4 +--
 .../camel/impl/ha/AbstractCamelClusterView.java | 18 +++++------
 .../camel/impl/ha/ClusteredRoutePolicy.java     |  6 ++--
 5 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2993c514/camel-core/src/main/java/org/apache/camel/ha/CameClusterEventListener.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CameClusterEventListener.java b/camel-core/src/main/java/org/apache/camel/ha/CameClusterEventListener.java
deleted file mode 100644
index d021dc5..0000000
--- a/camel-core/src/main/java/org/apache/camel/ha/CameClusterEventListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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.ha;
-
-/**
- * Marker interface
- */
-public interface CameClusterEventListener {
-
-    interface Leadership extends CameClusterEventListener {
-        void leadershipChanged(CamelClusterView view, CamelClusterMember leader);
-    }
-
-    interface Membership extends CameClusterEventListener {
-        void memberAdded(CamelClusterView view, CamelClusterMember leader);
-        void memberRemoved(CamelClusterView view, CamelClusterMember leader);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/2993c514/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java b/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java
new file mode 100644
index 0000000..5c19970
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java
@@ -0,0 +1,32 @@
+/**
+ * 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.ha;
+
+/**
+ * Marker interface
+ */
+public interface CamelClusterEventListener {
+
+    interface Leadership extends CamelClusterEventListener {
+        void leadershipChanged(CamelClusterView view, CamelClusterMember leader);
+    }
+
+    interface Membership extends CamelClusterEventListener {
+        void memberAdded(CamelClusterView view, CamelClusterMember leader);
+        void memberRemoved(CamelClusterView view, CamelClusterMember leader);
+    }
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/2993c514/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java b/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
index 7983fca..bca893f5 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
+++ b/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
@@ -62,14 +62,14 @@ public interface CamelClusterView extends Service, CamelContextAware {
      *
      * @param listener the event listener.
      */
-    void addEventListener(CameClusterEventListener listener);
+    void addEventListener(CamelClusterEventListener listener);
 
     /**
      * Remove the event listener.
      *
      * @param listener the event listener.
      */
-    void removeEventListener(CameClusterEventListener listener);
+    void removeEventListener(CamelClusterEventListener listener);
 
     /**
      * Access the underlying concrete CamelClusterView implementation to

http://git-wip-us.apache.org/repos/asf/camel/blob/2993c514/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
b/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
index f5a2c8c..1605c6d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.StampedLock;
 import java.util.function.Consumer;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ha.CameClusterEventListener;
+import org.apache.camel.ha.CamelClusterEventListener;
 import org.apache.camel.ha.CamelClusterMember;
 import org.apache.camel.ha.CamelClusterService;
 import org.apache.camel.ha.CamelClusterView;
@@ -32,7 +32,7 @@ import org.apache.camel.util.concurrent.LockHelper;
 public abstract class AbstractCamelClusterView extends ServiceSupport implements CamelClusterView
{
     private final CamelClusterService clusterService;
     private final String namespace;
-    private final List<CameClusterEventListener> listeners;
+    private final List<CamelClusterEventListener> listeners;
     private final StampedLock lock;
     private CamelContext camelContext;
 
@@ -64,12 +64,12 @@ public abstract class AbstractCamelClusterView extends ServiceSupport
implements
     }
 
     @Override
-    public void addEventListener(CameClusterEventListener listener) {
+    public void addEventListener(CamelClusterEventListener listener) {
         LockHelper.doWithWriteLock(lock, () -> listeners.add(listener));
     }
 
     @Override
-    public void removeEventListener(CameClusterEventListener listener) {
+    public void removeEventListener(CamelClusterEventListener listener) {
         LockHelper.doWithWriteLock(lock, () -> listeners.removeIf(l -> l == listener));
     }
 
@@ -77,12 +77,12 @@ public abstract class AbstractCamelClusterView extends ServiceSupport
implements
     // Events
     // **************************************
 
-    private <T extends CameClusterEventListener> void doWithListener(Class<T>
type, Consumer<T> consumer) {
+    private <T extends CamelClusterEventListener> void doWithListener(Class<T>
type, Consumer<T> consumer) {
         LockHelper.doWithReadLock(
             lock,
             () -> {
                 for (int i = 0; i < listeners.size(); i++) {
-                    CameClusterEventListener listener = listeners.get(0);
+                    CamelClusterEventListener listener = listeners.get(0);
 
                     if (type.isInstance(listener)) {
                         consumer.accept(type.cast(listener));
@@ -94,21 +94,21 @@ public abstract class AbstractCamelClusterView extends ServiceSupport
implements
 
     protected void fireLeadershipChangedEvent(CamelClusterMember leader) {
         doWithListener(
-            CameClusterEventListener.Leadership.class,
+            CamelClusterEventListener.Leadership.class,
             listener -> listener.leadershipChanged(this, leader)
         );
     }
 
     protected void fireMemberAddedEvent(CamelClusterMember member) {
         doWithListener(
-            CameClusterEventListener.Membership.class,
+            CamelClusterEventListener.Membership.class,
             listener -> listener.memberAdded(this, member)
         );
     }
 
     protected void fireMemberRemovedEvent(CamelClusterMember member) {
         doWithListener(
-            CameClusterEventListener.Membership.class,
+            CamelClusterEventListener.Membership.class,
             listener -> listener.memberRemoved(this, member)
         );
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/2993c514/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
index 6d726f6..542b15b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
@@ -27,7 +27,7 @@ import org.apache.camel.Route;
 import org.apache.camel.StartupListener;
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.ha.CameClusterEventListener;
+import org.apache.camel.ha.CamelClusterEventListener;
 import org.apache.camel.ha.CamelClusterMember;
 import org.apache.camel.ha.CamelClusterService;
 import org.apache.camel.ha.CamelClusterView;
@@ -47,7 +47,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements
Ca
     private final Set<Route> stoppedRoutes;
     private final ReferenceCount refCount;
     private final CamelClusterView clusterView;
-    private final CameClusterEventListener.Leadership leadershipEventListener;
+    private final CamelClusterEventListener.Leadership leadershipEventListener;
     private final CamelContextStartupListener listener;
     private final AtomicBoolean contextStarted;
 
@@ -200,7 +200,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements
Ca
     // Event handling
     // ****************************************************
 
-    private class CamelClusterLeadershipListener implements CameClusterEventListener.Leadership
{
+    private class CamelClusterLeadershipListener implements CamelClusterEventListener.Leadership
{
         @Override
         public void leadershipChanged(CamelClusterView view, CamelClusterMember leader) {
             setLeader(clusterView.getLocalMember().isMaster());


Mime
View raw message