# ignite-836 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/778aa172 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/778aa172 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/778aa172 Branch: refs/heads/ignite-709_3 Commit: 778aa172fcdf8bbfb66206503e1387630fbb965e Parents: 5e0bbf2 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri May 15 10:13:30 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri May 15 10:13:30 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/events/DiscoveryCustomEvent.java | 4 +--- .../internal/managers/discovery/CustomEventListener.java | 9 ++++----- .../internal/managers/discovery/CustomMessageWrapper.java | 2 +- .../internal/managers/discovery/DiscoveryCustomMessage.java | 6 ++++-- .../internal/processors/cache/DynamicCacheChangeBatch.java | 2 +- .../continuous/StartRoutineAckDiscoveryMessage.java | 6 +++--- .../processors/continuous/StartRoutineDiscoveryMessage.java | 2 +- .../continuous/StopRoutineAckDiscoveryMessage.java | 6 +++--- .../processors/continuous/StopRoutineDiscoveryMessage.java | 6 +++--- 9 files changed, 21 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java index ad33aae..779b54d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java @@ -22,15 +22,13 @@ import org.apache.ignite.internal.managers.discovery.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.util.typedef.internal.*; -import java.io.*; - /** * Custom event. */ public class DiscoveryCustomEvent extends DiscoveryEvent { /** */ private static final long serialVersionUID = 0L; - + /** * Built-in event type: custom event sent. * <br> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java index 5c11968..2005d4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomEventListener.java @@ -5,9 +5,9 @@ * 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. @@ -20,12 +20,11 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.cluster.*; /** - * - * @param <T> + * Listener interface. */ public interface CustomEventListener<T extends DiscoveryCustomMessage> { /** - * @param snd Send. + * @param snd Sender. * @param msg Message. */ public void onCustomEvent(ClusterNode snd, T msg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java index 3e3d708..00bfb8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java @@ -39,7 +39,7 @@ class CustomMessageWrapper implements DiscoverySpiCustomMessage { /** {@inheritDoc} */ @Nullable @Override public DiscoverySpiCustomMessage newMessageOnRingEnd() { - DiscoveryCustomMessage res = delegate.newMessageOnRingEnd(); + DiscoveryCustomMessage res = delegate.ackMessage(); return res == null ? null : new CustomMessageWrapper(res); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java index 49a791e..e702ee4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java @@ -33,7 +33,9 @@ public interface DiscoveryCustomMessage extends Serializable { public boolean forwardMinorVersion(); /** - * Called when message passed the ring. + * Called when custom message has been handled by all nodes. + * + * @return Ack message or {@code null} if ack is not required. */ - @Nullable public DiscoveryCustomMessage newMessageOnRingEnd(); + @Nullable public DiscoveryCustomMessage ackMessage(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java index 330f822..744f6e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java @@ -80,7 +80,7 @@ public class DynamicCacheChangeBatch implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java index 5ff67d8..ca9e4a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java @@ -5,9 +5,9 @@ * 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. @@ -51,7 +51,7 @@ public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java index 4be0423..5669433 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java @@ -84,7 +84,7 @@ public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public DiscoveryCustomMessage newMessageOnRingEnd() { + @Override public DiscoveryCustomMessage ackMessage() { return new StartRoutineAckDiscoveryMessage(routineId, errs); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 13f7ef4..16507a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -5,9 +5,9 @@ * 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. @@ -45,7 +45,7 @@ public class StopRoutineAckDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/778aa172/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 4c663a2..00515f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -5,9 +5,9 @@ * 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. @@ -53,7 +53,7 @@ public class StopRoutineDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return new StopRoutineAckDiscoveryMessage(routineId); } }
