diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java index 9dd0d3c07cf81..5e75b530992d0 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java @@ -39,7 +39,8 @@ import org.neo4j.causalclustering.catchup.storecopy.StoreFiles; import org.neo4j.causalclustering.core.consensus.ConsensusModule; import org.neo4j.causalclustering.core.consensus.RaftMessages; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstallerV2; import org.neo4j.causalclustering.core.consensus.roles.Role; import org.neo4j.causalclustering.core.replication.ReplicationBenchmarkProcedure; import org.neo4j.causalclustering.core.replication.Replicator; @@ -271,8 +272,8 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule, new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); ProtocolInstallerRepository protocolInstallerRepository = new ProtocolInstallerRepository<>( - asList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ), - new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, + asList( new RaftProtocolClientInstallerV2.Factory( clientPipelineBuilderFactory, logProvider ), + new RaftProtocolClientInstallerV1.Factory( clientPipelineBuilderFactory, logProvider ) ), ModifierProtocolInstaller.allClientInstallers ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java index e77488ea608e2..68b01a26e7dc0 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java @@ -35,7 +35,8 @@ import org.neo4j.causalclustering.core.consensus.RaftMessageMonitoringHandler; import org.neo4j.causalclustering.core.consensus.RaftMessageNettyHandler; import org.neo4j.causalclustering.core.consensus.RaftMessages.ReceivedInstantClusterIdAwareMessage; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstallerV2; import org.neo4j.causalclustering.core.server.CoreServerModule; import org.neo4j.causalclustering.core.state.RaftMessageApplier; import org.neo4j.causalclustering.identity.MemberId; @@ -115,10 +116,10 @@ private void createRaftServer( CoreServerModule coreServerModule, LifecycleMessa new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); RaftMessageNettyHandler nettyHandler = new RaftMessageNettyHandler( logProvider ); - RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV2 = - new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); - org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV1 = - new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, + RaftProtocolServerInstallerV2.Factory raftProtocolServerInstallerV2 = + new RaftProtocolServerInstallerV2.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); + RaftProtocolServerInstallerV1.Factory raftProtocolServerInstallerV1 = + new RaftProtocolServerInstallerV1.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); ProtocolInstallerRepository protocolInstallerRepository = new ProtocolInstallerRepository<>( asList( raftProtocolServerInstallerV1, raftProtocolServerInstallerV2 ), diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstaller.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java similarity index 89% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstaller.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java index b3a95f1d50a1f..6549c9c970449 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstaller.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java @@ -38,16 +38,16 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -public class RaftProtocolClientInstaller implements ProtocolInstaller +public class RaftProtocolClientInstallerV1 implements ProtocolInstaller { private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1; - public static class Factory extends ProtocolInstaller.Factory + public static class Factory extends ProtocolInstaller.Factory { public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider ) { super( APPLICATION_PROTOCOL, - modifiers -> new RaftProtocolClientInstaller( clientPipelineBuilderFactory, modifiers, logProvider ) ); + modifiers -> new RaftProtocolClientInstallerV1( clientPipelineBuilderFactory, modifiers, logProvider ) ); } } @@ -55,7 +55,7 @@ public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogPro private final Log log; private final NettyPipelineBuilderFactory clientPipelineBuilderFactory; - public RaftProtocolClientInstaller( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List> modifiers, + public RaftProtocolClientInstallerV1( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List> modifiers, LogProvider logProvider ) { this.modifiers = modifiers; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstaller.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java similarity index 90% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstaller.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java index a736ec4a33758..c1e4eec6f8ecf 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstaller.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java @@ -40,16 +40,16 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -public class RaftProtocolServerInstaller implements ProtocolInstaller +public class RaftProtocolServerInstallerV1 implements ProtocolInstaller { private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1; - public static class Factory extends ProtocolInstaller.Factory + public static class Factory extends ProtocolInstaller.Factory { public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, LogProvider logProvider ) { super( APPLICATION_PROTOCOL, - modifiers -> new RaftProtocolServerInstaller( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) ); + modifiers -> new RaftProtocolServerInstallerV1( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) ); } } @@ -58,7 +58,7 @@ public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFa private final List> modifiers; private final Log log; - public RaftProtocolServerInstaller( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, + public RaftProtocolServerInstallerV1( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, List> modifiers, LogProvider logProvider ) { this.raftMessageHandler = raftMessageHandler; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java similarity index 90% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java index 00b1b3e0b3180..10d46ee54170d 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java @@ -42,15 +42,15 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -public class RaftProtocolClientInstaller implements ProtocolInstaller +public class RaftProtocolClientInstallerV2 implements ProtocolInstaller { private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2; - public static class Factory extends ProtocolInstaller.Factory + public static class Factory extends ProtocolInstaller.Factory { public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider ) { - super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolClientInstaller( clientPipelineBuilderFactory, modifiers, logProvider ) ); + super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolClientInstallerV2( clientPipelineBuilderFactory, modifiers, logProvider ) ); } } @@ -58,7 +58,7 @@ public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogPro private final Log log; private final NettyPipelineBuilderFactory clientPipelineBuilderFactory; - public RaftProtocolClientInstaller( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List> modifiers, + public RaftProtocolClientInstallerV2( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List> modifiers, LogProvider logProvider ) { this.modifiers = modifiers; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstaller.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstallerV2.java similarity index 91% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstaller.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstallerV2.java index 5fa759cc58263..0035f25a2fe13 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstaller.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolServerInstallerV2.java @@ -43,16 +43,16 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -public class RaftProtocolServerInstaller implements ProtocolInstaller +public class RaftProtocolServerInstallerV2 implements ProtocolInstaller { private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2; private final LogProvider logProvider; - public static class Factory extends ProtocolInstaller.Factory + public static class Factory extends ProtocolInstaller.Factory { public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, LogProvider logProvider ) { - super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolServerInstaller( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) ); + super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolServerInstallerV2( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) ); } } @@ -61,7 +61,7 @@ public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFa private final List> modifiers; private final Log log; - public RaftProtocolServerInstaller( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, + public RaftProtocolServerInstallerV2( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, List> modifiers, LogProvider logProvider ) { this.raftMessageHandler = raftMessageHandler; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java index a228b48ca3f0a..b53a8b5650972 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java @@ -39,8 +39,10 @@ import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.membership.MemberIdSet; -import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller; -import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstallerV2; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstallerV2; import org.neo4j.causalclustering.identity.ClusterId; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.net.Server; @@ -143,9 +145,9 @@ private Server raftServer( ChannelInboundHandler nettyHandler, int port ) { NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER ); - RaftProtocolServerInstaller.Factory factoryV1 = new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineFactory, logProvider ); - org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller.Factory factoryV2 = - new org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineFactory, logProvider ); + RaftProtocolServerInstallerV1.Factory factoryV1 = new RaftProtocolServerInstallerV1.Factory( nettyHandler, pipelineFactory, logProvider ); + RaftProtocolServerInstallerV2.Factory factoryV2 = + new RaftProtocolServerInstallerV2.Factory( nettyHandler, pipelineFactory, logProvider ); ProtocolInstallerRepository installer = new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allServerInstallers ); @@ -160,9 +162,9 @@ private SenderService raftSender() { NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER ); - RaftProtocolClientInstaller.Factory factoryV1 = new RaftProtocolClientInstaller.Factory( pipelineFactory, logProvider ); - org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller.Factory factoryV2 = - new org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller.Factory( pipelineFactory, logProvider ); + RaftProtocolClientInstallerV1.Factory factoryV1 = new RaftProtocolClientInstallerV1.Factory( pipelineFactory, logProvider ); + RaftProtocolClientInstallerV2.Factory factoryV2 = + new RaftProtocolClientInstallerV2.Factory( pipelineFactory, logProvider ); ProtocolInstallerRepository protocolInstaller = new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allClientInstallers ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/RaftMessageEncoderDecoderTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/RaftMessageEncoderDecoderTest.java index 3ef175d9dc3a4..b11f4d1c05641 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/RaftMessageEncoderDecoderTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/RaftMessageEncoderDecoderTest.java @@ -37,8 +37,8 @@ import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstallerV2; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstallerV2; import org.neo4j.causalclustering.core.replication.DistributedOperation; import org.neo4j.causalclustering.core.replication.session.GlobalSession; import org.neo4j.causalclustering.core.replication.session.LocalOperationId; @@ -94,9 +94,9 @@ public void setupChannels() throws Exception outbound = new EmbeddedChannel(); inbound = new EmbeddedChannel(); - new RaftProtocolClientInstaller( new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ), Collections.emptyList(), + new RaftProtocolClientInstallerV2( new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ), Collections.emptyList(), FormattedLogProvider.toOutputStream( System.out ) ).install( outbound ); - new RaftProtocolServerInstaller( handler, new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ), Collections.emptyList(), + new RaftProtocolServerInstallerV2( handler, new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ), Collections.emptyList(), FormattedLogProvider.toOutputStream( System.out ) ).install( inbound ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/ProtocolInstallerRepositoryTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/ProtocolInstallerRepositoryTest.java index 28948346eafc4..652893980f952 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/ProtocolInstallerRepositoryTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/ProtocolInstallerRepositoryTest.java @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.List; -import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller; -import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstallerV1; import org.neo4j.causalclustering.handlers.VoidPipelineWrapperFactory; import org.neo4j.causalclustering.protocol.Protocol.ApplicationProtocols; import org.neo4j.causalclustering.protocol.Protocol.ModifierProtocols; @@ -64,10 +64,10 @@ public class ProtocolInstallerRepositoryTest private final NettyPipelineBuilderFactory pipelineBuilderFactory = new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ); - private final RaftProtocolClientInstaller.Factory raftProtocolClientInstaller = - new RaftProtocolClientInstaller.Factory( pipelineBuilderFactory, NullLogProvider.getInstance() ); - private final RaftProtocolServerInstaller.Factory raftProtocolServerInstaller = - new RaftProtocolServerInstaller.Factory( null, pipelineBuilderFactory, NullLogProvider.getInstance() ); + private final RaftProtocolClientInstallerV1.Factory raftProtocolClientInstaller = + new RaftProtocolClientInstallerV1.Factory( pipelineBuilderFactory, NullLogProvider.getInstance() ); + private final RaftProtocolServerInstallerV1.Factory raftProtocolServerInstaller = + new RaftProtocolServerInstallerV1.Factory( null, pipelineBuilderFactory, NullLogProvider.getInstance() ); private final ProtocolInstallerRepository clientRepository = new ProtocolInstallerRepository<>( asList( raftProtocolClientInstaller ), clientModifiers ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/handshake/NettyInstalledProtocolsIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/handshake/NettyInstalledProtocolsIT.java index 2facf0bfcea89..1e9912d64f287 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/handshake/NettyInstalledProtocolsIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/protocol/handshake/NettyInstalledProtocolsIT.java @@ -55,8 +55,10 @@ import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.core.consensus.RaftMessages; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller; -import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstallerV1; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstallerV2; +import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstallerV2; import org.neo4j.causalclustering.handlers.VoidPipelineWrapperFactory; import org.neo4j.causalclustering.identity.ClusterId; import org.neo4j.causalclustering.identity.MemberId; @@ -216,10 +218,10 @@ protected void channelRead0( ChannelHandlerContext ctx, Object msg ) void start( final ApplicationProtocolRepository applicationProtocolRepository, final ModifierProtocolRepository modifierProtocolRepository ) { - RaftProtocolServerInstaller.Factory raftFactoryV2 = - new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); - org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory raftFactoryV1 = - new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, + RaftProtocolServerInstallerV2.Factory raftFactoryV2 = + new RaftProtocolServerInstallerV2.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); + RaftProtocolServerInstallerV1.Factory raftFactoryV1 = + new RaftProtocolServerInstallerV1.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); ProtocolInstallerRepository protocolInstallerRepository = new ProtocolInstallerRepository<>( Arrays.asList( raftFactoryV1, raftFactoryV2 ), ModifierProtocolInstaller.allServerInstallers ); @@ -262,9 +264,9 @@ static class Client Client( ApplicationProtocolRepository applicationProtocolRepository, ModifierProtocolRepository modifierProtocolRepository, NettyPipelineBuilderFactory pipelineBuilderFactory, Config config ) { - RaftProtocolClientInstaller.Factory raftFactoryV2 = new RaftProtocolClientInstaller.Factory( pipelineBuilderFactory, logProvider ); - org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory raftFactoryV1 = - new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory( pipelineBuilderFactory, logProvider ); + RaftProtocolClientInstallerV2.Factory raftFactoryV2 = new RaftProtocolClientInstallerV2.Factory( pipelineBuilderFactory, logProvider ); + RaftProtocolClientInstallerV1.Factory raftFactoryV1 = + new RaftProtocolClientInstallerV1.Factory( pipelineBuilderFactory, logProvider ); ProtocolInstallerRepository protocolInstallerRepository = new ProtocolInstallerRepository<>( Arrays.asList( raftFactoryV1, raftFactoryV2 ), ModifierProtocolInstaller.allClientInstallers ); eventLoopGroup = new NioEventLoopGroup();