From 5904ca3218a01f498c5b24771e9838742f57098b Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Thu, 22 Jan 2026 11:37:21 +0300 Subject: [PATCH 1/6] IGNITE-27776 Simplify custom messages hierarchy --- .../discovery/CustomMessageWrapper.java | 68 ------------------- .../discovery/DiscoveryCustomMessage.java | 9 ++- .../discovery/GridDiscoveryManager.java | 12 ++-- .../SecurityAwareCustomMessageWrapper.java | 31 +++++++-- .../reader/StandaloneNoopDiscoverySpi.java | 4 +- .../spi/discovery/DiscoveryNotification.java | 7 +- .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../discovery/DiscoverySpiCustomMessage.java | 37 ++++------ ...scoverySpiMutableCustomMessageSupport.java | 5 +- .../isolated/IsolatedDiscoverySpi.java | 6 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 17 +++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 19 +++--- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 +- .../TcpDiscoveryCustomEventMessage.java | 15 ++-- ...DiscoveryServerOnlyCustomEventMessage.java | 4 +- .../resources/META-INF/classnames.properties | 1 - .../internal/DiscoverySpiTestListener.java | 11 ++- .../binary/BinaryMarshallerSelfTest.java | 6 +- .../client/thin/ServiceAwarenessTest.java | 14 ++-- .../IgniteDiscoverySpiInternalListener.java | 3 +- .../ClientSlowDiscoveryAbstractTest.java | 7 +- ...eMarshallerCacheClassNameConflictTest.java | 3 +- ...shallerCacheClientRequestsMappingTest.java | 56 +++++++-------- .../IgniteMarshallerCacheFSRestoreTest.java | 3 +- .../binary/BinaryMetadataRemoveTest.java | 9 +-- ...ridBinaryCacheEntryMemorySizeSelfTest.java | 4 +- ...IgniteSequentialNodeCrashRecoveryTest.java | 6 +- .../snapshot/AbstractSnapshotSelfTest.java | 24 +++---- .../IncrementalSnapshotJoiningClientTest.java | 9 +-- .../IgniteNoCustomEventsOnNodeStart.java | 6 +- .../schema/IndexWithSameNameTestBase.java | 9 ++- .../NodeSecurityContextPropagationTest.java | 7 +- .../ServiceConcurrentUndeployTest.java | 13 ++-- .../ServiceDeploymentProcessAbstractTest.java | 6 +- .../DiscoverySpiDataExchangeTest.java | 3 +- .../discovery/tcp/BlockTcpDiscoverySpi.java | 12 ++-- ...cpDiscoveryPendingMessageDeliveryTest.java | 3 +- .../discovery/tcp/TcpDiscoverySelfTest.java | 6 +- .../discovery/tcp/TestTcpDiscoverySpi.java | 4 +- .../ignite/testframework/GridTestUtils.java | 35 +++++----- .../junits/GridAbstractTest.java | 4 +- .../junits/GridTestBinaryMarshaller.java | 4 +- .../cache/BinaryTypeRegistrationTest.java | 13 ++-- .../CacheRegisterMetadataLocallyTest.java | 13 ++-- .../processors/query/KillQueryTest.java | 36 +++++----- .../processors/query/RunningQueriesTest.java | 46 ++++++------- .../discovery/zk/ZookeeperDiscoverySpi.java | 4 +- ...ommunicationErrorResolveFinishMessage.java | 5 +- ...CommunicationErrorResolveStartMessage.java | 5 +- .../internal/ZkDiscoveryCustomEventData.java | 3 +- .../zk/internal/ZkForceNodeFailMessage.java | 5 +- .../zk/internal/ZkNoServersMessage.java | 5 +- .../zk/internal/ZookeeperDiscoveryImpl.java | 20 +++--- ...ZookeeperDiscoverySpiTestConfigurator.java | 4 +- 55 files changed, 298 insertions(+), 374 deletions(-) delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java deleted file mode 100644 index 29aa940ecf24a..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java +++ /dev/null @@ -1,68 +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.internal.managers.discovery; - -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; -import org.jetbrains.annotations.Nullable; - -/** - * - */ -public class CustomMessageWrapper implements DiscoverySpiCustomMessage { - /** */ - private static final long serialVersionUID = 0L; - - /** */ - private final DiscoveryCustomMessage delegate; - - /** - * @param delegate Delegate. - */ - public CustomMessageWrapper(DiscoveryCustomMessage delegate) { - this.delegate = delegate; - } - - /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { - DiscoveryCustomMessage res = delegate.ackMessage(); - - return res == null ? null : new CustomMessageWrapper(res); - } - - /** {@inheritDoc} */ - @Override public boolean isMutable() { - return delegate.isMutable(); - } - - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return delegate.stopProcess(); - } - - /** - * @return Delegate. - */ - public DiscoveryCustomMessage delegate() { - return delegate; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return delegate.toString(); - } -} 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 c3cd0aba66c0d..ec05bf3d4a8d7 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 @@ -20,7 +20,6 @@ import java.io.Serializable; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; import org.jetbrains.annotations.Nullable; @@ -93,9 +92,13 @@ public interface DiscoveryCustomMessage extends Serializable { public boolean isMutable(); /** - * See {@link DiscoverySpiCustomMessage#stopProcess()}. + * Called on discovery coordinator node after listener is notified. If returns {@code true} + * then message is not passed to others nodes, if after this method {@link #ackMessage()} returns non-null ack + * message, it is sent to all nodes. * - * @return {@code True} if message should not be sent to others nodes after it was processed on coordinator. + * Note: this method is used then and only then the zookeeper discovery is configured. + * + * @return {@code True} if message should not be sent to all nodes. */ public default boolean stopProcess() { return false; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index f3b93fe947e51..b1f296c74e1b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -132,7 +132,6 @@ import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider; import org.apache.ignite.spi.discovery.DiscoveryNotification; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport; import org.apache.ignite.spi.discovery.DiscoverySpiListener; @@ -593,8 +592,11 @@ private void onDiscovery0(DiscoveryNotification notification) { ClusterNode node = notification.getNode(); long topVer = notification.getTopVer(); - DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : ((CustomMessageWrapper)notification.getCustomMsgData()).delegate(); + DiscoveryCustomMessage customData = notification.getCustomMsgData() == null ? null : + notification.getCustomMsgData(); + + DiscoveryCustomMessage customMsg = customData instanceof SecurityAwareCustomMessageWrapper ? + ((SecurityAwareCustomMessageWrapper)customData).delegate() : customData; if (skipMessage(notification.type(), customMsg)) return; @@ -933,7 +935,7 @@ public SecurityAwareNotificationTask(DiscoveryNotification notification) { /** */ @Override public void run() { - DiscoverySpiCustomMessage customMsg = notification.getCustomMsgData(); + DiscoveryCustomMessage customMsg = notification.getCustomMsgData(); if (customMsg instanceof SecurityAwareCustomMessageWrapper) { UUID secSubjId = ((SecurityAwareCustomMessageWrapper)customMsg).securitySubjectId(); @@ -2336,7 +2338,7 @@ public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteCheckedExce getSpi().sendCustomEvent(security.enabled() ? new SecurityAwareCustomMessageWrapper(msg, security.securityContext().subject().id()) - : new CustomMessageWrapper(msg)); + : msg); } catch (IgniteClientDisconnectedException e) { IgniteFuture reconnectFut = ctx.cluster().clientReconnectFuture(); 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 49ecd2e518e34..1b1b8ce62f10e 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 @@ -21,18 +21,20 @@ import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.jetbrains.annotations.Nullable; -/** Extends {@link CustomMessageWrapper} with ID of security subject that initiated the current message. */ -public class SecurityAwareCustomMessageWrapper extends CustomMessageWrapper { +/** Custom message wrapper with ID of security subject that initiated the current message. */ +public class SecurityAwareCustomMessageWrapper extends DiscoverySpiCustomMessage { /** */ private static final long serialVersionUID = 0L; /** Security subject ID. */ private final UUID secSubjId; + /** Original message. */ + private final DiscoveryCustomMessage delegate; + /** */ public SecurityAwareCustomMessageWrapper(DiscoveryCustomMessage delegate, UUID secSubjId) { - super(delegate); - + this.delegate = delegate; this.secSubjId = secSubjId; } @@ -42,8 +44,25 @@ public UUID securitySubjectId() { } /** {@inheritDoc} */ - @Override public @Nullable DiscoverySpiCustomMessage ackMessage() { - DiscoveryCustomMessage ack = delegate().ackMessage(); + @Override public boolean isMutable() { + return delegate.isMutable(); + } + + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return delegate.stopProcess(); + } + + /** + * @return Delegate. + */ + public DiscoveryCustomMessage delegate() { + return delegate; + } + + /** {@inheritDoc} */ + @Override public @Nullable DiscoveryCustomMessage ackMessage() { + DiscoveryCustomMessage ack = delegate.ackMessage(); return ack == null ? null : new SecurityAwareCustomMessageWrapper(ack, secSubjId); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneNoopDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneNoopDiscoverySpi.java index 3946c4fd2a8d2..3dd6d0b5f457d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneNoopDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneNoopDiscoverySpi.java @@ -23,13 +23,13 @@ import java.util.UUID; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiNoop; import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.DiscoverySpiNodeAuthenticator; @@ -101,7 +101,7 @@ public class StandaloneNoopDiscoverySpi extends IgniteSpiAdapter implements Disc } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java index 6dc38c1c60d85..d06564d1b8a92 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java @@ -19,6 +19,7 @@ import java.util.Collection; import java.util.NavigableMap; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.tracing.messages.SpanContainer; import org.jetbrains.annotations.Nullable; @@ -42,7 +43,7 @@ public class DiscoveryNotification { private @Nullable NavigableMap> topHist; /** Custom message data. */ - private @Nullable DiscoverySpiCustomMessage customMsgData; + private @Nullable DiscoveryCustomMessage customMsgData; /** Span container. */ private SpanContainer spanContainer; @@ -75,7 +76,7 @@ public DiscoveryNotification( ClusterNode node, Collection topSnapshot, @Nullable NavigableMap> topHist, - @Nullable DiscoverySpiCustomMessage customMsgData, + @Nullable DiscoveryCustomMessage customMsgData, SpanContainer spanContainer ) { this.eventType = eventType; @@ -125,7 +126,7 @@ public NavigableMap> getTopHist() { /** * @return Custom message data. */ - public DiscoverySpiCustomMessage getCustomMsgData() { + public DiscoveryCustomMessage getCustomMsgData() { return customMsgData; } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java index 545e1a043e733..3d51a2fc3bf06 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java @@ -23,6 +23,7 @@ import java.util.UUID; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.spi.IgniteSpi; import org.apache.ignite.spi.IgniteSpiException; @@ -153,7 +154,7 @@ public interface DiscoverySpi extends IgniteSpi { * @param msg Custom message. * @throws IgniteException if failed to sent the event message. */ - public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException; + public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException; /** * Initiates failure of provided node. 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 index 6e11673d8e2c8..563771672c51d 100644 --- 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 @@ -17,37 +17,26 @@ package org.apache.ignite.spi.discovery; -import java.io.Serializable; +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.jetbrains.annotations.Nullable; +import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.lang.IgniteUuid; /** * Message to send across ring. * * @see GridDiscoveryManager#sendCustomEvent(DiscoveryCustomMessage) */ -public interface DiscoverySpiCustomMessage extends Serializable { - /** - * Called when custom message has been handled by all nodes. - * - * @return Ack message or {@code null} if ack is not required. - */ - @Nullable public DiscoverySpiCustomMessage ackMessage(); +public abstract class DiscoverySpiCustomMessage implements DiscoveryCustomMessage { + /** {@inheritDoc} */ + @Override public IgniteUuid id() { + return null; + } - /** - * @return {@code True} if message can be modified during listener notification. Changes will be send to next nodes. - */ - public boolean isMutable(); - - /** - * Called on discovery coordinator node after listener is notified. If returns {@code true} - * then message is not passed to others nodes, if after this method {@link #ackMessage()} returns non-null ack - * message, it is sent to all nodes. - * - * Note: this method is used then and only then the zookeeper discovery is configured. - * - * @return {@code True} if message should not be sent to all nodes. - */ - public boolean stopProcess(); + /** {@inheritDoc} */ + @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion topVer, + DiscoCache discoCache) { + return null; + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java index e7952682cb7da..ccd2fe1978bd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java @@ -23,10 +23,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; /** * This annotation is for all implementations of {@link DiscoverySpi} that support - * topology mutable {@link DiscoverySpiCustomMessage}s. + * topology mutable {@link DiscoveryCustomMessage}s. */ @Documented @Inherited @@ -34,7 +35,7 @@ @Target({ElementType.TYPE}) public @interface DiscoverySpiMutableCustomMessageSupport { /** - * @return Whether or not target SPI supports mutable {@link DiscoverySpiCustomMessage}s. + * @return Whether or not target SPI supports mutable {@link DiscoveryCustomMessage}s. */ public boolean value(); } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedDiscoverySpi.java index 1e0d02019fbb8..9e00dd311a9d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/isolated/IsolatedDiscoverySpi.java @@ -30,6 +30,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteProductVersion; @@ -41,7 +42,6 @@ import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider; import org.apache.ignite.spi.discovery.DiscoveryNotification; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport; import org.apache.ignite.spi.discovery.DiscoverySpiListener; @@ -159,7 +159,7 @@ public class IsolatedDiscoverySpi extends IgniteSpiAdapter implements IgniteDisc } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { exec.execute(() -> { IgniteFuture fut = lsnr.onDiscovery(new DiscoveryNotification( EVT_DISCOVERY_CUSTOM_EVT, @@ -172,7 +172,7 @@ public class IsolatedDiscoverySpi extends IgniteSpiAdapter implements IgniteDisc // Acknowledge message must be send after initial message processed. fut.listen((f) -> { - DiscoverySpiCustomMessage ack = msg.ackMessage(); + DiscoveryCustomMessage ack = msg.ackMessage(); if (ack != null) { exec.execute(() -> lsnr.onDiscovery(new DiscoveryNotification( diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 2e96845ff0332..c2821f72c4fa6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -65,8 +65,9 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.IgniteNodeAttributes; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; +import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.tracing.Span; import org.apache.ignite.internal.processors.tracing.SpanTags; import org.apache.ignite.internal.processors.tracing.messages.SpanContainer; @@ -89,7 +90,6 @@ import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper; import org.apache.ignite.spi.IgniteSpiThread; import org.apache.ignite.spi.discovery.DiscoveryNotification; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; @@ -492,7 +492,7 @@ else if (state == DISCONNECTED) { } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) { + @Override public void sendCustomEvent(DiscoveryCustomMessage evt) { State state = this.state; if (state == DISCONNECTED) @@ -504,7 +504,10 @@ else if (state == DISCONNECTED) { try { TcpDiscoveryCustomEventMessage msg; - if (((CustomMessageWrapper)evt).delegate() instanceof DiscoveryServerOnlyCustomMessage) + DiscoveryCustomMessage customMsg = evt instanceof SecurityAwareCustomMessageWrapper ? + ((SecurityAwareCustomMessageWrapper)evt).delegate() : evt; + + if (customMsg instanceof DiscoveryServerOnlyCustomMessage) msg = new TcpDiscoveryServerOnlyCustomEventMessage(getLocalNodeId(), evt, U.marshal(spi.marshaller(), evt)); else @@ -515,7 +518,7 @@ else if (state == DISCONNECTED) { .addTag(SpanTags.tag(SpanTags.EVENT_NODE, SpanTags.ID), () -> getLocalNodeId().toString()) .addTag(SpanTags.tag(SpanTags.EVENT_NODE, SpanTags.CONSISTENT_ID), () -> locNode.consistentId().toString()) - .addTag(SpanTags.MESSAGE_CLASS, () -> ((CustomMessageWrapper)evt).delegate().getClass().getSimpleName()) + .addTag(SpanTags.MESSAGE_CLASS, () -> customMsg.getClass().getSimpleName()) .addLog(() -> "Created"); // This root span will be parent both from local and remote nodes. @@ -2597,7 +2600,7 @@ private void processCustomMessage(TcpDiscoveryCustomEventMessage msg) { if (node != null && node.visible()) { try { - DiscoverySpiCustomMessage msgObj = msg.message(spi.marshaller(), + DiscoveryCustomMessage msgObj = msg.message(spi.marshaller(), U.resolveClassLoader(spi.ignite().configuration())); notifyDiscovery( @@ -2693,7 +2696,7 @@ private void notifyDiscovery( long topVer, ClusterNode node, Collection top, - @Nullable DiscoverySpiCustomMessage data, + @Nullable DiscoveryCustomMessage data, SpanContainer spanContainer ) { DiscoverySpiListener lsnr = spi.lsnr; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 2f6d431fa9a4b..0ddc4a3f94586 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -78,8 +78,9 @@ import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.events.DiscoveryCustomEvent; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; +import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.configuration.distributed.DistributedBooleanProperty; import org.apache.ignite.internal.processors.failure.FailureProcessor; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; @@ -120,7 +121,6 @@ import org.apache.ignite.spi.IgniteSpiThread; import org.apache.ignite.spi.discovery.DiscoveryDataBag; import org.apache.ignite.spi.discovery.DiscoveryNotification; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; @@ -1017,11 +1017,14 @@ private void interruptPing(TcpDiscoveryNode node) { } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) { + @Override public void sendCustomEvent(DiscoveryCustomMessage evt) { try { TcpDiscoveryCustomEventMessage msg; - if (((CustomMessageWrapper)evt).delegate() instanceof DiscoveryServerOnlyCustomMessage) + DiscoveryCustomMessage customMsg = evt instanceof SecurityAwareCustomMessageWrapper ? + ((SecurityAwareCustomMessageWrapper)evt).delegate() : evt; + + if (customMsg instanceof DiscoveryServerOnlyCustomMessage) msg = new TcpDiscoveryServerOnlyCustomEventMessage(getLocalNodeId(), evt, U.marshal(spi.marshaller(), evt)); else @@ -1032,7 +1035,7 @@ private void interruptPing(TcpDiscoveryNode node) { .addTag(SpanTags.tag(SpanTags.EVENT_NODE, SpanTags.ID), () -> getLocalNodeId().toString()) .addTag(SpanTags.tag(SpanTags.EVENT_NODE, SpanTags.CONSISTENT_ID), () -> locNode.consistentId().toString()) - .addTag(SpanTags.MESSAGE_CLASS, () -> ((CustomMessageWrapper)evt).delegate().getClass().getSimpleName()) + .addTag(SpanTags.MESSAGE_CLASS, () -> customMsg.getClass().getSimpleName()) .addLog(() -> "Created"); // This root span will be parent both from local and remote nodes. @@ -6046,7 +6049,7 @@ private void processCustomMessage(TcpDiscoveryCustomEventMessage msg, boolean wa else { addMessage(new TcpDiscoveryDiscardMessage(getLocalNodeId(), msg.id(), true)); - DiscoverySpiCustomMessage msgObj = null; + DiscoveryCustomMessage msgObj = null; try { msgObj = msg.message(spi.marshaller(), U.resolveClassLoader(spi.ignite().configuration())); @@ -6056,7 +6059,7 @@ private void processCustomMessage(TcpDiscoveryCustomEventMessage msg, boolean wa } if (msgObj != null) { - DiscoverySpiCustomMessage nextMsg = msgObj.ackMessage(); + DiscoveryCustomMessage nextMsg = msgObj.ackMessage(); if (nextMsg != null) { try { @@ -6234,7 +6237,7 @@ private void notifyDiscoveryListener(TcpDiscoveryCustomEventMessage msg, boolean if (node == null) return; - DiscoverySpiCustomMessage msgObj; + DiscoveryCustomMessage msgObj; try { msgObj = msg.message(spi.marshaller(), U.resolveClassLoader(spi.ignite().configuration())); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index e115a3cca03b1..aa7dc4a63226e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -37,6 +37,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.ClusterMetricsSnapshot; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.CacheMetricsSnapshot; import org.apache.ignite.internal.processors.cluster.CacheMetricsMessage; import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage; @@ -49,7 +50,6 @@ import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiThread; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientNodesMetricsMessage; @@ -281,7 +281,7 @@ protected void onMessageExchanged() { * @param msg Message. * @throws IgniteException If failed. */ - public abstract void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException; + public abstract void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException; /** * @param nodeId Node id. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index c748fee183243..0d99d795a195a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -57,6 +57,7 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.managers.communication.IgniteMessageFactoryImpl; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.failure.FailureProcessor; @@ -91,7 +92,6 @@ import org.apache.ignite.spi.discovery.DiscoveryDataBag; import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport; import org.apache.ignite.spi.discovery.DiscoverySpiListener; @@ -537,7 +537,7 @@ public ClusterNode getNode0(UUID id) { } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { impl.sendCustomEvent(msg); } 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 cd1b90b348c94..73ac084a3f1ec 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 @@ -20,12 +20,11 @@ import java.util.Objects; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IncompleteDeserializationException; 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.spi.discovery.DiscoverySpiCustomMessage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +38,7 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractTraceabl private static final long serialVersionUID = 0L; /** */ - private transient volatile DiscoverySpiCustomMessage msg; + private transient volatile DiscoveryCustomMessage msg; /** */ private byte[] msgBytes; @@ -49,7 +48,7 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractTraceabl * @param msg Message. * @param msgBytes Serialized message. */ - public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, @Nullable DiscoverySpiCustomMessage msg, + public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, @Nullable DiscoveryCustomMessage msg, @NotNull byte[] msgBytes) { super(creatorNodeId); @@ -64,7 +63,7 @@ public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, @Nullable DiscoverySpi public TcpDiscoveryCustomEventMessage(TcpDiscoveryCustomEventMessage msg) { super(msg); - this.msgBytes = msg.msgBytes; + msgBytes = msg.msgBytes; this.msg = msg.msg; } @@ -86,7 +85,7 @@ public byte[] messageBytes() { * @param msg Message. * @param msgBytes Serialized message. */ - public void message(@Nullable DiscoverySpiCustomMessage msg, @NotNull byte[] msgBytes) { + public void message(@Nullable DiscoveryCustomMessage msg, @NotNull byte[] msgBytes) { this.msg = msg; this.msgBytes = msgBytes; } @@ -97,7 +96,7 @@ public void message(@Nullable DiscoverySpiCustomMessage msg, @NotNull byte[] msg * @return Deserialized message, * @throws java.lang.Throwable if unmarshal failed. */ - @Nullable public DiscoverySpiCustomMessage message(@NotNull Marshaller marsh, ClassLoader ldr) throws Throwable { + @Nullable public DiscoveryCustomMessage message(@NotNull Marshaller marsh, ClassLoader ldr) throws Throwable { if (msg == null) { try { msg = U.unmarshal(marsh, msgBytes, ldr); @@ -105,7 +104,7 @@ public void message(@Nullable DiscoverySpiCustomMessage msg, @NotNull byte[] msg catch (IgniteCheckedException e) { // Try to resurrect a message in a case of deserialization failure if (e.getCause() instanceof IncompleteDeserializationException) - return new CustomMessageWrapper(((IncompleteDeserializationException)e.getCause()).message()); + return ((IncompleteDeserializationException)e.getCause()).message(); throw e; } 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 97f701ed6e832..15122f1e50b03 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 @@ -18,7 +18,7 @@ package org.apache.ignite.spi.discovery.tcp.messages; import java.util.UUID; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.jetbrains.annotations.NotNull; /** @@ -34,7 +34,7 @@ public class TcpDiscoveryServerOnlyCustomEventMessage extends TcpDiscoveryCustom * @param msg Message. * @param msgBytes Serialized message. */ - public TcpDiscoveryServerOnlyCustomEventMessage(UUID creatorNodeId, @NotNull DiscoverySpiCustomMessage msg, + public TcpDiscoveryServerOnlyCustomEventMessage(UUID creatorNodeId, @NotNull DiscoveryCustomMessage msg, @NotNull byte[] msgBytes) { super(creatorNodeId, msg, msgBytes); } diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index a6b3f0122c071..dd613bffcd75d 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -719,7 +719,6 @@ org.apache.ignite.internal.managers.deployment.GridDeploymentPerVersionStore$2 org.apache.ignite.internal.managers.deployment.GridDeploymentRequest org.apache.ignite.internal.managers.deployment.GridDeploymentResponse org.apache.ignite.internal.managers.deployment.P2PClassNotFoundException -org.apache.ignite.internal.managers.discovery.CustomMessageWrapper org.apache.ignite.internal.managers.discovery.DiscoCache$1 org.apache.ignite.internal.managers.discovery.DiscoCache$2 org.apache.ignite.internal.managers.discovery.DiscoCache$3 diff --git a/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java b/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java index 01a3955c09aa7..fc9be4ef43a98 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.testframework.GridTestUtils; /** @@ -52,7 +51,7 @@ public class DiscoverySpiTestListener implements IgniteDiscoverySpiInternalListe private final Object mux = new Object(); /** */ - private List blockedMsgs = new ArrayList<>(); + private List blockedMsgs = new ArrayList<>(); /** */ private volatile DiscoverySpi spi; @@ -121,13 +120,13 @@ public void stopBlockRestart() { } /** {@inheritDoc} */ - @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoverySpiCustomMessage msg) { + @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoveryCustomMessage msg) { this.spi = spi; this.log = log; synchronized (mux) { if (blockCustomEvtCls != null) { - DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate"); + DiscoveryCustomMessage msg0 = GridTestUtils.unwrap(msg); if (blockCustomEvtCls.contains(msg0.getClass())) { log.info("Block custom message: " + msg0); @@ -176,7 +175,7 @@ public void stopBlockCustomEvents() { if (spi == null) return; - List msgs; + List msgs; synchronized (this) { msgs = new ArrayList<>(blockedMsgs); @@ -186,7 +185,7 @@ public void stopBlockCustomEvents() { blockedMsgs.clear(); } - for (DiscoverySpiCustomMessage msg : msgs) { + for (DiscoveryCustomMessage msg : msgs) { log.info("Resend blocked message: " + msg); spi.sendCustomEvent(msg); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java index dcc49c013e433..308b390cef171 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java @@ -85,6 +85,7 @@ import org.apache.ignite.internal.binary.streams.BinaryOutputStream; import org.apache.ignite.internal.binary.streams.BinaryStreams; import org.apache.ignite.internal.binary.streams.BinaryStreamsTestUtils; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; import org.apache.ignite.internal.managers.systemview.JmxSystemViewExporterSpi; @@ -100,7 +101,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.GridTestKernalContext; @@ -4159,7 +4159,7 @@ protected BinaryMarshaller binaryMarshaller( iCfg.setBinaryConfiguration(bCfg); iCfg.setClientMode(false); iCfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { //No-op. } }); @@ -4217,7 +4217,7 @@ protected BinaryObjectBuilder builder( iCfg.setBinaryConfiguration(bCfg); iCfg.setClientMode(false); iCfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { //No-op. } }); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java index 5c87c1819db3d..fc8f20cfe9e5e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java @@ -49,7 +49,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.client.thin.io.ClientConnectionMultiplexer; import org.apache.ignite.internal.managers.communication.GridMessageListener; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.service.GridServiceProxy; @@ -60,8 +59,8 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.services.ServiceConfiguration; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.ListeningTestLogger; import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger; import org.apache.logging.log4j.Level; @@ -646,13 +645,14 @@ private static final class TestBlockingDiscoverySpi extends TcpDiscoverySpi { private final Set> toBlock = new HashSet<>(); /** */ - private final List blocked = new CopyOnWriteArrayList<>(); + private final List blocked = new CopyOnWriteArrayList<>(); /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (msg instanceof CustomMessageWrapper - && toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(((CustomMessageWrapper)msg).delegate().getClass()))) { - blocked.add((CustomMessageWrapper)msg); + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(msg); + + if (toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(realMsg.getClass()))) { + blocked.add(msg); return; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteDiscoverySpiInternalListener.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteDiscoverySpiInternalListener.java index 6b25e9ff5d995..3d0a267a2ff79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteDiscoverySpiInternalListener.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteDiscoverySpiInternalListener.java @@ -20,7 +20,6 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; /** * For TESTING only. @@ -46,5 +45,5 @@ public default void beforeReconnect(ClusterNode locNode, IgniteLogger log) { * @param msg Custom message. * @return {@code False} to cancel event send. */ - public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoverySpiCustomMessage msg); + public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoveryCustomMessage msg); } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java index a31feaffb66a3..1bb34bdef7ee3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java @@ -23,17 +23,16 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.TestRecordingCommunicationSpi; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -99,12 +98,12 @@ static class CustomMessageInterceptingDiscoverySpi extends TcpDiscoverySpi { DiscoveryCustomMessage delegate; try { - DiscoverySpiCustomMessage custMsg = cm.message(marshaller(), + DiscoveryCustomMessage custMsg = cm.message(marshaller(), U.resolveClassLoader(ignite().configuration())); assertNotNull(custMsg); - delegate = ((CustomMessageWrapper)custMsg).delegate(); + delegate = GridTestUtils.unwrap(custMsg); } catch (Throwable throwable) { throw new RuntimeException(throwable); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java index 67ff9fafa198b..7cb454e6d9ad0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java @@ -36,6 +36,7 @@ import org.apache.ignite.spi.discovery.DiscoveryNotification; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; import org.junit.Test; @@ -199,7 +200,7 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { DiscoveryNotification notification ) { DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : (DiscoveryCustomMessage)U.field(notification.getCustomMsgData(), "delegate"); + : GridTestUtils.unwrap(notification.getCustomMsgData()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java index c485ac9441739..9460c1bedf9a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.TestRecordingCommunicationSpi; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage; import org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree; @@ -43,7 +42,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.plugin.extensions.communication.Message; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -163,25 +161,23 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoverySpiCustomMessage custom = + DiscoveryCustomMessage custom = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - if (custom instanceof CustomMessageWrapper) { - DiscoveryCustomMessage delegate = ((CustomMessageWrapper)custom).delegate(); - - if (delegate instanceof MappingAcceptedMessage) { - MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "item"); - - if (item.className().equals(PERSON_CLASS_NAME) || - item.className().equals(ORGANIZATION_CLASS_NAME) || - item.className().equals(ADDRESS_CLASS_NAME) - ) { - try { - U.await(delayMappingLatch, AWAIT_PROCESSING_TIMEOUT_MS, TimeUnit.MILLISECONDS); - } - catch (Exception e) { - fail("Mapping proposed message must be released."); - } + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(custom); + + if (delegate instanceof MappingAcceptedMessage) { + MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "item"); + + if (item.className().equals(PERSON_CLASS_NAME) || + item.className().equals(ORGANIZATION_CLASS_NAME) || + item.className().equals(ADDRESS_CLASS_NAME) + ) { + try { + U.await(delayMappingLatch, AWAIT_PROCESSING_TIMEOUT_MS, TimeUnit.MILLISECONDS); + } + catch (Exception e) { + fail("Mapping proposed message must be released."); } } } @@ -240,22 +236,20 @@ public void testBinaryMetaDelayedForComputeJobResult() throws Exception { @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoverySpiCustomMessage custom = + DiscoveryCustomMessage custom = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - if (custom instanceof CustomMessageWrapper) { - DiscoveryCustomMessage delegate = ((CustomMessageWrapper)custom).delegate(); + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(custom); - if (delegate instanceof MappingProposedMessage) { - MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "mappingItem"); + if (delegate instanceof MappingProposedMessage) { + MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "mappingItem"); - if (item.className().contains(JOB_RESULT_CLASS_NAME_PREFIX)) { - try { - U.await(latch, AWAIT_PROCESSING_TIMEOUT_MS, TimeUnit.MILLISECONDS); - } - catch (Exception e) { - fail("Exception must never be thrown: " + e.getMessage()); - } + if (item.className().contains(JOB_RESULT_CLASS_NAME_PREFIX)) { + try { + U.await(latch, AWAIT_PROCESSING_TIMEOUT_MS, TimeUnit.MILLISECONDS); + } + catch (Exception e) { + fail("Exception must never be thrown: " + e.getMessage()); } } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java index 8dc02770f9d6a..2ee750e97697e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java @@ -41,6 +41,7 @@ import org.apache.ignite.spi.discovery.DiscoveryNotification; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; import org.junit.Test; @@ -247,7 +248,7 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { DiscoveryNotification notification ) { DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : (DiscoveryCustomMessage)U.field(notification.getCustomMsgData(), "delegate"); + : GridTestUtils.unwrap(notification.getCustomMsgData()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java index 7a8193f3b1270..420cf01d0338c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveTest.java @@ -31,10 +31,8 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -184,14 +182,11 @@ public void testChangeMetaWhenTypeRemoving() throws Exception { AtomicBoolean hookMsgs = new AtomicBoolean(true); discoveryHook = new GridTestUtils.DiscoveryHook() { - @Override public void beforeDiscovery(DiscoverySpiCustomMessage msg) { + @Override public void beforeDiscovery(DiscoveryCustomMessage msg) { if (!hookMsgs.get()) return; - DiscoveryCustomMessage customMsg = msg == null ? null - : (DiscoveryCustomMessage)IgniteUtils.field(msg, "delegate"); - - if (customMsg instanceof MetadataRemoveProposedMessage) { + if (msg instanceof MetadataRemoveProposedMessage) { try { barrier0.await(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java index 15910a33d19aa..f359db9fc7a04 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; import org.apache.ignite.internal.managers.systemview.JmxSystemViewExporterSpi; @@ -28,7 +29,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.systemview.view.SystemView; import org.apache.ignite.testframework.junits.GridTestKernalContext; @@ -43,7 +43,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory IgniteConfiguration iCfg = new IgniteConfiguration(); iCfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { // No-op. } }); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java index dc4f15bd07b78..9bdb211943d19 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java @@ -43,7 +43,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.IgnitionEx; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.pagemem.PageIdAllocator; @@ -67,7 +66,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; @@ -357,7 +355,7 @@ public BlockingDiscoverySpi(IgnitePredicate blockPred) { /** */ private DiscoveryCustomMessage extractCustomMessage(TcpDiscoveryCustomEventMessage msg) { - DiscoverySpiCustomMessage msgObj = null; + DiscoveryCustomMessage msgObj = null; try { msgObj = msg.message(marshaller(), U.resolveClassLoader(ignite().configuration())); @@ -366,7 +364,7 @@ private DiscoveryCustomMessage extractCustomMessage(TcpDiscoveryCustomEventMessa U.error(log, "Failed to unmarshal discovery custom message.", e); } - return ((CustomMessageWrapper)msgObj).delegate(); + return GridTestUtils.unwrap(msgObj); } /** Unblock discovery custom messages. */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java index 3a490545429c9..c8b4d55f81a54 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java @@ -68,7 +68,6 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.TestRecordingCommunicationSpi; import org.apache.ignite.internal.encryption.AbstractEncryptionTest; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.pagemem.wal.WALIterator; import org.apache.ignite.internal.pagemem.wal.record.IncrementalSnapshotFinishRecord; @@ -97,7 +96,6 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteFutureCancelledException; import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.encryption.keystore.KeystoreEncryptionSpi; import org.apache.ignite.testframework.GridTestUtils; @@ -910,24 +908,22 @@ protected static BlockingCustomMessageDiscoverySpi discoSpi(IgniteEx ignite) { /** */ protected static class BlockingCustomMessageDiscoverySpi extends TcpDiscoverySpi { /** List of messages which have been blocked. */ - private final List blocked = new CopyOnWriteArrayList<>(); + private final List blocked = new CopyOnWriteArrayList<>(); /** Discovery custom message filter. */ private volatile IgnitePredicate blockPred; /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (msg instanceof CustomMessageWrapper) { - DiscoveryCustomMessage msg0 = ((CustomMessageWrapper)msg).delegate(); + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage msg0 = GridTestUtils.unwrap(msg); - if (blockPred != null && blockPred.apply(msg0)) { - blocked.add(msg); + if (blockPred != null && blockPred.apply(msg0)) { + blocked.add(msg); - if (log.isInfoEnabled()) - log.info("Discovery message has been blocked: " + msg0); + if (log.isInfoEnabled()) + log.info("Discovery message has been blocked: " + msg0); - return; - } + return; } super.sendCustomEvent(msg); @@ -954,11 +950,11 @@ public synchronized void unblock() { /** Releases the blocked messages. */ private void releaseBlocked() { - List blocked = new CopyOnWriteArrayList<>(this.blocked); + List blocked = new CopyOnWriteArrayList<>(this.blocked); this.blocked.clear(); - for (DiscoverySpiCustomMessage msg : blocked) + for (DiscoveryCustomMessage msg : blocked) sendCustomEvent(msg); } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java index aaae9d6b9e270..a82d276e29a9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.TestRecordingCommunicationSpi; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.pagemem.wal.WALIterator; import org.apache.ignite.internal.pagemem.wal.record.IncrementalSnapshotFinishRecord; import org.apache.ignite.internal.pagemem.wal.record.WALRecord; @@ -43,6 +43,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.junit.Test; @@ -247,10 +248,10 @@ private static class CoordinatorBlockingDiscoverySpi extends TcpDiscoverySpi { TcpDiscoveryCustomEventMessage m = (TcpDiscoveryCustomEventMessage)msg; try { - CustomMessageWrapper m0 = (CustomMessageWrapper)m.message( - marshaller(), U.resolveClassLoader(ignite().configuration())); + DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(m.message(marshaller(), + U.resolveClassLoader(ignite().configuration()))); - if (m0.delegate() instanceof InitMessage) + if (realMsg instanceof InitMessage) rcvStartSnpReq.countDown(); } catch (Throwable e) { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java index 96e2b462fc289..e47f70cc85a0b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.processors.continuous; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.CacheAffinityChangeMessage; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -60,8 +60,8 @@ public void testNoCustomEventsOnStart() throws Exception { */ static class TestTcpDiscoverySpi extends TcpDiscoverySpi { /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) { - if (GridTestUtils.getFieldValue(msg, "delegate") instanceof CacheAffinityChangeMessage) + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) { + if (GridTestUtils.unwrap(msg) instanceof CacheAffinityChangeMessage) return; failed = true; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java index fce48f3bbbcc7..45fadc94a05a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java @@ -40,7 +40,6 @@ import org.apache.ignite.configuration.SqlConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.TestRecordingCommunicationSpi; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.query.GridQueryProcessor; import org.apache.ignite.internal.processors.query.schema.management.IndexDescriptor; @@ -50,10 +49,10 @@ import org.apache.ignite.internal.util.lang.ConsumerX; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -313,10 +312,10 @@ public static class SchemaFinishListeningTcpDiscoverySpi extends TcpDiscoverySpi @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoverySpiCustomMessage spiCustomMsg = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), - U.resolveClassLoader(ignite().configuration())); + TcpDiscoveryCustomEventMessage evtMsg = (TcpDiscoveryCustomEventMessage)msg; - DiscoveryCustomMessage discoCustomMsg = ((CustomMessageWrapper)spiCustomMsg).delegate(); + DiscoveryCustomMessage discoCustomMsg = GridTestUtils.unwrap(evtMsg.message(marshaller(), + U.gridClassLoader())); if (discoCustomMsg instanceof SchemaFinishDiscoveryMessage) { SchemaFinishDiscoveryMessage finishMsg = (SchemaFinishDiscoveryMessage)discoCustomMsg; 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 3480bbe2cbb1e..330bd2c4ac2fc 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 @@ -35,7 +35,6 @@ 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.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; @@ -44,13 +43,13 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -188,7 +187,7 @@ private boolean anyReceivedMessageMatch(IgniteEx ignite, Predicate predi Object unwrappedMsg = msg; if (msg instanceof TcpDiscoveryCustomEventMessage) { - DiscoverySpiCustomMessage customMsg = U.field(msg, "msg"); + DiscoveryCustomMessage customMsg = U.field(msg, "msg"); if (customMsg == null) { try { @@ -205,7 +204,7 @@ private boolean anyReceivedMessageMatch(IgniteEx ignite, Predicate predi assert customMsg instanceof SecurityAwareCustomMessageWrapper; - unwrappedMsg = ((CustomMessageWrapper)customMsg).delegate(); + unwrappedMsg = GridTestUtils.unwrap(customMsg); } if (predicate.test(unwrappedMsg)) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java index a040aca7cb1f3..bf5363b4e92aa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java @@ -26,11 +26,11 @@ import org.apache.ignite.internal.DiscoverySpiTestListener; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.service.inner.LongInitializedTestService; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -50,13 +50,14 @@ public class ServiceConcurrentUndeployTest extends GridCommonAbstractTest { TestTcpDiscoverySpi disco = new TestTcpDiscoverySpi(); disco.setInternalListener(new DiscoverySpiTestListener() { - @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoverySpiCustomMessage msg) { + @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoveryCustomMessage msg) { if (spi.isClientMode()) { - boolean isUndeployMsg = msg instanceof CustomMessageWrapper - && ((CustomMessageWrapper)msg).delegate() instanceof ServiceChangeBatchRequest; + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + + boolean isUndeployMsg = delegate instanceof ServiceChangeBatchRequest; if (isUndeployMsg) { - ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)((CustomMessageWrapper)msg).delegate(); + ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)delegate; long undeployReqCnt = batch.requests().stream() .filter(r -> r instanceof ServiceUndeploymentRequest) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java index 5b4dc2ae74eaa..c2d32241e0f36 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java @@ -22,10 +22,10 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.managers.communication.GridIoMessage; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; @@ -102,8 +102,8 @@ protected static class BlockingTcpDiscoverySpi extends TestTcpDiscoverySpi { private volatile boolean block; /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (block && GridTestUtils.getFieldValue(msg, "delegate") instanceof ServiceClusterDeploymentResultBatch) + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + if (block && GridTestUtils.unwrap(msg) instanceof ServiceClusterDeploymentResultBatch) return; super.sendCustomEvent(msg); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchangeTest.java index 30a7ec8029837..9cffa43b9220a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchangeTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.lang.IgniteProductVersion; @@ -153,7 +154,7 @@ private class DelegatedDiscoverySpi extends IgniteSpiAdapter implements IgniteDi } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { delegate.sendCustomEvent(msg); } diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java index f72eac9999460..658446a2ac196 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java @@ -21,13 +21,12 @@ import java.net.Socket; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiClosure; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; +import org.apache.ignite.testframework.GridTestUtils; import static org.junit.Assert.assertNotNull; @@ -55,22 +54,19 @@ private synchronized void apply(ClusterNode addr, TcpDiscoveryAbstractMessage ms TcpDiscoveryCustomEventMessage cm = (TcpDiscoveryCustomEventMessage)msg; - DiscoveryCustomMessage delegate; + DiscoveryCustomMessage custMsg; try { - DiscoverySpiCustomMessage custMsg = cm.message(marshaller(), U.resolveClassLoader(ignite().configuration())); + custMsg = cm.message(marshaller(), U.resolveClassLoader(ignite().configuration())); assertNotNull(custMsg); - - delegate = ((CustomMessageWrapper)custMsg).delegate(); - } catch (Throwable throwable) { throw new RuntimeException(throwable); } if (clo != null) - clo.apply(addr, delegate); + clo.apply(addr, GridTestUtils.unwrap(custMsg)); } /** {@inheritDoc} */ 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 15cb1f903827d..0d156464075ca 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,7 +24,6 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; @@ -238,7 +237,7 @@ public void testDeliveryAllFailedMessagesInCorrectOrder() throws Exception { * @param id Message id. */ private void sendDummyCustomMessage(TcpDiscoverySpi disco, IgniteUuid id) { - disco.sendCustomEvent(new CustomMessageWrapper(new DummyCustomDiscoveryMessage(id))); + disco.sendCustomEvent(new DummyCustomDiscoveryMessage(id)); } /** diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 999c7c747c35e..29f4ba51bb583 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -2607,8 +2607,10 @@ private static class TestCustomerEventAckSpi extends TcpDiscoverySpi { if (stopBeforeSndAck) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoveryCustomMessage custMsg = GridTestUtils.getFieldValue( - ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()), "delegate"); + TcpDiscoveryCustomEventMessage evtMsg = (TcpDiscoveryCustomEventMessage)msg; + + DiscoveryCustomMessage custMsg = GridTestUtils.unwrap(evtMsg.message(marshaller(), + U.gridClassLoader())); if (custMsg instanceof StartRoutineAckDiscoveryMessage) { log.info("Skip message send and stop node: " + msg); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TestTcpDiscoverySpi.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TestTcpDiscoverySpi.java index e3038bf5dc6a7..336c853706021 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TestTcpDiscoverySpi.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TestTcpDiscoverySpi.java @@ -20,8 +20,8 @@ import java.io.IOException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage; @@ -73,7 +73,7 @@ public class TestTcpDiscoverySpi extends TcpDiscoverySpi implements IgniteDiscov } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { IgniteDiscoverySpiInternalListener internalLsnr = this.internalLsnr; if (internalLsnr != null) { diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 62e450ee10c39..fba1bfd022a5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -94,8 +94,8 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter; @@ -126,7 +126,6 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.communication.tcp.internal.GridNioServerWrapper; import org.apache.ignite.spi.discovery.DiscoveryNotification; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.ssl.SslContextFactory; import org.apache.ignite.testframework.config.GridTestProperties; @@ -182,9 +181,8 @@ public static class DiscoveryHook { * * @param msg Intercepted discovery message. */ - public void beforeDiscovery(DiscoverySpiCustomMessage msg) { - if (msg instanceof CustomMessageWrapper) - beforeDiscovery(unwrap((CustomMessageWrapper)msg)); + public void beforeDiscovery0(DiscoveryCustomMessage msg) { + beforeDiscovery(unwrap(msg)); } /** @@ -201,9 +199,8 @@ public void beforeDiscovery(DiscoveryCustomMessage customMsg) { * * @param msg Intercepted discovery message. */ - public void afterDiscovery(DiscoverySpiCustomMessage msg) { - if (msg instanceof CustomMessageWrapper) - afterDiscovery(unwrap((CustomMessageWrapper)msg)); + public void afterDiscovery0(DiscoveryCustomMessage msg) { + afterDiscovery(unwrap(msg)); } /** @@ -221,16 +218,16 @@ public void afterDiscovery(DiscoveryCustomMessage customMsg) { public void ignite(IgniteEx ignite) { // No-op. } + } - /** - * Obtains {@link DiscoveryCustomMessage} from {@link CustomMessageWrapper}. - * - * @param wrapper Wrapper of {@link DiscoveryCustomMessage}. - * @return Unwrapped {@link DiscoveryCustomMessage}. - */ - private DiscoveryCustomMessage unwrap(CustomMessageWrapper wrapper) { - return U.field(wrapper, "delegate"); - } + /** + * Unwraps messsage if it is wrapped by {@link SecurityAwareCustomMessageWrapper}. + * + * @param msg Message. + */ + public static DiscoveryCustomMessage unwrap(DiscoveryCustomMessage msg) { + return msg instanceof SecurityAwareCustomMessageWrapper ? + ((SecurityAwareCustomMessageWrapper)msg).delegate() : msg; } /** @@ -254,11 +251,11 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate, DiscoveryHook /** {@inheritDoc} */ @Override public IgniteFuture onDiscovery(DiscoveryNotification notification) { - hook.beforeDiscovery(notification.getCustomMsgData()); + hook.beforeDiscovery0(notification.getCustomMsgData()); IgniteFuture fut = delegate.onDiscovery(notification); - fut.listen(f -> hook.afterDiscovery(notification.getCustomMsgData())); + fut.listen(f -> hook.afterDiscovery0(notification.getCustomMsgData())); return fut; } diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 0a4bce9e44a89..410dc4259468a 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -84,6 +84,7 @@ import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.binary.BinaryUtils; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.systemview.JmxSystemViewExporterSpi; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheGroupContext; @@ -113,7 +114,6 @@ import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -647,7 +647,7 @@ protected GridTestKernalContext newContext() throws IgniteCheckedException { cfg.setClientMode(false); cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { // No-op. } }); diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java index ff9af51975fe1..524c2d6f257a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java @@ -26,10 +26,10 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.binary.BinaryUtils; import org.apache.ignite.internal.binary.GridBinaryMarshaller; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; /** */ @@ -68,7 +68,7 @@ private BinaryMarshaller createBinaryMarshaller(IgniteLogger log) throws IgniteC ) .setClientMode(false) .setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { //No-op. } }); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java index 92b47624466f7..ff770b0d8ec9f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java @@ -27,10 +27,10 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataUpdateProposedMessage; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -48,10 +48,11 @@ public class BinaryTypeRegistrationTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (msg instanceof CustomMessageWrapper - && ((CustomMessageWrapper)msg).delegate() instanceof MetadataUpdateProposedMessage) - metadataUpdateProposedMessages.add(((CustomMessageWrapper)msg).delegate()); + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + + if (delegate instanceof MetadataUpdateProposedMessage) + metadataUpdateProposedMessages.add(delegate); super.sendCustomEvent(msg); } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java index f7c079b48a5f5..4d9a353cc2ffa 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.managers.communication.GridIoMessage; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage; @@ -39,10 +38,10 @@ import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -70,13 +69,11 @@ public class CacheRegisterMetadataLocallyTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (msg instanceof CustomMessageWrapper) { - DiscoveryCustomMessage realMsg = ((CustomMessageWrapper)msg).delegate(); + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(msg); - if (realMsg instanceof MetadataUpdateProposedMessage || realMsg instanceof MetadataUpdateAcceptedMessage) - customMessages.add(realMsg); - } + if (realMsg instanceof MetadataUpdateProposedMessage || realMsg instanceof MetadataUpdateAcceptedMessage) + customMessages.add(realMsg); super.sendCustomEvent(msg); } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java index 70847fabff366..413a701d7ec66 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java @@ -65,7 +65,6 @@ import org.apache.ignite.internal.TestRecordingCommunicationSpi; import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.communication.GridMessageListener; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; @@ -81,7 +80,6 @@ import org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -195,26 +193,24 @@ public static Iterable valuesForAsync() { clientBlocker = commSpi; cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (msg instanceof CustomMessageWrapper) { - DiscoveryCustomMessage delegate = ((CustomMessageWrapper)msg).delegate(); - - if (delegate instanceof DynamicCacheChangeBatch) { - try { - awaitTimeout(); - } - catch (Exception e) { - log.error(e.getMessage(), e); - } + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + if (delegate instanceof DynamicCacheChangeBatch) { + try { + awaitTimeout(); } - else if (delegate instanceof SchemaProposeDiscoveryMessage) { - try { - awaitTimeout(); - } - catch (Exception e) { - log.error(e.getMessage(), e); - } + catch (Exception e) { + log.error(e.getMessage(), e); + } + + } + else if (delegate instanceof SchemaProposeDiscoveryMessage) { + try { + awaitTimeout(); + } + catch (Exception e) { + log.error(e.getMessage(), e); } } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java index 5bc65cbebc98e..b641585018c00 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java @@ -47,7 +47,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.managers.communication.GridIoMessage; -import org.apache.ignite.internal.managers.discovery.CustomMessageWrapper; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicFullUpdateRequest; @@ -60,7 +59,6 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; @@ -168,30 +166,28 @@ public class RunningQueriesTest extends AbstractIndexingCommonTest { cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - if (CustomMessageWrapper.class.isAssignableFrom(msg.getClass())) { - DiscoveryCustomMessage delegate = ((CustomMessageWrapper)msg).delegate(); - - if (DynamicCacheChangeBatch.class.isAssignableFrom(delegate.getClass())) { - ((DynamicCacheChangeBatch)delegate).requests().stream() - .filter((c) -> !c.cacheName().equalsIgnoreCase("default")) - .findAny() - .ifPresent((c) -> { - try { - awaitTimeout(); - } - catch (Exception e) { - e.printStackTrace(); - } - }); + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { + DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + + if (DynamicCacheChangeBatch.class.isAssignableFrom(delegate.getClass())) { + ((DynamicCacheChangeBatch)delegate).requests().stream() + .filter((c) -> !c.cacheName().equalsIgnoreCase("default")) + .findAny() + .ifPresent((c) -> { + try { + awaitTimeout(); + } + catch (Exception e) { + e.printStackTrace(); + } + }); + } + else if (SchemaProposeDiscoveryMessage.class.isAssignableFrom(delegate.getClass())) { + try { + awaitTimeout(); } - else if (SchemaProposeDiscoveryMessage.class.isAssignableFrom(delegate.getClass())) { - try { - awaitTimeout(); - } - catch (Exception e) { - e.printStackTrace(); - } + catch (Exception e) { + e.printStackTrace(); } } diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index c439dce3708fc..f7a9431405e6d 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -30,6 +30,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; import org.apache.ignite.internal.util.tostring.GridToStringExclude; @@ -49,7 +50,6 @@ import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport; import org.apache.ignite.spi.discovery.DiscoverySpiListener; @@ -404,7 +404,7 @@ public DiscoverySpiNodeAuthenticator getAuthenticator() { } /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) { impl.sendCustomMessage(msg); } 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 9b7476c5355f5..29459ff7591d3 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 @@ -18,6 +18,7 @@ package org.apache.ignite.spi.discovery.zk.internal; 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.jetbrains.annotations.Nullable; @@ -25,7 +26,7 @@ /** * */ -class ZkCommunicationErrorResolveFinishMessage implements DiscoverySpiCustomMessage, ZkInternalMessage { +class ZkCommunicationErrorResolveFinishMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -48,7 +49,7 @@ class ZkCommunicationErrorResolveFinishMessage implements DiscoverySpiCustomMess } /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } 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 0c79c36aee0a9..323e41bcf9bd2 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 @@ -18,6 +18,7 @@ package org.apache.ignite.spi.discovery.zk.internal; 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.jetbrains.annotations.Nullable; @@ -25,7 +26,7 @@ /** * Zk Communication Error Resolve Start Message. */ -public class ZkCommunicationErrorResolveStartMessage implements DiscoverySpiCustomMessage, ZkInternalMessage { +public class ZkCommunicationErrorResolveStartMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -40,7 +41,7 @@ public class ZkCommunicationErrorResolveStartMessage implements DiscoverySpiCust } /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } 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 60a36c5adb952..a4db36079e8f0 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 @@ -18,6 +18,7 @@ package org.apache.ignite.spi.discovery.zk.internal; 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; @@ -41,7 +42,7 @@ class ZkDiscoveryCustomEventData extends ZkDiscoveryEventData { DiscoverySpiCustomMessage msg; /** Unmarshalled message. */ - transient DiscoverySpiCustomMessage resolvedMsg; + transient DiscoveryCustomMessage resolvedMsg; /** * @param evtId Event ID. 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 de7291c0d453c..025d7afa46ff0 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 @@ -17,6 +17,7 @@ package org.apache.ignite.spi.discovery.zk.internal; +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.jetbrains.annotations.Nullable; @@ -24,7 +25,7 @@ /** * Zk Force Node Fail Message. */ -public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, ZkInternalMessage { +public class ZkForceNodeFailMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; @@ -44,7 +45,7 @@ public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, ZkInte } /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } 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 626fe742d1c1b..0079ab11b71fd 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 @@ -17,6 +17,7 @@ package org.apache.ignite.spi.discovery.zk.internal; +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.jetbrains.annotations.Nullable; @@ -24,12 +25,12 @@ /** * */ -class ZkNoServersMessage implements DiscoverySpiCustomMessage, ZkInternalMessage { +class ZkNoServersMessage extends DiscoverySpiCustomMessage implements ZkInternalMessage { /** */ private static final long serialVersionUID = 0L; /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; } diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index 37039dd028b32..a6c9a952c90a9 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -62,6 +62,7 @@ import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.events.DiscoveryCustomEvent; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.security.SecurityContext; import org.apache.ignite.internal.util.GridLongList; import org.apache.ignite.internal.util.GridSpinBusyLock; @@ -82,7 +83,6 @@ import org.apache.ignite.spi.IgniteSpiTimeoutObject; import org.apache.ignite.spi.discovery.DiscoveryDataBag; import org.apache.ignite.spi.discovery.DiscoveryNotification; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.DiscoverySpiNodeAuthenticator; @@ -649,7 +649,7 @@ public boolean knownNode(UUID nodeId) { /** * @param msg Message. */ - public void sendCustomMessage(DiscoverySpiCustomMessage msg) { + public void sendCustomMessage(DiscoveryCustomMessage msg) { assert msg != null; List nodes = rtState.top.topologySnapshot(); @@ -2469,7 +2469,7 @@ private void generateCustomEvents(List customEvtNodes) throws Exception if (sndNode != null) { byte[] evtBytes = readCustomEventData(zkClient, evtPath, sndNodeId); - DiscoverySpiCustomMessage msg; + DiscoveryCustomMessage msg; try { msg = unmarshalZip(evtBytes); @@ -2500,7 +2500,7 @@ private void generateCustomEvents(List customEvtNodes) throws Exception */ private void generateAndProcessCustomEventOnCoordinator(String evtPath, ZookeeperClusterNode sndNode, - DiscoverySpiCustomMessage msg + DiscoveryCustomMessage msg ) throws Exception { ZookeeperClient zkClient = rtState.zkClient; ZkDiscoveryEventsData evtsData = rtState.evtsData; @@ -2585,7 +2585,7 @@ else if (msg instanceof ZkCommunicationErrorResolveStartMessage) { evtsData.evtIdGen--; - DiscoverySpiCustomMessage ack = msg.ackMessage(); + DiscoveryCustomMessage ack = msg.ackMessage(); if (ack != null) { evtData = createAckEvent(ack, evtData); @@ -2746,7 +2746,7 @@ private void processNewEvents(final ZkDiscoveryEventsData evtsData) throws Excep if (evtData0.ackEvent() && evtData0.topologyVersion() < locNode.order()) break; - DiscoverySpiCustomMessage msg; + DiscoveryCustomMessage msg; if (rtState.crd) { assert evtData0.resolvedMsg != null : evtData0; @@ -3508,7 +3508,7 @@ public void simulateNodeFailure() { * @param evtData Event data. * @param msg Custom message. */ - private void notifyCustomEvent(final ZkDiscoveryCustomEventData evtData, final DiscoverySpiCustomMessage msg) { + private void notifyCustomEvent(final ZkDiscoveryCustomEventData evtData, final DiscoveryCustomMessage msg) { assert !(msg instanceof ZkInternalMessage) : msg; if (log.isDebugEnabled()) @@ -3714,7 +3714,7 @@ private void handleProcessedEvents(String ctx) throws Exception { } case ZkDiscoveryEventData.ZK_EVT_CUSTOM_EVT: { - DiscoverySpiCustomMessage ack = handleProcessedCustomEvent(ctx, + DiscoveryCustomMessage ack = handleProcessedCustomEvent(ctx, (ZkDiscoveryCustomEventData)evtData); if (ack != null) { @@ -3762,7 +3762,7 @@ private void handleProcessedEvents(String ctx) throws Exception { * @throws Exception If failed. */ private ZkDiscoveryCustomEventData createAckEvent( - DiscoverySpiCustomMessage ack, + DiscoveryCustomMessage ack, ZkDiscoveryCustomEventData origEvt) throws Exception { assert ack != null; @@ -3885,7 +3885,7 @@ private void deleteDataForJoinedAsync(ZkDiscoveryNodeJoinEventData evtData) { * @return Ack message. * @throws Exception If failed. */ - @Nullable private DiscoverySpiCustomMessage handleProcessedCustomEvent(String ctx, ZkDiscoveryCustomEventData evtData) + @Nullable private DiscoveryCustomMessage handleProcessedCustomEvent(String ctx, ZkDiscoveryCustomEventData evtData) throws Exception { if (log.isDebugEnabled()) log.debug("All nodes processed custom event [ctx=" + ctx + ", evtData=" + evtData + ']'); diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java index 8a2f4e6c84c24..259dd2f6c2a91 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java @@ -22,9 +22,9 @@ import org.apache.curator.test.TestingCluster; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.IgniteDiscoverySpiInternalListenerSupport; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.config.GridTestProperties; @@ -96,7 +96,7 @@ private static class TestZookeeperDiscoverySpi extends ZookeeperDiscoverySpi imp private volatile IgniteDiscoverySpiInternalListener internalLsnr; /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) { IgniteDiscoverySpiInternalListener internalLsnr = this.internalLsnr; if (internalLsnr != null && !internalLsnr.beforeSendCustomEvent(this, log, msg)) From bb4cdee0bb0f3ca11c9310846e1ee2d5ec812482 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Mon, 9 Feb 2026 11:02:27 +0300 Subject: [PATCH 2/6] IGNITE-27776 Simplify custom messages hierarchy --- .../discovery/DiscoveryCustomMessage.java | 8 +------ .../discovery/DiscoverySpiCustomMessage.java | 2 ++ .../client/thin/ServiceAwarenessTest.java | 4 +--- .../IncrementalSnapshotJoiningClientTest.java | 6 ++--- .../ServiceConcurrentUndeployTest.java | 8 ++----- .../ignite/testframework/GridTestUtils.java | 22 ++----------------- .../cache/BinaryTypeRegistrationTest.java | 6 ++--- 7 files changed, 13 insertions(+), 43 deletions(-) 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 ec05bf3d4a8d7..3df16a103b75c 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 @@ -92,13 +92,7 @@ public interface DiscoveryCustomMessage extends Serializable { public boolean isMutable(); /** - * Called on discovery coordinator node after listener is notified. If returns {@code true} - * then message is not passed to others nodes, if after this method {@link #ackMessage()} returns non-null ack - * message, it is sent to all nodes. - * - * Note: this method is used then and only then the zookeeper discovery is configured. - * - * @return {@code True} if message should not be sent to all nodes. + * @return {@code True} if message should not be sent to others nodes after it was processed on coordinator. */ public default boolean stopProcess() { return false; 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 index 563771672c51d..964fa8f3cd979 100644 --- 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 @@ -27,7 +27,9 @@ * Message to send across ring. * * @see GridDiscoveryManager#sendCustomEvent(DiscoveryCustomMessage) + * TODO: Should be removed in https://issues.apache.org/jira/browse/IGNITE-27778 */ +@Deprecated public abstract class DiscoverySpiCustomMessage implements DiscoveryCustomMessage { /** {@inheritDoc} */ @Override public IgniteUuid id() { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java index fc8f20cfe9e5e..0080bf7d9a9db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java @@ -649,9 +649,7 @@ private static final class TestBlockingDiscoverySpi extends TcpDiscoverySpi { /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(msg); - - if (toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(realMsg.getClass()))) { + if (toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(GridTestUtils.unwrap(msg).getClass()))) { blocked.add(msg); return; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java index a82d276e29a9f..221320462a499 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java @@ -248,10 +248,10 @@ private static class CoordinatorBlockingDiscoverySpi extends TcpDiscoverySpi { TcpDiscoveryCustomEventMessage m = (TcpDiscoveryCustomEventMessage)msg; try { - DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(m.message(marshaller(), - U.resolveClassLoader(ignite().configuration()))); + DiscoveryCustomMessage m0 = m.message( + marshaller(), U.resolveClassLoader(ignite().configuration())); - if (realMsg instanceof InitMessage) + if (GridTestUtils.unwrap(m0) instanceof InitMessage) rcvStartSnpReq.countDown(); } catch (Throwable e) { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java index bf5363b4e92aa..b87ecc2295ab5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java @@ -52,12 +52,8 @@ public class ServiceConcurrentUndeployTest extends GridCommonAbstractTest { disco.setInternalListener(new DiscoverySpiTestListener() { @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoveryCustomMessage msg) { if (spi.isClientMode()) { - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); - - boolean isUndeployMsg = delegate instanceof ServiceChangeBatchRequest; - - if (isUndeployMsg) { - ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)delegate; + if (GridTestUtils.unwrap(msg) instanceof ServiceChangeBatchRequest) { + ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)GridTestUtils.unwrap(msg); long undeployReqCnt = batch.requests().stream() .filter(r -> r instanceof ServiceUndeploymentRequest) diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index fba1bfd022a5f..76800566d668f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -176,15 +176,6 @@ public static GridAbsClosure noop() { * and thus allows to make assertions or other actions like skipping certain discovery messages. */ public static class DiscoveryHook { - /** - * Handles discovery message before {@link DiscoverySpiListener#onDiscovery} invocation. - * - * @param msg Intercepted discovery message. - */ - public void beforeDiscovery0(DiscoveryCustomMessage msg) { - beforeDiscovery(unwrap(msg)); - } - /** * Handles {@link DiscoveryCustomMessage} before {@link DiscoverySpiListener#onDiscovery} invocation. * @@ -194,15 +185,6 @@ public void beforeDiscovery(DiscoveryCustomMessage customMsg) { // No-op. } - /** - * Handles discovery message after {@link DiscoverySpiListener#onDiscovery} completion. - * - * @param msg Intercepted discovery message. - */ - public void afterDiscovery0(DiscoveryCustomMessage msg) { - afterDiscovery(unwrap(msg)); - } - /** * Handles {@link DiscoveryCustomMessage} after {@link DiscoverySpiListener#onDiscovery} completion. * @@ -251,11 +233,11 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate, DiscoveryHook /** {@inheritDoc} */ @Override public IgniteFuture onDiscovery(DiscoveryNotification notification) { - hook.beforeDiscovery0(notification.getCustomMsgData()); + hook.beforeDiscovery(unwrap(notification.getCustomMsgData())); IgniteFuture fut = delegate.onDiscovery(notification); - fut.listen(f -> hook.afterDiscovery0(notification.getCustomMsgData())); + fut.listen(f -> hook.afterDiscovery(unwrap(notification.getCustomMsgData()))); return fut; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java index ff770b0d8ec9f..0ac48e7f36716 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java @@ -49,10 +49,8 @@ public class BinaryTypeRegistrationTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); - - if (delegate instanceof MetadataUpdateProposedMessage) - metadataUpdateProposedMessages.add(delegate); + if (GridTestUtils.unwrap(msg) instanceof MetadataUpdateProposedMessage) + metadataUpdateProposedMessages.add(GridTestUtils.unwrap(msg)); super.sendCustomEvent(msg); } From 71809dfd27496383b48cbed4baf07d0221dab468 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Thu, 19 Feb 2026 16:55:26 +0300 Subject: [PATCH 3/6] Move unwrap to IgniteUtils --- .../managers/discovery/GridDiscoveryManager.java | 7 ++----- .../apache/ignite/internal/util/IgniteUtils.java | 12 ++++++++++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +--- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +--- .../ignite/internal/DiscoverySpiTestListener.java | 3 +-- .../client/thin/ServiceAwarenessTest.java | 3 +-- .../cache/ClientSlowDiscoveryAbstractTest.java | 3 +-- ...gniteMarshallerCacheClassNameConflictTest.java | 3 +-- ...eMarshallerCacheClientRequestsMappingTest.java | 4 ++-- .../cache/IgniteMarshallerCacheFSRestoreTest.java | 3 +-- .../db/IgniteSequentialNodeCrashRecoveryTest.java | 2 +- .../snapshot/AbstractSnapshotSelfTest.java | 2 +- .../IncrementalSnapshotJoiningClientTest.java | 3 +-- .../IgniteNoCustomEventsOnNodeStart.java | 4 ++-- .../query/schema/IndexWithSameNameTestBase.java | 3 +-- .../NodeSecurityContextPropagationTest.java | 3 +-- .../service/ServiceConcurrentUndeployTest.java | 6 +++--- .../ServiceDeploymentProcessAbstractTest.java | 4 ++-- .../spi/discovery/tcp/BlockTcpDiscoverySpi.java | 3 +-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +- .../ignite/testframework/GridTestUtils.java | 15 ++------------- .../cache/BinaryTypeRegistrationTest.java | 6 +++--- .../cache/CacheRegisterMetadataLocallyTest.java | 4 ++-- .../internal/processors/query/KillQueryTest.java | 3 ++- .../processors/query/RunningQueriesTest.java | 3 ++- 25 files changed, 48 insertions(+), 61 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index b1f296c74e1b7..c3507b2c5cc8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -592,11 +592,8 @@ private void onDiscovery0(DiscoveryNotification notification) { ClusterNode node = notification.getNode(); long topVer = notification.getTopVer(); - DiscoveryCustomMessage customData = notification.getCustomMsgData() == null ? null : - notification.getCustomMsgData(); - - DiscoveryCustomMessage customMsg = customData instanceof SecurityAwareCustomMessageWrapper ? - ((SecurityAwareCustomMessageWrapper)customData).delegate() : customData; + DiscoveryCustomMessage customMsg = U.unwrapCustomMessage(notification.getCustomMsgData() == null ? + null : notification.getCustomMsgData()); if (skipMessage(notification.type(), customMsg)) return; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 3c46f6397969c..762f46f1e9612 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -187,7 +187,9 @@ import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo; +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.mxbean.IgniteStandardMXBean; import org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper; import org.apache.ignite.internal.processors.cache.CacheObjectContext; @@ -8305,4 +8307,14 @@ public static IgniteDataTransferObjectSeria return (IgniteDataTransferObjectSerializer)EMPTY_DTO_SERIALIZER; } } + + /** + * Unwraps messsage if it is wrapped by {@link SecurityAwareCustomMessageWrapper}. + * + * @param msg Message. + */ + public static DiscoveryCustomMessage unwrapCustomMessage(DiscoveryCustomMessage msg) { + return msg instanceof SecurityAwareCustomMessageWrapper ? + ((SecurityAwareCustomMessageWrapper)msg).delegate() : msg; + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index c2821f72c4fa6..d0f7592f5aac2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -67,7 +67,6 @@ import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; -import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.tracing.Span; import org.apache.ignite.internal.processors.tracing.SpanTags; import org.apache.ignite.internal.processors.tracing.messages.SpanContainer; @@ -504,8 +503,7 @@ else if (state == DISCONNECTED) { try { TcpDiscoveryCustomEventMessage msg; - DiscoveryCustomMessage customMsg = evt instanceof SecurityAwareCustomMessageWrapper ? - ((SecurityAwareCustomMessageWrapper)evt).delegate() : evt; + DiscoveryCustomMessage customMsg = U.unwrapCustomMessage(evt); if (customMsg instanceof DiscoveryServerOnlyCustomMessage) msg = new TcpDiscoveryServerOnlyCustomEventMessage(getLocalNodeId(), evt, diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 0ddc4a3f94586..842da4fcccffa 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -80,7 +80,6 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryServerOnlyCustomMessage; -import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.configuration.distributed.DistributedBooleanProperty; import org.apache.ignite.internal.processors.failure.FailureProcessor; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; @@ -1021,8 +1020,7 @@ private void interruptPing(TcpDiscoveryNode node) { try { TcpDiscoveryCustomEventMessage msg; - DiscoveryCustomMessage customMsg = evt instanceof SecurityAwareCustomMessageWrapper ? - ((SecurityAwareCustomMessageWrapper)evt).delegate() : evt; + DiscoveryCustomMessage customMsg = U.unwrapCustomMessage(evt); if (customMsg instanceof DiscoveryServerOnlyCustomMessage) msg = new TcpDiscoveryServerOnlyCustomEventMessage(getLocalNodeId(), evt, diff --git a/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java b/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java index fc9be4ef43a98..465f7f78d474c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/DiscoverySpiTestListener.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; /** * Test callback for discovery SPI. @@ -126,7 +125,7 @@ public void stopBlockRestart() { synchronized (mux) { if (blockCustomEvtCls != null) { - DiscoveryCustomMessage msg0 = GridTestUtils.unwrap(msg); + DiscoveryCustomMessage msg0 = U.unwrapCustomMessage(msg); if (blockCustomEvtCls.contains(msg0.getClass())) { log.info("Block custom message: " + msg0); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java index 0080bf7d9a9db..77ae572bd0e1c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java @@ -60,7 +60,6 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.ListeningTestLogger; import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger; import org.apache.logging.log4j.Level; @@ -649,7 +648,7 @@ private static final class TestBlockingDiscoverySpi extends TcpDiscoverySpi { /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - if (toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(GridTestUtils.unwrap(msg).getClass()))) { + if (toBlock.stream().anyMatch(mt -> mt.isAssignableFrom(U.unwrapCustomMessage(msg).getClass()))) { blocked.add(msg); return; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java index 1bb34bdef7ee3..cf1871b1523ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClientSlowDiscoveryAbstractTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -103,7 +102,7 @@ static class CustomMessageInterceptingDiscoverySpi extends TcpDiscoverySpi { assertNotNull(custMsg); - delegate = GridTestUtils.unwrap(custMsg); + delegate = U.unwrapCustomMessage(custMsg); } catch (Throwable throwable) { throw new RuntimeException(throwable); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java index 7cb454e6d9ad0..3af58b7dd6a4e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java @@ -36,7 +36,6 @@ import org.apache.ignite.spi.discovery.DiscoveryNotification; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; import org.junit.Test; @@ -200,7 +199,7 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { DiscoveryNotification notification ) { DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : GridTestUtils.unwrap(notification.getCustomMsgData()); + : U.unwrapCustomMessage(notification.getCustomMsgData()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java index 9460c1bedf9a7..2244882ebc461 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java @@ -164,7 +164,7 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta DiscoveryCustomMessage custom = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(custom); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(custom); if (delegate instanceof MappingAcceptedMessage) { MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "item"); @@ -239,7 +239,7 @@ public void testBinaryMetaDelayedForComputeJobResult() throws Exception { DiscoveryCustomMessage custom = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(custom); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(custom); if (delegate instanceof MappingProposedMessage) { MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "mappingItem"); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java index 2ee750e97697e..4648b48c797b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java @@ -41,7 +41,6 @@ import org.apache.ignite.spi.discovery.DiscoveryNotification; import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; import org.junit.Test; @@ -248,7 +247,7 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { DiscoveryNotification notification ) { DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : GridTestUtils.unwrap(notification.getCustomMsgData()); + : U.unwrapCustomMessage(notification.getCustomMsgData()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java index 9bdb211943d19..724e2e106781c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java @@ -364,7 +364,7 @@ private DiscoveryCustomMessage extractCustomMessage(TcpDiscoveryCustomEventMessa U.error(log, "Failed to unmarshal discovery custom message.", e); } - return GridTestUtils.unwrap(msgObj); + return U.unwrapCustomMessage(msgObj); } /** Unblock discovery custom messages. */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java index c8b4d55f81a54..715b771d6116e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java @@ -915,7 +915,7 @@ protected static class BlockingCustomMessageDiscoverySpi extends TcpDiscoverySpi /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage msg0 = GridTestUtils.unwrap(msg); + DiscoveryCustomMessage msg0 = U.unwrapCustomMessage(msg); if (blockPred != null && blockPred.apply(msg0)) { blocked.add(msg); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java index 221320462a499..3de54f1f3ba95 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotJoiningClientTest.java @@ -43,7 +43,6 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.junit.Test; @@ -251,7 +250,7 @@ private static class CoordinatorBlockingDiscoverySpi extends TcpDiscoverySpi { DiscoveryCustomMessage m0 = m.message( marshaller(), U.resolveClassLoader(ignite().configuration())); - if (GridTestUtils.unwrap(m0) instanceof InitMessage) + if (U.unwrapCustomMessage(m0) instanceof InitMessage) rcvStartSnpReq.countDown(); } catch (Throwable e) { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java index e47f70cc85a0b..c94eab7a02fb2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java @@ -19,8 +19,8 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.CacheAffinityChangeMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -61,7 +61,7 @@ public void testNoCustomEventsOnStart() throws Exception { static class TestTcpDiscoverySpi extends TcpDiscoverySpi { /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage msg) { - if (GridTestUtils.unwrap(msg) instanceof CacheAffinityChangeMessage) + if (U.unwrapCustomMessage(msg) instanceof CacheAffinityChangeMessage) return; failed = true; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java index 45fadc94a05a5..df51e03141701 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/query/schema/IndexWithSameNameTestBase.java @@ -52,7 +52,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -314,7 +313,7 @@ public static class SchemaFinishListeningTcpDiscoverySpi extends TcpDiscoverySpi try { TcpDiscoveryCustomEventMessage evtMsg = (TcpDiscoveryCustomEventMessage)msg; - DiscoveryCustomMessage discoCustomMsg = GridTestUtils.unwrap(evtMsg.message(marshaller(), + DiscoveryCustomMessage discoCustomMsg = U.unwrapCustomMessage(evtMsg.message(marshaller(), U.gridClassLoader())); if (discoCustomMsg instanceof SchemaFinishDiscoveryMessage) { 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 330bd2c4ac2fc..81ce3e4dc58d9 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 @@ -49,7 +49,6 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -204,7 +203,7 @@ private boolean anyReceivedMessageMatch(IgniteEx ignite, Predicate predi assert customMsg instanceof SecurityAwareCustomMessageWrapper; - unwrappedMsg = GridTestUtils.unwrap(customMsg); + unwrappedMsg = U.unwrapCustomMessage(customMsg); } if (predicate.test(unwrappedMsg)) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java index b87ecc2295ab5..1f0ca99ab5d70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceConcurrentUndeployTest.java @@ -28,9 +28,9 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.service.inner.LongInitializedTestService; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -52,8 +52,8 @@ public class ServiceConcurrentUndeployTest extends GridCommonAbstractTest { disco.setInternalListener(new DiscoverySpiTestListener() { @Override public boolean beforeSendCustomEvent(DiscoverySpi spi, IgniteLogger log, DiscoveryCustomMessage msg) { if (spi.isClientMode()) { - if (GridTestUtils.unwrap(msg) instanceof ServiceChangeBatchRequest) { - ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)GridTestUtils.unwrap(msg); + if (U.unwrapCustomMessage(msg) instanceof ServiceChangeBatchRequest) { + ServiceChangeBatchRequest batch = (ServiceChangeBatchRequest)U.unwrapCustomMessage(msg); long undeployReqCnt = batch.requests().stream() .filter(r -> r instanceof ServiceUndeploymentRequest) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java index c2d32241e0f36..dcfe6ec5e974d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessAbstractTest.java @@ -23,12 +23,12 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.managers.communication.GridIoMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -103,7 +103,7 @@ protected static class BlockingTcpDiscoverySpi extends TestTcpDiscoverySpi { /** {@inheritDoc} */ @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - if (block && GridTestUtils.unwrap(msg) instanceof ServiceClusterDeploymentResultBatch) + if (block && U.unwrapCustomMessage(msg) instanceof ServiceClusterDeploymentResultBatch) return; super.sendCustomEvent(msg); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java index 658446a2ac196..59fac925a35e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/BlockTcpDiscoverySpi.java @@ -26,7 +26,6 @@ import org.apache.ignite.lang.IgniteBiClosure; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; -import org.apache.ignite.testframework.GridTestUtils; import static org.junit.Assert.assertNotNull; @@ -66,7 +65,7 @@ private synchronized void apply(ClusterNode addr, TcpDiscoveryAbstractMessage ms } if (clo != null) - clo.apply(addr, GridTestUtils.unwrap(custMsg)); + clo.apply(addr, U.unwrapCustomMessage(custMsg)); } /** {@inheritDoc} */ diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 29f4ba51bb583..08012acc3a00a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -2609,7 +2609,7 @@ private static class TestCustomerEventAckSpi extends TcpDiscoverySpi { try { TcpDiscoveryCustomEventMessage evtMsg = (TcpDiscoveryCustomEventMessage)msg; - DiscoveryCustomMessage custMsg = GridTestUtils.unwrap(evtMsg.message(marshaller(), + DiscoveryCustomMessage custMsg = U.unwrapCustomMessage(evtMsg.message(marshaller(), U.gridClassLoader())); if (custMsg instanceof StartRoutineAckDiscoveryMessage) { diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 76800566d668f..de7fa8e8deebe 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -95,7 +95,6 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; -import org.apache.ignite.internal.managers.discovery.SecurityAwareCustomMessageWrapper; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter; @@ -202,16 +201,6 @@ public void ignite(IgniteEx ignite) { } } - /** - * Unwraps messsage if it is wrapped by {@link SecurityAwareCustomMessageWrapper}. - * - * @param msg Message. - */ - public static DiscoveryCustomMessage unwrap(DiscoveryCustomMessage msg) { - return msg instanceof SecurityAwareCustomMessageWrapper ? - ((SecurityAwareCustomMessageWrapper)msg).delegate() : msg; - } - /** * Injects {@link DiscoveryHook} into handling logic. */ @@ -233,11 +222,11 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate, DiscoveryHook /** {@inheritDoc} */ @Override public IgniteFuture onDiscovery(DiscoveryNotification notification) { - hook.beforeDiscovery(unwrap(notification.getCustomMsgData())); + hook.beforeDiscovery(U.unwrapCustomMessage(notification.getCustomMsgData())); IgniteFuture fut = delegate.onDiscovery(notification); - fut.listen(f -> hook.afterDiscovery(unwrap(notification.getCustomMsgData()))); + fut.listen(f -> hook.afterDiscovery(U.unwrapCustomMessage(notification.getCustomMsgData()))); return fut; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java index 0ac48e7f36716..b8ff43e48a99c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeRegistrationTest.java @@ -29,8 +29,8 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataUpdateProposedMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -49,8 +49,8 @@ public class BinaryTypeRegistrationTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - if (GridTestUtils.unwrap(msg) instanceof MetadataUpdateProposedMessage) - metadataUpdateProposedMessages.add(GridTestUtils.unwrap(msg)); + if (U.unwrapCustomMessage(msg) instanceof MetadataUpdateProposedMessage) + metadataUpdateProposedMessages.add(U.unwrapCustomMessage(msg)); super.sendCustomEvent(msg); } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java index 4d9a353cc2ffa..f63d6b5551314 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataUpdateProposedMessage; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.IgniteSpiException; @@ -41,7 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -70,7 +70,7 @@ public class CacheRegisterMetadataLocallyTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage realMsg = GridTestUtils.unwrap(msg); + DiscoveryCustomMessage realMsg = U.unwrapCustomMessage(msg); if (realMsg instanceof MetadataUpdateProposedMessage || realMsg instanceof MetadataUpdateAcceptedMessage) customMessages.add(realMsg); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java index 413a701d7ec66..997692f77bfed 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java @@ -80,6 +80,7 @@ import org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -194,7 +195,7 @@ public static Iterable valuesForAsync() { cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(msg); if (delegate instanceof DynamicCacheChangeBatch) { try { diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java index b641585018c00..cd32445ca7602 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/RunningQueriesTest.java @@ -56,6 +56,7 @@ import org.apache.ignite.internal.processors.query.running.GridRunningQueryInfo; import org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage; import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; @@ -167,7 +168,7 @@ public class RunningQueriesTest extends AbstractIndexingCommonTest { cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteException { - DiscoveryCustomMessage delegate = GridTestUtils.unwrap(msg); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(msg); if (DynamicCacheChangeBatch.class.isAssignableFrom(delegate.getClass())) { ((DynamicCacheChangeBatch)delegate).requests().stream() From c48d65f89dcffbfb115da06ee84fe8f1c0b71f40 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Thu, 19 Feb 2026 17:40:48 +0300 Subject: [PATCH 4/6] data / custom -> customMsg --- .../discovery/GridDiscoveryManager.java | 20 +++++++++---------- .../spi/discovery/DiscoveryNotification.java | 16 +++++++-------- .../ignite/spi/discovery/tcp/ClientImpl.java | 6 +++--- ...eMarshallerCacheClassNameConflictTest.java | 4 ++-- ...shallerCacheClientRequestsMappingTest.java | 8 ++++---- .../IgniteMarshallerCacheFSRestoreTest.java | 4 ++-- .../ignite/testframework/GridTestUtils.java | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index c3507b2c5cc8f..e441a99a87505 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -592,8 +592,8 @@ private void onDiscovery0(DiscoveryNotification notification) { ClusterNode node = notification.getNode(); long topVer = notification.getTopVer(); - DiscoveryCustomMessage customMsg = U.unwrapCustomMessage(notification.getCustomMsgData() == null ? - null : notification.getCustomMsgData()); + DiscoveryCustomMessage customMsg = U.unwrapCustomMessage(notification.customMessage() == null ? + null : notification.customMessage()); if (skipMessage(notification.type(), customMsg)) return; @@ -932,7 +932,7 @@ public SecurityAwareNotificationTask(DiscoveryNotification notification) { /** */ @Override public void run() { - DiscoveryCustomMessage customMsg = notification.getCustomMsgData(); + DiscoveryCustomMessage customMsg = notification.customMessage(); if (customMsg instanceof SecurityAwareCustomMessageWrapper) { UUID secSubjId = ((SecurityAwareCustomMessageWrapper)customMsg).securitySubjectId(); @@ -2940,7 +2940,7 @@ private static class NotificationEvent { Collection topSnapshot; /** Data. */ - @Nullable DiscoveryCustomMessage data; + @Nullable DiscoveryCustomMessage customMsg; /** Span container. */ SpanContainer spanContainer; @@ -2954,7 +2954,7 @@ private static class NotificationEvent { * @param node Node. * @param discoCache Disco cache. * @param topSnapshot Topology snapshot. - * @param data Data. + * @param customMsg Data. * @param spanContainer Span container. */ public NotificationEvent( @@ -2963,7 +2963,7 @@ public NotificationEvent( ClusterNode node, DiscoCache discoCache, Collection topSnapshot, - @Nullable DiscoveryCustomMessage data, + @Nullable DiscoveryCustomMessage customMsg, SpanContainer spanContainer, SecurityContext secCtx ) { @@ -2972,7 +2972,7 @@ public NotificationEvent( this.node = node; this.discoCache = discoCache; this.topSnapshot = topSnapshot; - this.data = data; + this.customMsg = customMsg; this.spanContainer = spanContainer; this.secCtx = secCtx; } @@ -3071,7 +3071,7 @@ else if (type == EVT_CLIENT_NODE_RECONNECTED) * @param notificationEvt Notification event. */ void addEvent(NotificationEvent notificationEvt) { - assert notificationEvt.node != null : notificationEvt.data; + assert notificationEvt.node != null : notificationEvt.customMsg; if (notificationEvt.type == EVT_CLIENT_NODE_DISCONNECTED) discoWrk.disconnectEvtFut = new GridFutureAdapter(); @@ -3227,11 +3227,11 @@ private void body0() throws InterruptedException { customEvt.type(type); customEvt.topologySnapshot(topVer.topologyVersion(), evt.topSnapshot); customEvt.affinityTopologyVersion(topVer); - customEvt.customMessage(evt.data); + customEvt.customMessage(evt.customMsg); customEvt.span(evt.spanContainer != null ? evt.spanContainer.span() : null); if (evt.discoCache == null) { - assert discoCache != null : evt.data; + assert discoCache != null : evt.customMsg; evt.discoCache = discoCache; } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java index d06564d1b8a92..194b5b3e78133 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryNotification.java @@ -42,8 +42,8 @@ public class DiscoveryNotification { /** Topology history. */ private @Nullable NavigableMap> topHist; - /** Custom message data. */ - private @Nullable DiscoveryCustomMessage customMsgData; + /** Custom message. */ + private @Nullable DiscoveryCustomMessage customMsg; /** Span container. */ private SpanContainer spanContainer; @@ -67,7 +67,7 @@ public DiscoveryNotification(int eventType, long topVer, ClusterNode node, Colle * @param node Node. * @param topSnapshot Topology snapshot. * @param topHist Topology history. - * @param customMsgData Custom message data. + * @param customMsg Custom message. * @param spanContainer Span container. */ public DiscoveryNotification( @@ -76,7 +76,7 @@ public DiscoveryNotification( ClusterNode node, Collection topSnapshot, @Nullable NavigableMap> topHist, - @Nullable DiscoveryCustomMessage customMsgData, + @Nullable DiscoveryCustomMessage customMsg, SpanContainer spanContainer ) { this.eventType = eventType; @@ -84,7 +84,7 @@ public DiscoveryNotification( this.node = node; this.topSnapshot = topSnapshot; this.topHist = topHist; - this.customMsgData = customMsgData; + this.customMsg = customMsg; this.spanContainer = spanContainer; } @@ -124,10 +124,10 @@ public NavigableMap> getTopHist() { } /** - * @return Custom message data. + * @return Custom message. */ - public DiscoveryCustomMessage getCustomMsgData() { - return customMsgData; + public DiscoveryCustomMessage customMessage() { + return customMsg; } /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index d0f7592f5aac2..1841cf39c7466 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -2687,14 +2687,14 @@ private void notifyDiscovery( * @param topVer Topology version. * @param node Node. * @param top Topology snapshot. - * @param data Optional custom message data. + * @param customMsg Optional custom message. */ private void notifyDiscovery( int type, long topVer, ClusterNode node, Collection top, - @Nullable DiscoveryCustomMessage data, + @Nullable DiscoveryCustomMessage customMsg, SpanContainer spanContainer ) { DiscoverySpiListener lsnr = spi.lsnr; @@ -2707,7 +2707,7 @@ private void notifyDiscovery( ", topVer=" + topVer + ']'); lsnr.onDiscovery( - new DiscoveryNotification(type, topVer, node, top, new TreeMap<>(topHist), data, spanContainer) + new DiscoveryNotification(type, topVer, node, top, new TreeMap<>(topHist), customMsg, spanContainer) ).get(); } else if (debugLog.isDebugEnabled()) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java index 3af58b7dd6a4e..bb103c2625e3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java @@ -198,8 +198,8 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { @Override public IgniteFuture onDiscovery( DiscoveryNotification notification ) { - DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : U.unwrapCustomMessage(notification.getCustomMsgData()); + DiscoveryCustomMessage customMsg = notification.customMessage() == null ? null + : U.unwrapCustomMessage(notification.customMessage()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java index 2244882ebc461..388d883de1bd8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java @@ -161,10 +161,10 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoveryCustomMessage custom = + DiscoveryCustomMessage customMsg = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - DiscoveryCustomMessage delegate = U.unwrapCustomMessage(custom); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(customMsg); if (delegate instanceof MappingAcceptedMessage) { MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "item"); @@ -236,10 +236,10 @@ public void testBinaryMetaDelayedForComputeJobResult() throws Exception { @Override protected void startMessageProcess(TcpDiscoveryAbstractMessage msg) { if (msg instanceof TcpDiscoveryCustomEventMessage) { try { - DiscoveryCustomMessage custom = + DiscoveryCustomMessage customMsg = ((TcpDiscoveryCustomEventMessage)msg).message(marshaller(), U.gridClassLoader()); - DiscoveryCustomMessage delegate = U.unwrapCustomMessage(custom); + DiscoveryCustomMessage delegate = U.unwrapCustomMessage(customMsg); if (delegate instanceof MappingProposedMessage) { MarshallerMappingItem item = GridTestUtils.getFieldValue(delegate, "mappingItem"); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java index 4648b48c797b2..43542a8787d11 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java @@ -246,8 +246,8 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate) { @Override public IgniteFuture onDiscovery( DiscoveryNotification notification ) { - DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null - : U.unwrapCustomMessage(notification.getCustomMsgData()); + DiscoveryCustomMessage customMsg = notification.customMessage() == null ? null + : U.unwrapCustomMessage(notification.customMessage()); if (customMsg != null) { //don't want to make this class public, using equality of class name instead of instanceof operator diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index de7fa8e8deebe..373ac47f9f44b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -222,11 +222,11 @@ private DiscoverySpiListenerWrapper(DiscoverySpiListener delegate, DiscoveryHook /** {@inheritDoc} */ @Override public IgniteFuture onDiscovery(DiscoveryNotification notification) { - hook.beforeDiscovery(U.unwrapCustomMessage(notification.getCustomMsgData())); + hook.beforeDiscovery(U.unwrapCustomMessage(notification.customMessage())); IgniteFuture fut = delegate.onDiscovery(notification); - fut.listen(f -> hook.afterDiscovery(U.unwrapCustomMessage(notification.getCustomMsgData()))); + fut.listen(f -> hook.afterDiscovery(U.unwrapCustomMessage(notification.customMessage()))); return fut; } From bb27ff68408d6c012e673277b663c74fa0c782fa Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Thu, 19 Feb 2026 17:41:15 +0300 Subject: [PATCH 5/6] Fix deprecated --- .../apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 964fa8f3cd979..661234b5a7ed8 100644 --- 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 @@ -29,7 +29,7 @@ * @see GridDiscoveryManager#sendCustomEvent(DiscoveryCustomMessage) * TODO: Should be removed in https://issues.apache.org/jira/browse/IGNITE-27778 */ -@Deprecated +@Deprecated(forRemoval = true) public abstract class DiscoverySpiCustomMessage implements DiscoveryCustomMessage { /** {@inheritDoc} */ @Override public IgniteUuid id() { From 76a2a105e086fcb5bbc53f5ef543f9029635c08c Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Tue, 24 Feb 2026 10:17:45 +0300 Subject: [PATCH 6/6] Fix TestZookeeperDiscoverySpi --- .../ignite/spi/discovery/zk/TestZookeeperDiscoverySpi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/TestZookeeperDiscoverySpi.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/TestZookeeperDiscoverySpi.java index fd9e4ba42393a..23352efc152f5 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/TestZookeeperDiscoverySpi.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/TestZookeeperDiscoverySpi.java @@ -18,8 +18,8 @@ package org.apache.ignite.spi.discovery.zk; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalListener; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.IgniteDiscoverySpiInternalListenerSupport; import org.apache.ignite.testframework.junits.GridAbstractTest; @@ -32,7 +32,7 @@ public class TestZookeeperDiscoverySpi extends ZookeeperDiscoverySpi implements private volatile IgniteDiscoverySpiInternalListener internalLsnr; /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) { + @Override public void sendCustomEvent(DiscoveryCustomMessage msg) { IgniteDiscoverySpiInternalListener internalLsnr = this.internalLsnr; if (internalLsnr != null && !internalLsnr.beforeSendCustomEvent(this, log, msg))