ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject incubator-ignite git commit: # IGNITE-706 Rename TcpDiscoveryClientReconnectMessage to TcpDiscoveryClientReconnectRequest
Date Fri, 24 Apr 2015 14:14:48 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_1 db34ca9ea -> 65e1b93c0


# IGNITE-706 Rename TcpDiscoveryClientReconnectMessage to TcpDiscoveryClientReconnectRequest


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/65e1b93c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/65e1b93c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/65e1b93c

Branch: refs/heads/ignite-709_1
Commit: 65e1b93c04c952b2d4f5ca42e049f4b026cce7fd
Parents: db34ca9
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Fri Apr 24 17:14:09 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Fri Apr 24 17:14:09 2015 +0300

----------------------------------------------------------------------
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   8 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   8 +-
 .../TcpDiscoveryClientReconnectMessage.java     | 101 -------------------
 .../TcpDiscoveryClientReconnectRequest.java     | 101 +++++++++++++++++++
 4 files changed, 109 insertions(+), 109 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65e1b93c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 5f2de5f..a09b30d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -448,7 +448,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                         locNode.clientRouterNodeId(rmtNodeId);
 
                         TcpDiscoveryAbstractMessage msg = recon ?
-                            new TcpDiscoveryClientReconnectMessage(getLocalNodeId(), rmtNodeId,
+                            new TcpDiscoveryClientReconnectRequest(getLocalNodeId(), rmtNodeId,
                                 lastMsgId) :
                             new TcpDiscoveryJoinRequestMessage(locNode, null);
 
@@ -859,8 +859,8 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
 
             stats.onMessageProcessingStarted(msg);
 
-            if (msg instanceof TcpDiscoveryClientReconnectMessage)
-                processClientReconnectMessage((TcpDiscoveryClientReconnectMessage)msg);
+            if (msg instanceof TcpDiscoveryClientReconnectRequest)
+                processClientReconnectMessage((TcpDiscoveryClientReconnectRequest)msg);
             else {
                 if (recon && !pending) {
                     if (log.isDebugEnabled())
@@ -1146,7 +1146,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
         /**
          * @param msg Message.
          */
-        private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg)
{
+        private void processClientReconnectMessage(TcpDiscoveryClientReconnectRequest msg)
{
             if (leaveLatch != null)
                 return;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65e1b93c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 9be9fc2..d8af585 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -2623,8 +2623,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
             if (msg instanceof TcpDiscoveryJoinRequestMessage)
                 processJoinRequestMessage((TcpDiscoveryJoinRequestMessage)msg);
 
-            else if (msg instanceof TcpDiscoveryClientReconnectMessage)
-                processClientReconnectMessage((TcpDiscoveryClientReconnectMessage)msg);
+            else if (msg instanceof TcpDiscoveryClientReconnectRequest)
+                processClientReconnectMessage((TcpDiscoveryClientReconnectRequest)msg);
 
             else if (msg instanceof TcpDiscoveryNodeAddedMessage)
                 processNodeAddedMessage((TcpDiscoveryNodeAddedMessage)msg);
@@ -3428,7 +3428,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
          *
          * @param msg Client reconnect message.
          */
-        private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg)
{
+        private void processClientReconnectMessage(TcpDiscoveryClientReconnectRequest msg)
{
             UUID locNodeId = getLocalNodeId();
 
             boolean isLocNodeRouter = locNodeId.equals(msg.routerNodeId());
@@ -4850,7 +4850,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
                                     break;
                             }
                         }
-                        else if (msg instanceof TcpDiscoveryClientReconnectMessage) {
+                        else if (msg instanceof TcpDiscoveryClientReconnectRequest) {
                             if (client) {
                                 TcpDiscoverySpiState state = spiStateCopy();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65e1b93c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
deleted file mode 100644
index 86aee1a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
+++ /dev/null
@@ -1,101 +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.ignite.spi.discovery.tcp.messages;
-
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-
-import java.util.*;
-
-/**
- * Message telling that client node is reconnecting to topology.
- */
-public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMessage {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** New router nodeID. */
-    private final UUID routerNodeId;
-
-    /** Last message ID. */
-    private final IgniteUuid lastMsgId;
-
-    /** Pending messages. */
-    @GridToStringExclude
-    private Collection<TcpDiscoveryAbstractMessage> msgs;
-
-    /**
-     * @param creatorNodeId Creator node ID.
-     * @param routerNodeId New router node ID.
-     * @param lastMsgId Last message ID.
-     */
-    public TcpDiscoveryClientReconnectMessage(UUID creatorNodeId, UUID routerNodeId, IgniteUuid
lastMsgId) {
-        super(creatorNodeId);
-
-        this.routerNodeId = routerNodeId;
-        this.lastMsgId = lastMsgId;
-    }
-
-    /**
-     * @return New router node ID.
-     */
-    public UUID routerNodeId() {
-        return routerNodeId;
-    }
-
-    /**
-     * @return Last message ID.
-     */
-    public IgniteUuid lastMessageId() {
-        return lastMsgId;
-    }
-
-    /**
-     * @param msgs Pending messages.
-     */
-    public void pendingMessages(Collection<TcpDiscoveryAbstractMessage> msgs) {
-        this.msgs = msgs;
-    }
-
-    /**
-     * @return Pending messages.
-     */
-    public Collection<TcpDiscoveryAbstractMessage> pendingMessages() {
-        return msgs;
-    }
-
-    /**
-     * @param success Success flag.
-     */
-    public void success(boolean success) {
-        setFlag(CLIENT_RECON_SUCCESS_FLAG_POS, success);
-    }
-
-    /**
-     * @return Success flag.
-     */
-    public boolean success() {
-        return getFlag(CLIENT_RECON_SUCCESS_FLAG_POS);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(TcpDiscoveryClientReconnectMessage.class, this, "super", super.toString());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65e1b93c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectRequest.java
new file mode 100644
index 0000000..929a9b9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectRequest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.ignite.spi.discovery.tcp.messages;
+
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
+
+import java.util.*;
+
+/**
+ * Message telling that client node is reconnecting to topology.
+ */
+public class TcpDiscoveryClientReconnectRequest extends TcpDiscoveryAbstractMessage {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** New router nodeID. */
+    private final UUID routerNodeId;
+
+    /** Last message ID. */
+    private final IgniteUuid lastMsgId;
+
+    /** Pending messages. */
+    @GridToStringExclude
+    private Collection<TcpDiscoveryAbstractMessage> msgs;
+
+    /**
+     * @param creatorNodeId Creator node ID.
+     * @param routerNodeId New router node ID.
+     * @param lastMsgId Last message ID.
+     */
+    public TcpDiscoveryClientReconnectRequest(UUID creatorNodeId, UUID routerNodeId, IgniteUuid
lastMsgId) {
+        super(creatorNodeId);
+
+        this.routerNodeId = routerNodeId;
+        this.lastMsgId = lastMsgId;
+    }
+
+    /**
+     * @return New router node ID.
+     */
+    public UUID routerNodeId() {
+        return routerNodeId;
+    }
+
+    /**
+     * @return Last message ID.
+     */
+    public IgniteUuid lastMessageId() {
+        return lastMsgId;
+    }
+
+    /**
+     * @param msgs Pending messages.
+     */
+    public void pendingMessages(Collection<TcpDiscoveryAbstractMessage> msgs) {
+        this.msgs = msgs;
+    }
+
+    /**
+     * @return Pending messages.
+     */
+    public Collection<TcpDiscoveryAbstractMessage> pendingMessages() {
+        return msgs;
+    }
+
+    /**
+     * @param success Success flag.
+     */
+    public void success(boolean success) {
+        setFlag(CLIENT_RECON_SUCCESS_FLAG_POS, success);
+    }
+
+    /**
+     * @return Success flag.
+     */
+    public boolean success() {
+        return getFlag(CLIENT_RECON_SUCCESS_FLAG_POS);
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(TcpDiscoveryClientReconnectRequest.class, this, "super", super.toString());
+    }
+}


Mime
View raw message