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 24bafa37db786..9dd0d3c07cf81 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 @@ -138,7 +138,7 @@ import org.neo4j.time.Clocks; import org.neo4j.udc.UsageData; -import static java.util.Collections.singletonList; +import static java.util.Arrays.asList; import static org.neo4j.causalclustering.core.CausalClusteringSettings.raft_messages_log_path; /** @@ -270,9 +270,10 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule, ModifierProtocolRepository modifierProtocolRepository = new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); - ProtocolInstallerRepository protocolInstallerRepository = - new ProtocolInstallerRepository<>( - singletonList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ) ), + ProtocolInstallerRepository protocolInstallerRepository = new ProtocolInstallerRepository<>( + asList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ), + new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, + logProvider ) ), ModifierProtocolInstaller.allClientInstallers ); Duration handshakeTimeout = config.get( CausalClusteringSettings.handshake_timeout ); 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 d7eb1119f5f9b..e77488ea608e2 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 @@ -59,7 +59,7 @@ import org.neo4j.logging.LogProvider; import org.neo4j.scheduler.JobScheduler; -import static java.util.Collections.singletonList; +import static java.util.Arrays.asList; class RaftServerModule { @@ -115,10 +115,14 @@ private void createRaftServer( CoreServerModule coreServerModule, LifecycleMessa new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); RaftMessageNettyHandler nettyHandler = new RaftMessageNettyHandler( logProvider ); - RaftProtocolServerInstaller.Factory raftProtocolServerInstaller = + 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, + logProvider ); ProtocolInstallerRepository protocolInstallerRepository = - new ProtocolInstallerRepository<>( singletonList( raftProtocolServerInstaller ), ModifierProtocolInstaller.allServerInstallers ); + new ProtocolInstallerRepository<>( asList( raftProtocolServerInstallerV1, raftProtocolServerInstallerV2 ), + ModifierProtocolInstaller.allServerInstallers ); HandshakeServerInitializer handshakeServerInitializer = new HandshakeServerInitializer( applicationProtocolRepository, modifierProtocolRepository, protocolInstallerRepository, pipelineBuilderFactory, logProvider );