From 453107f0f74cb486d6b6a5629d7aac9a7ed3ac79 Mon Sep 17 00:00:00 2001
From: Chris Gioran <chris@neotechnology.com>
Date: Mon, 30 Nov 2015 15:06:56 +0200
Subject: [PATCH] Slight reordering of operations, simply for readability
 purposes

---
 .../core/EnterpriseCoreEditionModule.java     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java
index de5abebeee7ea..9a0fb25a913bf 100644
--- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java
+++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java
@@ -27,6 +27,8 @@
 
 import org.neo4j.coreedge.catchup.StoreIdSupplier;
 import org.neo4j.coreedge.catchup.CatchupServer;
+import org.neo4j.coreedge.raft.state.TermStore;
+import org.neo4j.coreedge.raft.state.VoteStore;
 import org.neo4j.coreedge.server.CoreEdgeClusterSettings;
 import org.neo4j.coreedge.catchup.CheckpointerSupplier;
 import org.neo4j.coreedge.catchup.DataSourceSupplier;
@@ -162,20 +164,20 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule,
         LoggingOutbound<AdvertisedSocketAddress> loggingOutbound = new LoggingOutbound<>(
                 senderService, myself.getRaftAddress(), messageLogger );
 
-        File raftLogsDirectory = createRaftLogsDirectory( platformModule.storeDir, fileSystem );
-
-        RaftLog raftLog = new NaiveDurableRaftLog( fileSystem, raftLogsDirectory, new RaftContentSerializer(),
-                platformModule.monitors );
-        dependencies.satisfyDependencies( raftLog );
-
         ListenSocketAddress raftListenAddress = config.get( CoreEdgeClusterSettings.raft_listen_address );
         RaftServer<CoreMember> raftServer = new RaftServer<>( marshall, raftListenAddress, logProvider );
 
         final ScheduledTimeoutService raftTimeoutService = new ScheduledTimeoutService();
 
-        raft = createRaft( life, loggingOutbound, discoveryService, config,
-                messageLogger, raftLog, myself, raftLogsDirectory, fileSystem, logProvider, raftServer,
-                raftTimeoutService );
+        File raftLogsDirectory = createRaftLogsDirectory( platformModule.storeDir, fileSystem );
+        NaiveDurableRaftLog raftLog = new NaiveDurableRaftLog( fileSystem, raftLogsDirectory, new RaftContentSerializer(),
+                platformModule.monitors );
+
+        DurableTermStore termStore = new DurableTermStore( fileSystem, raftLogsDirectory );
+        DurableVoteStore voteStore = new DurableVoteStore( fileSystem, raftLogsDirectory );
+
+        raft = createRaft( life, loggingOutbound, discoveryService, config, messageLogger, raftLog,
+                termStore, voteStore, myself, logProvider, raftServer, raftTimeoutService );
 
         RaftReplicator<CoreMember> replicator = new RaftReplicator<>( raft, myself,
                 new RaftOutbound( loggingOutbound ) );
@@ -308,9 +310,9 @@ private static RaftInstance<CoreMember> createRaft( LifeSupport life,
                                                         Config config,
                                                         MessageLogger<AdvertisedSocketAddress> messageLogger,
                                                         RaftLog raftLog,
+                                                        TermStore termStore,
+                                                        VoteStore voteStore,
                                                         CoreMember myself,
-                                                        File raftLogsDirectory,
-                                                        FileSystemAbstraction fileSystem,
                                                         LogProvider logProvider,
                                                         RaftServer<CoreMember> raftServer,
                                                         ScheduledTimeoutService raftTimeoutService )
@@ -326,8 +328,6 @@ private static RaftInstance<CoreMember> createRaft( LifeSupport life,
 
         CoreMemberSetBuilder memberSetBuilder = new CoreMemberSetBuilder();
 
-        DurableTermStore termStore = new DurableTermStore( fileSystem, raftLogsDirectory );
-        DurableVoteStore voteStore = new DurableVoteStore( fileSystem, raftLogsDirectory );
 
         Replicator localReplicator = new LocalReplicator<>( myself, myself.getRaftAddress(), outbound );