This is an automated email from the ASF dual-hosted git repository. rpuch pushed a commit to branch ignite-26535 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 1daeece27d82fc27a7d13b6e8d38442e42ce66ec Author: Roman Puchkovskiy <[email protected]> AuthorDate: Fri Sep 26 17:55:02 2025 +0400 IGNITE-26535 Remove unused parameters in RecoveryHandshakeTest --- .../network/netty/RecoveryHandshakeTest.java | 43 +++++----------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java index 5ec2f0313ff..6e76abdddea 100644 --- a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java +++ b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.util.concurrent.AbstractScheduledEventExecutor; import java.util.Collections; @@ -116,11 +115,9 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { EmbeddedChannel acceptorSideChannel = createUnregisteredChannel(); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, initiatorRecovery ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, acceptorRecovery ); @@ -164,13 +161,11 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { addUnacknowledgedMessages(acceptorRecoveryDescriptor); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, INITIATOR, initiatorLaunchId, initiatorRecovery ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, acceptorRecovery ); @@ -232,11 +227,9 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { addUnacknowledgedMessages(initiatorRecoveryDescriptor); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, initiatorRecovery ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, ACCEPTOR, acceptorLaunchId, acceptorRecovery @@ -297,15 +290,14 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { UUID node2Uuid = HIGHER_UUID; RecoveryInitiatorHandshakeManager chm1 = createRecoveryInitiatorHandshakeManager( - channel1Src, INITIATOR, node1Uuid, node1Recovery ); - RecoveryAcceptorHandshakeManager shm1 = createRecoveryAcceptorHandshakeManager(channel2Dst, INITIATOR, node1Uuid, node1Recovery); + RecoveryAcceptorHandshakeManager shm1 = createRecoveryAcceptorHandshakeManager(INITIATOR, node1Uuid, node1Recovery); - RecoveryInitiatorHandshakeManager chm2 = createRecoveryInitiatorHandshakeManager(channel2Src, ACCEPTOR, node2Uuid, node2Recovery); - RecoveryAcceptorHandshakeManager shm2 = createRecoveryAcceptorHandshakeManager(channel1Dst, ACCEPTOR, node2Uuid, node2Recovery); + RecoveryInitiatorHandshakeManager chm2 = createRecoveryInitiatorHandshakeManager(ACCEPTOR, node2Uuid, node2Recovery); + RecoveryAcceptorHandshakeManager shm2 = createRecoveryAcceptorHandshakeManager(ACCEPTOR, node2Uuid, node2Recovery); // Channel opened from node1 to node2 is channel 1. // Channel opened from node2 to node1 is channel 2. @@ -365,15 +357,14 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { UUID node2Uuid = node1LaunchIdIsLower ? HIGHER_UUID : LOWER_UUID; RecoveryInitiatorHandshakeManager chm1 = createRecoveryInitiatorHandshakeManager( - channel1Src, INITIATOR, node1Uuid, node1Recovery ); - RecoveryAcceptorHandshakeManager shm1 = createRecoveryAcceptorHandshakeManager(channel2Dst, INITIATOR, node1Uuid, node1Recovery); + RecoveryAcceptorHandshakeManager shm1 = createRecoveryAcceptorHandshakeManager(INITIATOR, node1Uuid, node1Recovery); - RecoveryInitiatorHandshakeManager chm2 = createRecoveryInitiatorHandshakeManager(channel2Src, ACCEPTOR, node2Uuid, node2Recovery); - RecoveryAcceptorHandshakeManager shm2 = createRecoveryAcceptorHandshakeManager(channel1Dst, ACCEPTOR, node2Uuid, node2Recovery); + RecoveryInitiatorHandshakeManager chm2 = createRecoveryInitiatorHandshakeManager(ACCEPTOR, node2Uuid, node2Recovery); + RecoveryAcceptorHandshakeManager shm2 = createRecoveryAcceptorHandshakeManager(ACCEPTOR, node2Uuid, node2Recovery); // Channel opened from node1 to node2 is channel 1. // Channel opened from node2 to node1 is channel 2. @@ -438,13 +429,11 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { EmbeddedChannel acceptorSideChannel = createUnregisteredChannel(); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, initiator, initiatorLaunchId, initiatorRecovery ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, acceptor, acceptorLaunchId, acceptorRecovery @@ -488,13 +477,11 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { // Simulate reconnection initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, initiator, initiatorLaunchId, initiatorRecovery ); acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, acceptor, acceptorLaunchId, acceptorRecovery @@ -551,11 +538,9 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { EmbeddedChannel acceptorSideChannel = createUnregisteredChannel(); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, initiatorRecovery ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, ACCEPTOR, UUID.randomUUID(), acceptorRecovery, @@ -594,14 +579,12 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { EmbeddedChannel acceptorSideChannel = createUnregisteredChannel(); RecoveryInitiatorHandshakeManager initiatorHandshakeManager = createRecoveryInitiatorHandshakeManager( - initiatorSideChannel, INITIATOR, UUID.randomUUID(), initiatorRecovery, new AllIdsAreStale() ); RecoveryAcceptorHandshakeManager acceptorHandshakeManager = createRecoveryAcceptorHandshakeManager( - acceptorSideChannel, acceptorRecovery ); @@ -763,23 +746,20 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { } private RecoveryInitiatorHandshakeManager createRecoveryInitiatorHandshakeManager( - Channel initiatorSideChannel, RecoveryDescriptorProvider provider ) { - return createRecoveryInitiatorHandshakeManager(initiatorSideChannel, INITIATOR, UUID.randomUUID(), provider); + return createRecoveryInitiatorHandshakeManager(INITIATOR, UUID.randomUUID(), provider); } private RecoveryInitiatorHandshakeManager createRecoveryInitiatorHandshakeManager( - Channel initiatorSideChannel, String consistentId, UUID launchId, RecoveryDescriptorProvider provider ) { - return createRecoveryInitiatorHandshakeManager(initiatorSideChannel, consistentId, launchId, provider, new AllIdsAreFresh()); + return createRecoveryInitiatorHandshakeManager(consistentId, launchId, provider, new AllIdsAreFresh()); } private RecoveryInitiatorHandshakeManager createRecoveryInitiatorHandshakeManager( - Channel initiatorSideChannel, String consistentId, UUID launchId, RecoveryDescriptorProvider provider, @@ -800,23 +780,20 @@ public class RecoveryHandshakeTest extends BaseIgniteAbstractTest { } private RecoveryAcceptorHandshakeManager createRecoveryAcceptorHandshakeManager( - Channel acceptorSideChannel, RecoveryDescriptorProvider provider ) { - return createRecoveryAcceptorHandshakeManager(acceptorSideChannel, ACCEPTOR, UUID.randomUUID(), provider); + return createRecoveryAcceptorHandshakeManager(ACCEPTOR, UUID.randomUUID(), provider); } private RecoveryAcceptorHandshakeManager createRecoveryAcceptorHandshakeManager( - Channel acceptorSideChannel, String consistentId, UUID launchId, RecoveryDescriptorProvider provider ) { - return createRecoveryAcceptorHandshakeManager(acceptorSideChannel, consistentId, launchId, provider, new AllIdsAreFresh()); + return createRecoveryAcceptorHandshakeManager(consistentId, launchId, provider, new AllIdsAreFresh()); } private RecoveryAcceptorHandshakeManager createRecoveryAcceptorHandshakeManager( - Channel acceptorSideChannel, String consistentId, UUID launchId, RecoveryDescriptorProvider provider,
