Skip to content

Commit

Permalink
Avoid silly imports by differentiating names with version
Browse files Browse the repository at this point in the history
  • Loading branch information
@RagnarW @martinfurmanski
RagnarW authored and martinfurmanski committed Jun 11, 2018
1 parent 8f6ce52 commit 9f52d5d
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 51 deletions.
7 changes: 4 additions & 3 deletions ...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
View file
Expand Up @@ -39,7 +39,8 @@
import org.neo4j.causalclustering.catchup.storecopy.StoreFiles; import org.neo4j.causalclustering.catchup.storecopy.StoreFiles;
import org.neo4j.causalclustering.core.consensus.ConsensusModule; import org.neo4j.causalclustering.core.consensus.ConsensusModule;
import org.neo4j.causalclustering.core.consensus.RaftMessages; 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.consensus.roles.Role;
import org.neo4j.causalclustering.core.replication.ReplicationBenchmarkProcedure; import org.neo4j.causalclustering.core.replication.ReplicationBenchmarkProcedure;
import org.neo4j.causalclustering.core.replication.Replicator; import org.neo4j.causalclustering.core.replication.Replicator;
Expand Down Expand Up @@ -271,8 +272,8 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule,
new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols );


ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstallerRepository = new ProtocolInstallerRepository<>( ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstallerRepository = new ProtocolInstallerRepository<>(
asList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ), asList( new RaftProtocolClientInstallerV2.Factory( clientPipelineBuilderFactory, logProvider ),
new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, new RaftProtocolClientInstallerV1.Factory( clientPipelineBuilderFactory,
logProvider ) ), logProvider ) ),
ModifierProtocolInstaller.allClientInstallers ); ModifierProtocolInstaller.allClientInstallers );


Expand Down
11 changes: 6 additions & 5 deletions ...ise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java
View file
Expand Up @@ -35,7 +35,8 @@
import org.neo4j.causalclustering.core.consensus.RaftMessageMonitoringHandler; import org.neo4j.causalclustering.core.consensus.RaftMessageMonitoringHandler;
import org.neo4j.causalclustering.core.consensus.RaftMessageNettyHandler; import org.neo4j.causalclustering.core.consensus.RaftMessageNettyHandler;
import org.neo4j.causalclustering.core.consensus.RaftMessages.ReceivedInstantClusterIdAwareMessage; 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.server.CoreServerModule;
import org.neo4j.causalclustering.core.state.RaftMessageApplier; import org.neo4j.causalclustering.core.state.RaftMessageApplier;
import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.identity.MemberId;
Expand Down Expand Up @@ -115,10 +116,10 @@ private void createRaftServer( CoreServerModule coreServerModule, LifecycleMessa
new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols ); new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols );


RaftMessageNettyHandler nettyHandler = new RaftMessageNettyHandler( logProvider ); RaftMessageNettyHandler nettyHandler = new RaftMessageNettyHandler( logProvider );
RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV2 = RaftProtocolServerInstallerV2.Factory raftProtocolServerInstallerV2 =
new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, logProvider ); new RaftProtocolServerInstallerV2.Factory( nettyHandler, pipelineBuilderFactory, logProvider );
org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV1 = RaftProtocolServerInstallerV1.Factory raftProtocolServerInstallerV1 =
new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, new RaftProtocolServerInstallerV1.Factory( nettyHandler, pipelineBuilderFactory,
logProvider ); logProvider );
ProtocolInstallerRepository<ProtocolInstaller.Orientation.Server> protocolInstallerRepository = ProtocolInstallerRepository<ProtocolInstaller.Orientation.Server> protocolInstallerRepository =
new ProtocolInstallerRepository<>( asList( raftProtocolServerInstallerV1, raftProtocolServerInstallerV2 ), new ProtocolInstallerRepository<>( asList( raftProtocolServerInstallerV1, raftProtocolServerInstallerV2 ),
Expand Down
8 changes: 4 additions & 4 deletions ...tocol/v1/RaftProtocolClientInstaller.java → ...col/v1/RaftProtocolClientInstallerV1.java
View file
Expand Up @@ -38,24 +38,24 @@
import org.neo4j.logging.Log; import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider; import org.neo4j.logging.LogProvider;


public class RaftProtocolClientInstaller implements ProtocolInstaller<Orientation.Client> public class RaftProtocolClientInstallerV1 implements ProtocolInstaller<Orientation.Client>
{ {
private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1; private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1;


public static class Factory extends ProtocolInstaller.Factory<Orientation.Client, RaftProtocolClientInstaller> public static class Factory extends ProtocolInstaller.Factory<Orientation.Client,RaftProtocolClientInstallerV1>
{ {
public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider ) public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider )
{ {
super( APPLICATION_PROTOCOL, super( APPLICATION_PROTOCOL,
modifiers -> new RaftProtocolClientInstaller( clientPipelineBuilderFactory, modifiers, logProvider ) ); modifiers -> new RaftProtocolClientInstallerV1( clientPipelineBuilderFactory, modifiers, logProvider ) );
} }
} }


private final List<ModifierProtocolInstaller<Orientation.Client>> modifiers; private final List<ModifierProtocolInstaller<Orientation.Client>> modifiers;
private final Log log; private final Log log;
private final NettyPipelineBuilderFactory clientPipelineBuilderFactory; private final NettyPipelineBuilderFactory clientPipelineBuilderFactory;


public RaftProtocolClientInstaller( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List<ModifierProtocolInstaller<Orientation.Client>> modifiers, public RaftProtocolClientInstallerV1( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List<ModifierProtocolInstaller<Orientation.Client>> modifiers,
LogProvider logProvider ) LogProvider logProvider )
{ {
this.modifiers = modifiers; this.modifiers = modifiers;
Expand Down
8 changes: 4 additions & 4 deletions ...tocol/v1/RaftProtocolServerInstaller.java → ...col/v1/RaftProtocolServerInstallerV1.java
View file
Expand Up @@ -40,16 +40,16 @@
import org.neo4j.logging.Log; import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider; import org.neo4j.logging.LogProvider;


public class RaftProtocolServerInstaller implements ProtocolInstaller<Orientation.Server> public class RaftProtocolServerInstallerV1 implements ProtocolInstaller<Orientation.Server>
{ {
private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1; private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_1;


public static class Factory extends ProtocolInstaller.Factory<Orientation.Server, RaftProtocolServerInstaller> public static class Factory extends ProtocolInstaller.Factory<Orientation.Server,RaftProtocolServerInstallerV1>
{ {
public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, LogProvider logProvider ) public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, LogProvider logProvider )
{ {
super( APPLICATION_PROTOCOL, super( APPLICATION_PROTOCOL,
modifiers -> new RaftProtocolServerInstaller( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) ); modifiers -> new RaftProtocolServerInstallerV1( raftMessageHandler, pipelineBuilderFactory, modifiers, logProvider ) );
} }
} }


Expand All @@ -58,7 +58,7 @@ public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFa
private final List<ModifierProtocolInstaller<Orientation.Server>> modifiers; private final List<ModifierProtocolInstaller<Orientation.Server>> modifiers;
private final Log log; private final Log log;


public RaftProtocolServerInstaller( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, public RaftProtocolServerInstallerV1( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory,
List<ModifierProtocolInstaller<Orientation.Server>> modifiers, LogProvider logProvider ) List<ModifierProtocolInstaller<Orientation.Server>> modifiers, LogProvider logProvider )
{ {
this.raftMessageHandler = raftMessageHandler; this.raftMessageHandler = raftMessageHandler;
Expand Down
8 changes: 4 additions & 4 deletions ...tocol/v2/RaftProtocolClientInstaller.java → ...col/v2/RaftProtocolClientInstallerV2.java
View file
Expand Up @@ -42,23 +42,23 @@
import org.neo4j.logging.Log; import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider; import org.neo4j.logging.LogProvider;


public class RaftProtocolClientInstaller implements ProtocolInstaller<Orientation.Client> public class RaftProtocolClientInstallerV2 implements ProtocolInstaller<Orientation.Client>
{ {
private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2; private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2;


public static class Factory extends ProtocolInstaller.Factory<Orientation.Client,RaftProtocolClientInstaller> public static class Factory extends ProtocolInstaller.Factory<Orientation.Client,RaftProtocolClientInstallerV2>
{ {
public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider ) public Factory( NettyPipelineBuilderFactory clientPipelineBuilderFactory, LogProvider logProvider )
{ {
super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolClientInstaller( clientPipelineBuilderFactory, modifiers, logProvider ) ); super( APPLICATION_PROTOCOL, modifiers -> new RaftProtocolClientInstallerV2( clientPipelineBuilderFactory, modifiers, logProvider ) );
} }
} }


private final List<ModifierProtocolInstaller<Orientation.Client>> modifiers; private final List<ModifierProtocolInstaller<Orientation.Client>> modifiers;
private final Log log; private final Log log;
private final NettyPipelineBuilderFactory clientPipelineBuilderFactory; private final NettyPipelineBuilderFactory clientPipelineBuilderFactory;


public RaftProtocolClientInstaller( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List<ModifierProtocolInstaller<Orientation.Client>> modifiers, public RaftProtocolClientInstallerV2( NettyPipelineBuilderFactory clientPipelineBuilderFactory, List<ModifierProtocolInstaller<Orientation.Client>> modifiers,
LogProvider logProvider ) LogProvider logProvider )
{ {
this.modifiers = modifiers; this.modifiers = modifiers;
Expand Down
8 changes: 4 additions & 4 deletions ...tocol/v2/RaftProtocolServerInstaller.java → ...col/v2/RaftProtocolServerInstallerV2.java
View file
Expand Up @@ -43,16 +43,16 @@
import org.neo4j.logging.Log; import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider; import org.neo4j.logging.LogProvider;


public class RaftProtocolServerInstaller implements ProtocolInstaller<Orientation.Server> public class RaftProtocolServerInstallerV2 implements ProtocolInstaller<Orientation.Server>
{ {
private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2; private static final Protocol.ApplicationProtocols APPLICATION_PROTOCOL = Protocol.ApplicationProtocols.RAFT_2;
private final LogProvider logProvider; private final LogProvider logProvider;


public static class Factory extends ProtocolInstaller.Factory<Orientation.Server,RaftProtocolServerInstaller> public static class Factory extends ProtocolInstaller.Factory<Orientation.Server,RaftProtocolServerInstallerV2>
{ {
public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, LogProvider logProvider ) 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 ) );
} }
} }


Expand All @@ -61,7 +61,7 @@ public Factory( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFa
private final List<ModifierProtocolInstaller<Orientation.Server>> modifiers; private final List<ModifierProtocolInstaller<Orientation.Server>> modifiers;
private final Log log; private final Log log;


public RaftProtocolServerInstaller( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory, public RaftProtocolServerInstallerV2( ChannelInboundHandler raftMessageHandler, NettyPipelineBuilderFactory pipelineBuilderFactory,
List<ModifierProtocolInstaller<Orientation.Server>> modifiers, LogProvider logProvider ) List<ModifierProtocolInstaller<Orientation.Server>> modifiers, LogProvider logProvider )
{ {
this.raftMessageHandler = raftMessageHandler; this.raftMessageHandler = raftMessageHandler;
Expand Down
18 changes: 10 additions & 8 deletions ...causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java
View file
Expand Up @@ -39,8 +39,10 @@


import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.RaftMessages;
import org.neo4j.causalclustering.core.consensus.membership.MemberIdSet; 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.RaftProtocolClientInstallerV1;
import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller; 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.ClusterId;
import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.identity.MemberId;
import org.neo4j.causalclustering.net.Server; import org.neo4j.causalclustering.net.Server;
Expand Down Expand Up @@ -143,9 +145,9 @@ private Server raftServer( ChannelInboundHandler nettyHandler, int port )
{ {
NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER ); NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER );


RaftProtocolServerInstaller.Factory factoryV1 = new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineFactory, logProvider ); RaftProtocolServerInstallerV1.Factory factoryV1 = new RaftProtocolServerInstallerV1.Factory( nettyHandler, pipelineFactory, logProvider );
org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller.Factory factoryV2 = RaftProtocolServerInstallerV2.Factory factoryV2 =
new org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineFactory, logProvider ); new RaftProtocolServerInstallerV2.Factory( nettyHandler, pipelineFactory, logProvider );
ProtocolInstallerRepository<ProtocolInstaller.Orientation.Server> installer = ProtocolInstallerRepository<ProtocolInstaller.Orientation.Server> installer =
new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allServerInstallers ); new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allServerInstallers );


Expand All @@ -160,9 +162,9 @@ private SenderService raftSender()
{ {
NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER ); NettyPipelineBuilderFactory pipelineFactory = new NettyPipelineBuilderFactory( VOID_WRAPPER );


RaftProtocolClientInstaller.Factory factoryV1 = new RaftProtocolClientInstaller.Factory( pipelineFactory, logProvider ); RaftProtocolClientInstallerV1.Factory factoryV1 = new RaftProtocolClientInstallerV1.Factory( pipelineFactory, logProvider );
org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller.Factory factoryV2 = RaftProtocolClientInstallerV2.Factory factoryV2 =
new org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolClientInstaller.Factory( pipelineFactory, logProvider ); new RaftProtocolClientInstallerV2.Factory( pipelineFactory, logProvider );
ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstaller = ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstaller =
new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allClientInstallers ); new ProtocolInstallerRepository<>( Arrays.asList( factoryV1, factoryV2 ), ModifierProtocolInstaller.allClientInstallers );


Expand Down
8 changes: 4 additions & 4 deletions ...va/org/neo4j/causalclustering/messaging/marshalling/v2/RaftMessageEncoderDecoderTest.java
View file
Expand Up @@ -37,8 +37,8 @@


import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.RaftMessages;
import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; 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.RaftProtocolClientInstallerV2;
import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstaller; import org.neo4j.causalclustering.core.consensus.protocol.v2.RaftProtocolServerInstallerV2;
import org.neo4j.causalclustering.core.replication.DistributedOperation; import org.neo4j.causalclustering.core.replication.DistributedOperation;
import org.neo4j.causalclustering.core.replication.session.GlobalSession; import org.neo4j.causalclustering.core.replication.session.GlobalSession;
import org.neo4j.causalclustering.core.replication.session.LocalOperationId; import org.neo4j.causalclustering.core.replication.session.LocalOperationId;
Expand Down Expand Up @@ -94,9 +94,9 @@ public void setupChannels() throws Exception
outbound = new EmbeddedChannel(); outbound = new EmbeddedChannel();
inbound = 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 ); 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 ); FormattedLogProvider.toOutputStream( System.out ) ).install( inbound );
} }


Expand Down
12 changes: 6 additions & 6 deletions ...ng/src/test/java/org/neo4j/causalclustering/protocol/ProtocolInstallerRepositoryTest.java
View file
Expand Up @@ -27,8 +27,8 @@
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;


import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller; import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstallerV1;
import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller; import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstallerV1;
import org.neo4j.causalclustering.handlers.VoidPipelineWrapperFactory; import org.neo4j.causalclustering.handlers.VoidPipelineWrapperFactory;
import org.neo4j.causalclustering.protocol.Protocol.ApplicationProtocols; import org.neo4j.causalclustering.protocol.Protocol.ApplicationProtocols;
import org.neo4j.causalclustering.protocol.Protocol.ModifierProtocols; import org.neo4j.causalclustering.protocol.Protocol.ModifierProtocols;
Expand Down Expand Up @@ -64,10 +64,10 @@ public class ProtocolInstallerRepositoryTest


private final NettyPipelineBuilderFactory pipelineBuilderFactory = private final NettyPipelineBuilderFactory pipelineBuilderFactory =
new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER ); new NettyPipelineBuilderFactory( VoidPipelineWrapperFactory.VOID_WRAPPER );
private final RaftProtocolClientInstaller.Factory raftProtocolClientInstaller = private final RaftProtocolClientInstallerV1.Factory raftProtocolClientInstaller =
new RaftProtocolClientInstaller.Factory( pipelineBuilderFactory, NullLogProvider.getInstance() ); new RaftProtocolClientInstallerV1.Factory( pipelineBuilderFactory, NullLogProvider.getInstance() );
private final RaftProtocolServerInstaller.Factory raftProtocolServerInstaller = private final RaftProtocolServerInstallerV1.Factory raftProtocolServerInstaller =
new RaftProtocolServerInstaller.Factory( null, pipelineBuilderFactory, NullLogProvider.getInstance() ); new RaftProtocolServerInstallerV1.Factory( null, pipelineBuilderFactory, NullLogProvider.getInstance() );


private final ProtocolInstallerRepository<Orientation.Client> clientRepository = private final ProtocolInstallerRepository<Orientation.Client> clientRepository =
new ProtocolInstallerRepository<>( asList( raftProtocolClientInstaller ), clientModifiers ); new ProtocolInstallerRepository<>( asList( raftProtocolClientInstaller ), clientModifiers );
Expand Down

0 comments on commit 9f52d5d

Please sign in to comment.