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 3df16a103b75c..b82a317515ef3 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 @@ -19,7 +19,9 @@ import java.io.Serializable; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.spi.discovery.DiscoverySpiMutableCustomMessageSupport; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; import org.jetbrains.annotations.Nullable; @@ -88,8 +90,11 @@ public interface DiscoveryCustomMessage extends Serializable { /** * @return {@code True} if message can be modified during listener notification. Changes will be sent to next nodes. + * @see DiscoverySpiMutableCustomMessageSupport */ - public boolean isMutable(); + default boolean isMutable() { + return false; + } /** * @return {@code True} if message should not be sent to others nodes after it was processed on coordinator. @@ -105,6 +110,9 @@ public default boolean stopProcess() { * @param topVer New topology version. * @param discoCache Current discovery cache. * @return Reused discovery cache. + * @see GridCacheProcessor#onCustomEvent */ - public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, DiscoCache discoCache); + default DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, DiscoCache discoCache) { + throw new UnsupportedOperationException(); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java index c186fe02a1a70..e2401ce61226b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java @@ -23,15 +23,15 @@ import org.apache.ignite.internal.Order; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageFactory; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.marshaller.Marshallers.jdk; /** Custom message wrapper with ID of security subject that initiated the current message. */ -public class SecurityAwareCustomMessageWrapper extends DiscoverySpiCustomMessage implements Message { +public class SecurityAwareCustomMessageWrapper implements DiscoveryCustomMessage, Message { /** */ private static final long serialVersionUID = 0L; @@ -88,6 +88,11 @@ public DiscoveryCustomMessage delegate() { return msg != null ? (DiscoveryCustomMessage)msg : delegate; } + /** {@inheritDoc} */ + @Override public IgniteUuid id() { + return null; + } + /** {@inheritDoc} */ @Override public @Nullable DiscoveryCustomMessage ackMessage() { DiscoveryCustomMessage ack = delegate().ackMessage(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java index c0b49fefb2fae..bda470bb5fae6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAcceptedMessage.java @@ -19,10 +19,7 @@ import org.apache.ignite.internal.Order; import org.apache.ignite.internal.managers.communication.ErrorMessage; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -80,17 +77,6 @@ public UserAcceptedMessage() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @return User operation ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java index 1c8e44299e89a..9478f7130e464 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserProposedMessage.java @@ -18,11 +18,8 @@ package org.apache.ignite.internal.processors.authentication; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -76,17 +73,6 @@ public UserProposedMessage() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @return User operation. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java index 228bb1f171b96..f360a6acc70d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsClearMessage.java @@ -19,10 +19,7 @@ import java.util.Collection; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -76,17 +73,6 @@ private CacheStatisticsClearMessage(CacheStatisticsClearMessage msg) { return this.id; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** {@inheritDoc} */ @Nullable @Override public DiscoveryCustomMessage ackMessage() { return initial() ? new CacheStatisticsClearMessage(this) : null; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java index 308af19b0e95f..7864f566c4cb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStatisticsModeChangeMessage.java @@ -21,11 +21,8 @@ import java.util.Collections; import java.util.UUID; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -111,17 +108,6 @@ public CacheStatisticsModeChangeMessage(Collection caches, boolean enabl return initial() ? new CacheStatisticsModeChangeMessage(this) : null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @return Cache names. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java index 60f1cce3a110f..6f5640a23f696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDiscoveryMessage.java @@ -22,10 +22,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -167,17 +164,6 @@ public void updateTimeoutObject(ClientCacheUpdateTimeout updateTimeoutObj) { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ClientCacheChangeDiscoveryMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java index 918995b09671f..5a31a26a8ba2f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClientCacheChangeDummyDiscoveryMessage.java @@ -20,10 +20,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.security.SecurityContext; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; @@ -106,17 +103,6 @@ Set cachesToClose() { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ClientCacheChangeDummyDiscoveryMessage.class, this, 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 6b89424462b0d..2e70e956f07f0 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 @@ -77,11 +77,6 @@ public DynamicCacheChangeBatch(Collection reqs) { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, DiscoCache discoCache) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java index 764bd717d1cff..8d6c3d3310f91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeFailureMessage.java @@ -141,11 +141,6 @@ public IgniteCheckedException createFailureCompoundException() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public DiscoCache createDiscoCache( GridDiscoveryManager mgr, diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java index a36c5f30f1cae..6b1016ab1ef79 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/TxTimeoutOnPartitionMapExchangeChangeMessage.java @@ -19,10 +19,7 @@ import java.util.UUID; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -91,17 +88,6 @@ public TxTimeoutOnPartitionMapExchangeChangeMessage(UUID reqId, long timeout) { return isInit() ? new TxTimeoutOnPartitionMapExchangeChangeMessage(this) : null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * Gets request ID. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java index d079905ae7b00..d6451a2b3495a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java @@ -128,11 +128,6 @@ public void exchangeMessage(WalStateProposeMessage exchangeMsg) { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, DiscoCache discoCache) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java index 52392fdfd7ebf..7b26654040db3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveAcceptedMessage.java @@ -18,10 +18,7 @@ package org.apache.ignite.internal.processors.cache.binary; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -77,12 +74,6 @@ public MetadataRemoveAcceptedMessage() { return true; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** */ public int typeId() { return typeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java index 57aacddd75f12..580333bcb526f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java @@ -20,10 +20,7 @@ import java.util.UUID; import org.apache.ignite.internal.Order; import org.apache.ignite.internal.binary.BinaryMetadata; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -94,13 +91,6 @@ public MetadataRemoveProposedMessage(int typeId, UUID origNodeId) { return true; } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @param errMsg Error message caused this update to be rejected. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java index 0edbc2e67ae1e..fc9e1e5380b50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateAcceptedMessage.java @@ -17,10 +17,7 @@ package org.apache.ignite.internal.processors.cache.binary; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; @@ -80,12 +77,6 @@ public MetadataUpdateAcceptedMessage() {} return true; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** */ int acceptedVersion() { return acceptedVer; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java index 4da098ab1014c..b73be5f2c1300 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataUpdateProposedMessage.java @@ -20,10 +20,7 @@ import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryMetadata; import org.apache.ignite.internal.binary.BinaryMetadataHandler; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -133,12 +130,6 @@ public MetadataUpdateProposedMessage(BinaryMetadata metadata, UUID origNodeId) { return true; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @param err Error caused this update to be rejected. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java index 9f73c154db657..f2fa8ece1af6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java @@ -19,10 +19,7 @@ import java.util.UUID; import org.apache.ignite.cluster.ClusterState; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -103,17 +100,6 @@ public ClusterState state() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ChangeGlobalStateFinishMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java index 31a51c09dea7c..be4e628b18cdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java @@ -150,11 +150,6 @@ public void servicesDeploymentActions(ServiceDeploymentActions serviceDeployment return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public DiscoCache createDiscoCache( GridDiscoveryManager mgr, diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java index e9754d12cd966..eab346afd7bf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java @@ -18,12 +18,8 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; -import org.jetbrains.annotations.Nullable; /** * @@ -56,15 +52,4 @@ protected AbstractContinuousMessage(UUID id) { public UUID routineId() { return routineId; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java index 7af0559752b3c..e40815f31f469 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java @@ -17,10 +17,7 @@ package org.apache.ignite.internal.processors.marshaller; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -57,17 +54,6 @@ public class MappingAcceptedMessage implements DiscoveryCustomMessage { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** */ MarshallerMappingItem getMappingItem() { return item; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java index b4e13fba14bf0..33a2168c2262c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java @@ -18,10 +18,7 @@ package org.apache.ignite.internal.processors.marshaller; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -97,12 +94,6 @@ private enum ProposalStatus { return true; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** */ MarshallerMappingItem mappingItem() { return mappingItem; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java index 9008f8b72579e..e0fda7bb4bcc8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java @@ -18,10 +18,7 @@ package org.apache.ignite.internal.processors.metastorage.persistence; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -66,20 +63,6 @@ public String errorMessage() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache( - GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, - DiscoCache discoCache - ) { - throw new UnsupportedOperationException(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(DistributedMetaStorageUpdateAckMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 3b9e462200133..1d2cc6bc7bdd3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -18,10 +18,7 @@ package org.apache.ignite.internal.processors.metastorage.persistence; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -91,15 +88,6 @@ protected String errorMessage() { return true; } - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache( - GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, - DiscoCache discoCache - ) { - throw new UnsupportedOperationException("createDiscoCache"); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(DistributedMetaStorageUpdateMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java index fc4642aa51423..d4b7ef01a449b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaAbstractDiscoveryMessage.java @@ -20,10 +20,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.Order; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; import org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation; import org.apache.ignite.internal.util.tostring.GridToStringInclude; @@ -91,12 +88,6 @@ protected SchemaAbstractDiscoveryMessage(SchemaAbstractOperation op) { return id; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } - /** * @return Operation. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java index a0204816560eb..38a12f2dc5825 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java @@ -58,11 +58,6 @@ public SchemaFinishDiscoveryMessage(SchemaAbstractOperation op, boolean nop) { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public boolean exchange() { return false; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java index f474aa86b9a20..854bf3682268f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceChangeBatchRequest.java @@ -19,10 +19,7 @@ import java.util.Collection; import java.util.Collections; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; @@ -89,18 +86,6 @@ public void servicesDeploymentActions(ServiceDeploymentActions serviceDeployment return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - // No-op. - return null; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ServiceChangeBatchRequest.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java index 9225ea93676d9..3c4f1cc785da5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceClusterDeploymentResultBatch.java @@ -18,10 +18,7 @@ package org.apache.ignite.internal.processors.service; import java.util.Collection; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; 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; @@ -101,18 +98,6 @@ public void servicesDeploymentActions(ServiceDeploymentActions serviceDeployment return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - // No-op. - return null; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ServiceClusterDeploymentResultBatch.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java index 3522c463def21..eaca62e3594bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java @@ -20,10 +20,7 @@ import java.io.Serializable; import java.util.Map; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.distributed.DistributedProcess.DistributedProcessType; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -79,17 +76,6 @@ public FullMessage(UUID processId, DistributedProcessType type, Map res return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - return null; - } - /** @return Process id. */ public UUID processId() { return processId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java index 3106b25accebb..f98e2715aae28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/InitMessage.java @@ -77,11 +77,6 @@ public InitMessage(UUID procId, DistributedProcessType type, I req, boolean wait return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - /** {@inheritDoc} */ @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, DiscoCache discoCache) { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java index c512c2257b650..fd402fec530b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java @@ -18,10 +18,7 @@ package org.apache.ignite.spi.communication.tcp.internal; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -76,20 +73,6 @@ public int connectionIndex() { return null; } - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache( - GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, - DiscoCache discoCache - ) { - throw new UnsupportedOperationException("createDiscoCache"); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpConnectionRequestDiscoveryMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java deleted file mode 100644 index 661234b5a7ed8..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java +++ /dev/null @@ -1,44 +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; - -import org.apache.ignite.internal.managers.discovery.DiscoCache; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.lang.IgniteUuid; - -/** - * Message to send across ring. - * - * @see GridDiscoveryManager#sendCustomEvent(DiscoveryCustomMessage) - * TODO: Should be removed in https://issues.apache.org/jira/browse/IGNITE-27778 - */ -@Deprecated(forRemoval = true) -public abstract class DiscoverySpiCustomMessage implements DiscoveryCustomMessage { - /** {@inheritDoc} */ - @Override public IgniteUuid id() { - return null; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - return null; - } -} diff --git a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java index f19b39ea6bc5d..a71ab3010b4ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java +++ b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlerTriggeredTest.java @@ -125,10 +125,6 @@ static class ExchangeWorkerFailureTask extends SchemaExchangeWorkerTask { return null; } - @Override public boolean isMutable() { - return false; - } - @Override public short directType() { return 0; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationExceptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationExceptionTest.java index c90e8b39d4a16..e79af4f287aa4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationExceptionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IncompleteDeserializationExceptionTest.java @@ -22,7 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.UUID; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; @@ -102,17 +101,6 @@ private void readObject(ObjectInputStream in) throws IOException { @Override public @Nullable DiscoveryCustomMessage ackMessage() { return null; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - return null; - } } // Commented lines were used to prepare serialized object diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/OutboundIoMessageQueueSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/OutboundIoMessageQueueSizeTest.java index 92cc272d2cc04..c7d11d53ae7ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/OutboundIoMessageQueueSizeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/OutboundIoMessageQueueSizeTest.java @@ -23,10 +23,7 @@ import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.metric.impl.MaxValueMetric; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -175,16 +172,5 @@ private static class DummyCustomDiscoveryMessage implements DiscoveryCustomMessa @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/NodeSecurityContextPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/NodeSecurityContextPropagationTest.java index c2d9d2dc5fca3..ff19efb9c5fa2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/NodeSecurityContextPropagationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/NodeSecurityContextPropagationTest.java @@ -34,11 +34,8 @@ import org.apache.ignite.failure.StopNodeOrHaltFailureHandler; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.events.DiscoveryCustomEvent; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.DiscoverySpi; @@ -242,20 +239,6 @@ public abstract static class AbstractTestDiscoveryMessage implements DiscoveryCu @Override public @Nullable DiscoveryCustomMessage ackMessage() { return null; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache( - GridDiscoveryManager mgr, - AffinityTopologyVersion topVer, - DiscoCache discoCache - ) { - throw new UnsupportedOperationException(); - } } /** */ diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java index ef32bdd731828..a4025d614a152 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/FilterDataForClientNodeDiscoveryTest.java @@ -21,10 +21,8 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.managers.discovery.CustomEventListener; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -193,16 +191,5 @@ private static class MessageForServer implements DiscoveryServerOnlyCustomMessag @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - return null; - } } } diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java index 0d156464075ca..e388778cf1bd9 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java @@ -24,10 +24,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; @@ -311,17 +308,5 @@ private static class DummyCustomDiscoveryMessage implements DiscoveryCustomMessa @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, - DiscoCache discoCache) { - throw new UnsupportedOperationException(); - } } } - diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java index 29459ff7591d3..bbd95229decf2 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java @@ -20,13 +20,13 @@ import java.util.UUID; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** * */ -class ZkCommunicationErrorResolveFinishMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { +class ZkCommunicationErrorResolveFinishMessage implements DiscoveryCustomMessage, ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -49,18 +49,13 @@ class ZkCommunicationErrorResolveFinishMessage extends DiscoverySpiCustomMessage } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { + @Override public IgniteUuid id() { return null; } /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return null; } /** {@inheritDoc} */ diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java index 323e41bcf9bd2..a88f9936eea44 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java @@ -20,13 +20,13 @@ import java.util.UUID; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** * Zk Communication Error Resolve Start Message. */ -public class ZkCommunicationErrorResolveStartMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { +public class ZkCommunicationErrorResolveStartMessage implements DiscoveryCustomMessage, ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -41,18 +41,13 @@ public class ZkCommunicationErrorResolveStartMessage extends DiscoverySpiCustomM } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { + @Override public IgniteUuid id() { return null; } /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return null; } /** {@inheritDoc} */ diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java index a4db36079e8f0..a44629c075596 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkDiscoveryCustomEventData.java @@ -20,7 +20,6 @@ import java.util.UUID; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; /** * @@ -39,7 +38,7 @@ class ZkDiscoveryCustomEventData extends ZkDiscoveryEventData { final String evtPath; /** Message instance (can be marshalled as part of ZkDiscoveryCustomEventData or stored in separate znode. */ - DiscoverySpiCustomMessage msg; + DiscoveryCustomMessage msg; /** Unmarshalled message. */ transient DiscoveryCustomMessage resolvedMsg; @@ -57,7 +56,7 @@ class ZkDiscoveryCustomEventData extends ZkDiscoveryEventData { long origEvtId, long topVer, UUID sndNodeId, - DiscoverySpiCustomMessage msg, + DiscoveryCustomMessage msg, String evtPath ) { super(evtId, ZK_EVT_CUSTOM_EVT, topVer); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java index 025d7afa46ff0..7f5aa4e54cdc3 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java @@ -19,13 +19,13 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** * Zk Force Node Fail Message. */ -public class ZkForceNodeFailMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { +public class ZkForceNodeFailMessage implements DiscoveryCustomMessage, ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -45,18 +45,13 @@ public class ZkForceNodeFailMessage extends DiscoverySpiCustomMessage implements } /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { + @Override public IgniteUuid id() { return null; } /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return null; } /** {@inheritDoc} */ diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java index 0079ab11b71fd..e738f1c7ee7f1 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkNoServersMessage.java @@ -19,13 +19,13 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** * */ -class ZkNoServersMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { +class ZkNoServersMessage implements DiscoveryCustomMessage, ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -35,13 +35,8 @@ class ZkNoServersMessage extends DiscoverySpiCustomMessage implements ZkInternal } /** {@inheritDoc} */ - @Override public boolean isMutable() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; + @Override public IgniteUuid id() { + return null; } /** {@inheritDoc} */