This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c11e51d6021 IGNITE-28566 Remove TcpDiscoveryCollectionMessage (#13040)
c11e51d6021 is described below
commit c11e51d60214f15cd56220636dcba6e17a852ba0
Author: Nikita Amelchev <[email protected]>
AuthorDate: Fri Apr 17 17:58:18 2026 +0300
IGNITE-28566 Remove TcpDiscoveryCollectionMessage (#13040)
---
.../ignite/internal/CoreMessagesProvider.java | 4 -
.../tcp/messages/TcpDiscoveryAbstractMessage.java | 11 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 7 +-
.../messages/TcpDiscoveryCheckFailedMessage.java | 7 +-
.../messages/TcpDiscoveryClientAckResponse.java | 7 +-
.../TcpDiscoveryClientMetricsUpdateMessage.java | 7 +-
.../messages/TcpDiscoveryClientPingRequest.java | 7 +-
.../messages/TcpDiscoveryClientPingResponse.java | 7 +-
.../TcpDiscoveryClientReconnectMessage.java | 39 ++----
.../messages/TcpDiscoveryCollectionMessage.java | 139 ---------------------
.../TcpDiscoveryConnectionCheckMessage.java | 7 +-
.../messages/TcpDiscoveryCustomEventMessage.java | 4 -
.../tcp/messages/TcpDiscoveryDiscardMessage.java | 7 +-
.../messages/TcpDiscoveryDummyWakeupMessage.java | 12 +-
.../messages/TcpDiscoveryDuplicateIdMessage.java | 7 +-
.../tcp/messages/TcpDiscoveryHandshakeRequest.java | 7 +-
.../messages/TcpDiscoveryHandshakeResponse.java | 7 +-
.../messages/TcpDiscoveryJoinRequestMessage.java | 5 -
.../TcpDiscoveryLoopbackProblemMessage.java | 7 +-
.../messages/TcpDiscoveryMetricsUpdateMessage.java | 7 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 4 -
.../tcp/messages/TcpDiscoveryNodeAddedMessage.java | 31 ++---
.../messages/TcpDiscoveryNodeFailedMessage.java | 4 -
.../tcp/messages/TcpDiscoveryNodeLeftMessage.java | 4 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 7 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 7 +-
.../TcpDiscoveryRingLatencyCheckMessage.java | 7 +-
.../TcpDiscoveryServerOnlyCustomEventMessage.java | 4 -
.../messages/TcpDiscoveryStatusCheckMessage.java | 7 +-
29 files changed, 43 insertions(+), 337 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
index a0e4f4f1934..692df7e840d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
@@ -255,7 +255,6 @@ import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientNodesMetri
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
-import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCollectionMessage;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
@@ -341,9 +340,6 @@ public class CoreMessagesProvider implements
MessageFactoryProvider {
withNoSchema(GridCacheVersion.class);
withNoSchema(GridCacheVersionEx.class);
- msgIdx = 5500;
- withNoSchema(TcpDiscoveryCollectionMessage.class);
-
// [5700 - 5900]: Discovery originated messages.
msgIdx = 5700;
withNoSchema(TcpDiscoveryHandshakeRequest.class);
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
index d5653d3d78b..7a97763c36b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
@@ -18,7 +18,6 @@
package org.apache.ignite.spi.discovery.tcp.messages;
import java.io.Externalizable;
-import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@@ -27,15 +26,13 @@ import
org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
* Base class to implement discovery messages.
*/
-public abstract class TcpDiscoveryAbstractMessage implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
+public abstract class TcpDiscoveryAbstractMessage implements Message {
/** */
protected static final int CLIENT_FLAG_POS = 0;
@@ -48,8 +45,8 @@ public abstract class TcpDiscoveryAbstractMessage implements
Serializable {
/** */
protected static final int FORCE_FAIL_FLAG_POS = 4;
- /** Sender of the message (transient). */
- private transient UUID sndNodeId;
+ /** Sender of the message. */
+ private UUID sndNodeId;
/** Message ID. */
@Order(0)
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index bf3a97da951..96685c7e423 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -21,16 +21,12 @@ import java.net.InetAddress;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
/**
* Message telling joining node that its authentication failed.
*/
-public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage
{
/** Creator address. */
@Order(0)
InetAddressMessage creatorAddrMsg;
@@ -68,7 +64,6 @@ public class TcpDiscoveryAuthFailedMessage extends
TcpDiscoveryAbstractMessage i
return creatorAddrMsg.address();
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryAuthFailedMessage.class, this, "super",
super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
index 8ce5e0051aa..8664b4d9d29 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
@@ -20,15 +20,11 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Message telling joining node that it failed coordinator's validation check.
*/
-public class TcpDiscoveryCheckFailedMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryCheckFailedMessage extends
TcpDiscoveryAbstractMessage {
/** Coordinator version. */
@Order(0)
String err;
@@ -56,7 +52,6 @@ public class TcpDiscoveryCheckFailedMessage extends
TcpDiscoveryAbstractMessage
return err;
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryCheckFailedMessage.class, this, "super",
super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index 1a5adee61de..2ffeee1f02d 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -21,15 +21,11 @@ import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
*
*/
-public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage
{
/** */
@Order(0)
IgniteUuid msgId;
@@ -70,5 +66,4 @@ public class TcpDiscoveryClientAckResponse extends
TcpDiscoveryAbstractMessage i
@Override public String toString() {
return S.toString(TcpDiscoveryClientAckResponse.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
index 8851ae20bb4..22e98a087a1 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
/**
@@ -30,10 +29,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageFactory;
* <p>
* Client sends his metrics in this message.
*/
-public class TcpDiscoveryClientMetricsUpdateMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientMetricsUpdateMessage extends
TcpDiscoveryAbstractMessage {
/** */
@Order(0)
NodeMetricsMessage metricsMsg;
@@ -64,7 +60,6 @@ public class TcpDiscoveryClientMetricsUpdateMessage extends
TcpDiscoveryAbstract
return metricsMsg;
}
-
/** {@inheritDoc} */
@Override public boolean traceLogLevel() {
return true;
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
index 47260519b3b..1a9e75c2a2e 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
@@ -20,16 +20,12 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
* Ping request.
*/
-public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage
{
/** Pinged client node ID. */
@Order(0)
@Nullable UUID nodeToPing;
@@ -60,5 +56,4 @@ public class TcpDiscoveryClientPingRequest extends
TcpDiscoveryAbstractMessage i
@Override public String toString() {
return S.toString(TcpDiscoveryClientPingRequest.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
index 1d22b4421b3..f9c0587ec97 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
@@ -20,16 +20,12 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
* Ping request.
*/
-public class TcpDiscoveryClientPingResponse extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientPingResponse extends
TcpDiscoveryAbstractMessage {
/** Pinged client node ID. */
@Order(0)
@Nullable UUID nodeToPing;
@@ -73,5 +69,4 @@ public class TcpDiscoveryClientPingResponse extends
TcpDiscoveryAbstractMessage
@Override public String toString() {
return S.toString(TcpDiscoveryClientPingResponse.class, this, "super",
super.toString());
}
-
}
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
index 6aa88296435..386ee56f5ba 100644
---
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
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.jetbrains.annotations.Nullable;
@@ -33,10 +32,7 @@ import org.jetbrains.annotations.Nullable;
* Message telling that client node is reconnecting to topology.
*/
@TcpDiscoveryEnsureDelivery
-public class TcpDiscoveryClientReconnectMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryClientReconnectMessage extends
TcpDiscoveryAbstractMessage {
/** New router nodeID. */
@Order(0)
UUID routerNodeId;
@@ -47,7 +43,7 @@ public class TcpDiscoveryClientReconnectMessage extends
TcpDiscoveryAbstractMess
/** Pending messages holder. */
@Order(2)
- @Nullable TcpDiscoveryCollectionMessage pendingMsgsMsg;
+ @Nullable Collection<TcpDiscoveryAbstractMessage> pendingMsgs;
/** Constructor for {@link MessageFactory}. */
public TcpDiscoveryClientReconnectMessage() {
@@ -66,44 +62,32 @@ public class TcpDiscoveryClientReconnectMessage extends
TcpDiscoveryAbstractMess
this.lastMsgId = lastMsgId;
}
- /**
- * @return New router node ID.
- */
+ /** @return New router node ID. */
public UUID routerNodeId() {
return routerNodeId;
}
- /**
- * @return Last message ID.
- */
+ /** @return Last message ID. */
public IgniteUuid lastMessageId() {
return lastMsgId;
}
- /**
- * @param msgs Pending messages.
- */
- public void pendingMessages(@Nullable
Collection<TcpDiscoveryAbstractMessage> msgs) {
- pendingMsgsMsg = F.isEmpty(msgs) ? null : new
TcpDiscoveryCollectionMessage(msgs);
+ /** @param msgs Pending messages. */
+ public void pendingMessages(Collection<TcpDiscoveryAbstractMessage> msgs) {
+ pendingMsgs = F.isEmpty(msgs) ? null : msgs;
}
- /**
- * @return Pending messages.
- */
+ /** @return Pending messages. */
public Collection<TcpDiscoveryAbstractMessage> pendingMessages() {
- return pendingMsgsMsg == null ? Collections.emptyList() :
pendingMsgsMsg.messages();
+ return pendingMsgs == null ? Collections.emptyList() : pendingMsgs;
}
- /**
- * @param success Success flag.
- */
+ /** @param success Success flag. */
public void success(boolean success) {
setFlag(CLIENT_RECON_SUCCESS_FLAG_POS, success);
}
- /**
- * @return Success flag.
- */
+ /** @return Success flag. */
public boolean success() {
return getFlag(CLIENT_RECON_SUCCESS_FLAG_POS);
}
@@ -123,7 +107,6 @@ public class TcpDiscoveryClientReconnectMessage extends
TcpDiscoveryAbstractMess
Objects.equals(lastMsgId, other.lastMsgId);
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryClientReconnectMessage.class, this,
"super", super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
deleted file mode 100644
index c719334f0cc..00000000000
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCollectionMessage.java
+++ /dev/null
@@ -1,139 +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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.MarshallableMessage;
-import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageFactory;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * TODO: Remove/revise after https://issues.apache.org/jira/browse/IGNITE-25883
- * Message to transfer a collection of {@link TcpDiscoveryAbstractMessage}
with the original order.
- * Several of them might be a {@link Message}, several may not and require the
original marshalling.
- */
-public class TcpDiscoveryCollectionMessage implements MarshallableMessage {
- /** {@link TcpDiscoveryAbstractMessage} messages which are a {@link
Message}. */
- @Order(0)
- @Nullable Map<Integer, Message> writableMsgs;
-
- /** Marshallable or Java-serializable messages which are not a {@link
Message}. */
- @Nullable private Map<Integer, TcpDiscoveryAbstractMessage>
marshallableMsgs;
-
- /** Marshalled {@link #marshallableMsgs}. */
- @Order(1)
- @GridToStringExclude
- @Nullable byte[] marshallableMsgsBytes;
-
- /** Constructor for {@link MessageFactory}. */
- public TcpDiscoveryCollectionMessage() {
- // No-op.
- }
-
- /** @param msgs Discovery messages to hold. */
- public
TcpDiscoveryCollectionMessage(Collection<TcpDiscoveryAbstractMessage> msgs) {
- if (F.isEmpty(msgs))
- return;
-
- // Keeps the original message order.
- int idx = 0;
-
- for (TcpDiscoveryAbstractMessage m : msgs) {
- if (m instanceof Message) {
- if (writableMsgs == null)
- writableMsgs = U.newHashMap(msgs.size());
-
- writableMsgs.put(idx++, (Message)m);
-
- continue;
- }
-
- if (marshallableMsgs == null)
- marshallableMsgs = U.newHashMap(msgs.size());
-
- marshallableMsgs.put(idx++, m);
- }
- }
-
- /** @param marsh marshaller. */
- @Override public void prepareMarshal(Marshaller marsh) throws
IgniteCheckedException {
- if (marshallableMsgs != null)
- marshallableMsgsBytes = U.marshal(marsh, marshallableMsgs);
- }
-
- /** {@inheritDoc} */
- @Override public void finishUnmarshal(Marshaller marsh, ClassLoader
clsLdr) throws IgniteCheckedException {
- if (marshallableMsgsBytes != null)
- marshallableMsgs = U.unmarshal(marsh, marshallableMsgsBytes,
clsLdr);
-
- marshallableMsgsBytes = null;
- }
-
- /**
- * Gets pending messages sent to new node by its previous.
- *
- * @return Pending messages from previous node.
- */
- public Collection<TcpDiscoveryAbstractMessage> messages() {
- if (F.isEmpty(writableMsgs) && F.isEmpty(marshallableMsgs))
- return Collections.emptyList();
-
- int totalSz = (F.isEmpty(writableMsgs) ? 0 : writableMsgs.size())
- + (F.isEmpty(marshallableMsgs) ? 0 : marshallableMsgs.size());
-
- List<TcpDiscoveryAbstractMessage> res = new ArrayList<>(totalSz);
-
- for (int i = 0; i < totalSz; ++i) {
- Message m = F.isEmpty(writableMsgs) ? null : writableMsgs.get(i);
-
- if (m == null) {
- TcpDiscoveryAbstractMessage adm = marshallableMsgs.get(i);
-
- assert adm != null;
-
- res.add(adm);
- }
- else {
- assert marshallableMsgs == null || marshallableMsgs.get(i) ==
null;
- assert m instanceof TcpDiscoveryAbstractMessage;
-
- res.add((TcpDiscoveryAbstractMessage)m);
- }
- }
-
- return res;
- }
-
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(TcpDiscoveryCollectionMessage.class, this, "super",
super.toString());
- }
-}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
index 2f938710cd0..978e80ab7b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
@@ -18,7 +18,6 @@
package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
@@ -27,10 +26,7 @@ import
org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
* The difference from {@link TcpDiscoveryStatusCheckMessage} is that this
message is sent to the next node
* which directly replies to the sender without message re-translation to the
coordinator.
*/
-public class TcpDiscoveryConnectionCheckMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryConnectionCheckMessage extends
TcpDiscoveryAbstractMessage {
/**
* Default constructor for {@link MessageFactory}.
*/
@@ -52,7 +48,6 @@ public class TcpDiscoveryConnectionCheckMessage extends
TcpDiscoveryAbstractMess
return true;
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryConnectionCheckMessage.class, this,
"super", super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 1e2b713998c..e4ed7cafb8b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -35,9 +35,6 @@ import org.jetbrains.annotations.Nullable;
@TcpDiscoveryRedirectToClient
@TcpDiscoveryEnsureDelivery
public class TcpDiscoveryCustomEventMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** */
private volatile DiscoverySpiCustomMessage msg;
@@ -143,5 +140,4 @@ public class TcpDiscoveryCustomEventMessage extends
TcpDiscoveryAbstractTraceabl
@Override public String toString() {
return S.toString(TcpDiscoveryCustomEventMessage.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index 12fc2af8996..02bf972fa5a 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -21,16 +21,12 @@ import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Message sent by coordinator when some operation handling is over. All
receiving
* nodes should discard this and all preceding messages in local buffers.
*/
-public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
/** ID of the message to discard (this and all preceding). */
@Order(0)
IgniteUuid msgId;
@@ -80,5 +76,4 @@ public class TcpDiscoveryDiscardMessage extends
TcpDiscoveryAbstractMessage impl
@Override public String toString() {
return S.toString(TcpDiscoveryDiscardMessage.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java
index a9b41e6a2d0..dfecbfc8e2d 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDummyWakeupMessage.java
@@ -18,16 +18,8 @@
package org.apache.ignite.spi.discovery.tcp.messages;
/**
- *
+ * The message must not be serialized.
*/
public class TcpDiscoveryDummyWakeupMessage extends
TcpDiscoveryAbstractMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * @return Will throw an exception, the message must not be serialized.
- */
- protected Object writeReplace() {
- throw new IllegalStateException("Dummy message must not be
serialized");
- }
+ // No-op.
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
index 1a7d82ce652..87c3e7a9046 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
@@ -20,16 +20,12 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Message telling joining node that new topology already contain
* different node with same ID.
*/
-public class TcpDiscoveryDuplicateIdMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryDuplicateIdMessage extends
TcpDiscoveryAbstractMessage {
/** ID of the node with duplicate ID. */
@Order(0)
UUID nodeId;
@@ -64,5 +60,4 @@ public class TcpDiscoveryDuplicateIdMessage extends
TcpDiscoveryAbstractMessage
@Override public String toString() {
return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
index d553cf59109..6ce9f16a7bc 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
@@ -20,17 +20,13 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.jetbrains.annotations.Nullable;
/**
* Handshake request.
*/
-public class TcpDiscoveryHandshakeRequest extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryHandshakeRequest extends TcpDiscoveryAbstractMessage {
/** */
@Order(0)
@Nullable UUID prevNodeId;
@@ -83,7 +79,6 @@ public class TcpDiscoveryHandshakeRequest extends
TcpDiscoveryAbstractMessage im
this.dcId = dcId;
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryHandshakeRequest.class, this, "super",
super.toString(),
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
index e3381ab5aae..b5ca363ae01 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
@@ -23,17 +23,13 @@ import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.jetbrains.annotations.Nullable;
/**
* Handshake response.
*/
-public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage
{
/** */
@Order(0)
long order;
@@ -108,7 +104,6 @@ public class TcpDiscoveryHandshakeResponse extends
TcpDiscoveryAbstractMessage i
: F.viewReadOnly(sockAddrs, addr -> new
InetSocketAddressMessage(addr.getAddress(), addr.getPort()));
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryHandshakeResponse.class, this, "super",
super.toString(),
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
index 361ced45a9f..33afef7ce67 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
@@ -29,9 +29,6 @@ import static
org.apache.ignite.internal.util.lang.ClusterNodeFunc.eqNodes;
* Sent to random node during SPI start. Then forwarded directly to
coordinator.
*/
public class TcpDiscoveryJoinRequestMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** New node that wants to join the topology. */
@Order(0)
TcpDiscoveryNode node;
@@ -86,7 +83,6 @@ public class TcpDiscoveryJoinRequestMessage extends
TcpDiscoveryAbstractTraceabl
setFlag(RESPONDED_FLAG_POS, responded);
}
-
/** {@inheritDoc} */
@Override public boolean equals(Object obj) {
// NOTE!
@@ -104,5 +100,4 @@ public class TcpDiscoveryJoinRequestMessage extends
TcpDiscoveryAbstractTraceabl
@Override public String toString() {
return S.toString(TcpDiscoveryJoinRequestMessage.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
index 75691271515..761babce93a 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
@@ -21,16 +21,12 @@ import java.util.Collection;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Message telling joining node that it has loopback problem
(misconfiguration).
* This means that remote node is configured to use loopback address, but
joining node is not, or vise versa.
*/
-public class TcpDiscoveryLoopbackProblemMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryLoopbackProblemMessage extends
TcpDiscoveryAbstractMessage {
/** Remote node addresses. */
@Order(0)
Collection<String> addrs;
@@ -77,5 +73,4 @@ public class TcpDiscoveryLoopbackProblemMessage extends
TcpDiscoveryAbstractMess
@Override public String toString() {
return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this,
"super", super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
index 522f66e5dfb..28735010366 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
@@ -31,7 +31,6 @@ import
org.apache.ignite.internal.processors.cluster.NodeMetricsMessage;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.jetbrains.annotations.Nullable;
@@ -50,10 +49,7 @@ import org.jetbrains.annotations.Nullable;
* second pass).
*/
@TcpDiscoveryRedirectToClient
-public class TcpDiscoveryMetricsUpdateMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryMetricsUpdateMessage extends
TcpDiscoveryAbstractMessage {
/** Connected clients metrics: server id -> client id -> clients metrics.
*/
@GridToStringExclude
@Order(0)
@@ -215,7 +211,6 @@ public class TcpDiscoveryMetricsUpdateMessage extends
TcpDiscoveryAbstractMessag
return true;
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryMetricsUpdateMessage.class, this,
"super", super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
index ac56920d1f9..ff6b252c439 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
@@ -34,9 +34,6 @@ import org.jetbrains.annotations.Nullable;
@TcpDiscoveryEnsureDelivery
@TcpDiscoveryRedirectToClient
public class TcpDiscoveryNodeAddFinishedMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Added node ID. */
@Order(0)
UUID nodeId;
@@ -143,5 +140,4 @@ public class TcpDiscoveryNodeAddFinishedMessage extends
TcpDiscoveryAbstractTrac
@Override public String toString() {
return S.toString(TcpDiscoveryNodeAddFinishedMessage.class, this,
"super", super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index e47dac2443c..ed717fcbbc0 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -37,9 +37,6 @@ import org.jetbrains.annotations.Nullable;
@TcpDiscoveryEnsureDelivery
@TcpDiscoveryRedirectToClient
public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Added node. */
@Order(0)
TcpDiscoveryNode node;
@@ -50,7 +47,7 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
/** Pending messages containner. */
@Order(2)
- @Nullable TcpDiscoveryCollectionMessage pendingMsgsMsg;
+ @Nullable Collection<TcpDiscoveryAbstractMessage> pendingMsgs;
/** Current topology. Initialized by coordinator. */
@GridToStringInclude
@@ -105,7 +102,7 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
super(msg);
node = msg.node;
- pendingMsgsMsg = msg.pendingMsgsMsg;
+ pendingMsgs = msg.pendingMsgs;
top = msg.top;
clientTop = msg.clientTop;
topHist = msg.topHist;
@@ -128,7 +125,7 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
* @return Pending messages from previous node.
*/
public @Nullable Collection<TcpDiscoveryAbstractMessage> messages() {
- return pendingMsgsMsg == null ? null : pendingMsgsMsg.messages();
+ return pendingMsgs == null ? null : pendingMsgs;
}
/**
@@ -137,7 +134,7 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
* @param msgs Pending messages to send to new node.
*/
public void messages(@Nullable Collection<TcpDiscoveryAbstractMessage>
msgs) {
- pendingMsgsMsg = F.isEmpty(msgs) ? null : new
TcpDiscoveryCollectionMessage(msgs);
+ pendingMsgs = F.isEmpty(msgs) ? null : msgs;
}
/**
@@ -158,18 +155,14 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
this.top = top;
}
- /**
- * @param top Topology at the moment when client joined.
- */
+ /** @param top Topology at the moment when client joined. */
public void clientTopology(Collection<TcpDiscoveryNode> top) {
assert top != null && !top.isEmpty() : top;
clientTop = top;
}
- /**
- * @return Topology at the moment when client joined.
- */
+ /** @return Topology at the moment when client joined. */
public Collection<TcpDiscoveryNode> clientTopology() {
return clientTop;
}
@@ -192,16 +185,12 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
this.topHist = topHist;
}
- /**
- * @return {@link DiscoveryDataPacket} carried by this message.
- */
+ /** @return {@link DiscoveryDataPacket} carried by this message. */
public DiscoveryDataPacket gridDiscoveryData() {
return dataPacket;
}
- /**
- * Clears discovery data to minimize message size.
- */
+ /** Clears discovery data to minimize message size. */
public void clearDiscoveryData() {
dataPacket = null;
}
@@ -215,9 +204,7 @@ public class TcpDiscoveryNodeAddedMessage extends
TcpDiscoveryAbstractTraceableM
dataPacket.clearUnmarshalledJoiningNodeData();
}
- /**
- * @return First grid node start time.
- */
+ /** @return First grid node start time. */
public long gridStartTime() {
return gridStartTime;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
index b07c2933c4f..a163e08ae31 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
@@ -29,9 +29,6 @@ import org.jetbrains.annotations.Nullable;
@TcpDiscoveryEnsureDelivery
@TcpDiscoveryRedirectToClient
public class TcpDiscoveryNodeFailedMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** ID of the failed node. */
@Order(0)
UUID failedNodeId;
@@ -100,5 +97,4 @@ public class TcpDiscoveryNodeFailedMessage extends
TcpDiscoveryAbstractTraceable
@Override public String toString() {
return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
index 9f6071d629a..0ec5e3d7876 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java
@@ -28,9 +28,6 @@ import
org.apache.ignite.plugin.extensions.communication.MessageFactory;
@TcpDiscoveryEnsureDelivery
@TcpDiscoveryRedirectToClient
public class TcpDiscoveryNodeLeftMessage extends
TcpDiscoveryAbstractTraceableMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Constructor for {@link MessageFactory}. */
public TcpDiscoveryNodeLeftMessage() {
// No-op.
@@ -45,7 +42,6 @@ public class TcpDiscoveryNodeLeftMessage extends
TcpDiscoveryAbstractTraceableMe
super(creatorNodeId);
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super",
super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
index 3c76aec6a44..54b90774dc1 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
@@ -20,16 +20,12 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
* Ping request.
*/
-public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage {
/** Pinged client node ID. */
@Order(0)
@Nullable UUID clientNodeId;
@@ -60,5 +56,4 @@ public class TcpDiscoveryPingRequest extends
TcpDiscoveryAbstractMessage impleme
@Override public String toString() {
return S.toString(TcpDiscoveryPingRequest.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index 2b1759d63af..44bc3a91d2d 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -20,15 +20,11 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Ping response.
*/
-public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage
implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage {
/** Whether pinged client exists. */
@Order(0)
boolean clientExists;
@@ -63,5 +59,4 @@ public class TcpDiscoveryPingResponse extends
TcpDiscoveryAbstractMessage implem
@Override public String toString() {
return S.toString(TcpDiscoveryPingResponse.class, this, "super",
super.toString());
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
index 6e07a1167a0..6d12443538e 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
@@ -20,16 +20,12 @@ package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
/**
*
*/
-public class TcpDiscoveryRingLatencyCheckMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryRingLatencyCheckMessage extends
TcpDiscoveryAbstractMessage {
/** Maximal hops number. */
@Order(0)
int maxHops;
@@ -76,7 +72,6 @@ public class TcpDiscoveryRingLatencyCheckMessage extends
TcpDiscoveryAbstractMes
return curHops == maxHops;
}
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryRingLatencyCheckMessage.class, this,
"super", super.toString());
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
index 2963a386c9a..eea3ea1f50b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryServerOnlyCustomEventMessage.java
@@ -26,9 +26,6 @@ import org.jetbrains.annotations.NotNull;
*/
@TcpDiscoveryEnsureDelivery
public class TcpDiscoveryServerOnlyCustomEventMessage extends
TcpDiscoveryCustomEventMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
/**
* Default constructor.
*/
@@ -43,5 +40,4 @@ public class TcpDiscoveryServerOnlyCustomEventMessage extends
TcpDiscoveryCustom
public TcpDiscoveryServerOnlyCustomEventMessage(UUID creatorNodeId,
@NotNull DiscoverySpiCustomMessage msg) {
super(creatorNodeId, msg);
}
-
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
index c9d8385b256..99c7af5a815 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -24,7 +24,6 @@ import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.jetbrains.annotations.Nullable;
@@ -36,10 +35,7 @@ import org.jetbrains.annotations.Nullable;
* If a failed node id is specified then the message is sent across the ring
up to the sender node
* to ensure that the failed node is actually failed.
*/
-public class TcpDiscoveryStatusCheckMessage extends
TcpDiscoveryAbstractMessage implements Message {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class TcpDiscoveryStatusCheckMessage extends
TcpDiscoveryAbstractMessage {
/** Status OK. */
public static final int STATUS_OK = 1;
@@ -125,7 +121,6 @@ public class TcpDiscoveryStatusCheckMessage extends
TcpDiscoveryAbstractMessage
this.status = status;
}
-
/** {@inheritDoc} */
@Override public boolean equals(Object obj) {
// NOTE!
