Repackaging.

enterprise/core-edge/src/main/java/org/neo4j/coreedge/ReplicationModule.java

@@ -27,15 +27,15 @@
 import org.neo4j.coreedge.raft.ConsensusModule;
 import org.neo4j.coreedge.raft.RaftMessages;
 import org.neo4j.coreedge.raft.net.Outbound;
-import org.neo4j.coreedge.raft.replication.ProgressTrackerImpl;
-import org.neo4j.coreedge.raft.replication.RaftReplicator;
-import org.neo4j.coreedge.raft.replication.session.GlobalSession;
-import org.neo4j.coreedge.raft.replication.session.GlobalSessionTrackerState;
-import org.neo4j.coreedge.raft.replication.session.LocalSessionPool;
-import org.neo4j.coreedge.raft.replication.tx.ExponentialBackoffStrategy;
-import org.neo4j.coreedge.raft.state.DurableStateStorage;
-import org.neo4j.coreedge.server.CoreEdgeClusterSettings;
-import org.neo4j.coreedge.server.MemberId;
+import org.neo4j.coreedge.core.replication.ProgressTrackerImpl;
+import org.neo4j.coreedge.core.replication.RaftReplicator;
+import org.neo4j.coreedge.core.replication.session.GlobalSession;
+import org.neo4j.coreedge.core.replication.session.GlobalSessionTrackerState;
+import org.neo4j.coreedge.core.replication.session.LocalSessionPool;
+import org.neo4j.coreedge.core.state.tx.ExponentialBackoffStrategy;
+import org.neo4j.coreedge.core.state.DurableStateStorage;
+import org.neo4j.coreedge.core.CoreEdgeClusterSettings;
+import org.neo4j.coreedge.identity.MemberId;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.factory.PlatformModule;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/SessionTracker.java

@@ -22,11 +22,11 @@
 import java.io.IOException;
 
 import org.neo4j.coreedge.catchup.storecopy.core.CoreStateType;
-import org.neo4j.coreedge.raft.replication.session.GlobalSession;
-import org.neo4j.coreedge.raft.replication.session.GlobalSessionTrackerState;
-import org.neo4j.coreedge.raft.replication.session.LocalOperationId;
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
-import org.neo4j.coreedge.raft.state.StateStorage;
+import org.neo4j.coreedge.core.replication.session.GlobalSession;
+import org.neo4j.coreedge.core.replication.session.GlobalSessionTrackerState;
+import org.neo4j.coreedge.core.replication.session.LocalOperationId;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.StateStorage;
 
 public class SessionTracker implements SnapFlushable
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/SnapFlushable.java

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
 
 public interface SnapFlushable
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/CatchupServer.java

@@ -47,10 +47,10 @@
 import org.neo4j.coreedge.catchup.tx.core.TxPullRequestHandler;
 import org.neo4j.coreedge.catchup.tx.core.TxPullResponseEncoder;
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseEncoder;
-import org.neo4j.coreedge.raft.state.CoreState;
-import org.neo4j.coreedge.server.ListenSocketAddress;
-import org.neo4j.coreedge.server.StoreId;
-import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
+import org.neo4j.coreedge.core.state.CoreState;
+import org.neo4j.coreedge.messaging.ListenSocketAddress;
+import org.neo4j.coreedge.identity.StoreId;
+import org.neo4j.coreedge.logging.ExceptionLoggingHandler;
 import org.neo4j.helpers.NamedThreadFactory;
 import org.neo4j.kernel.NeoStoreDataSource;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/RequestMessageType.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup;
 
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 
 import static java.lang.String.format;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/CoreClient.java

@@ -40,14 +40,14 @@
 import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseListener;
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamCompleteListener;
 import org.neo4j.coreedge.discovery.TopologyService;
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 import org.neo4j.coreedge.raft.net.CoreOutbound;
 import org.neo4j.coreedge.raft.net.Outbound;
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.NonBlockingChannels;
-import org.neo4j.coreedge.server.SenderService;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.messaging.NonBlockingChannels;
+import org.neo4j.coreedge.messaging.SenderService;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.helpers.Listeners;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.kernel.monitoring.Monitors;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabase.java

@@ -25,8 +25,8 @@
 
 import org.neo4j.coreedge.catchup.storecopy.edge.CopiedStoreRecovery;
 import org.neo4j.coreedge.catchup.storecopy.edge.StoreFetcher;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.kernel.internal.DatabaseHealth;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotDecoder.java

@@ -28,7 +28,7 @@
 
 import org.neo4j.coreedge.catchup.CatchupClientProtocol;
 import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4;
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
 
 import static org.neo4j.coreedge.catchup.CatchupClientProtocol.NextMessage;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotEncoder.java

@@ -25,7 +25,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
 
 public class CoreSnapshotEncoder extends MessageToMessageEncoder<CoreSnapshot>
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotListener.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup.storecopy.core;
 
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
 
 public interface CoreSnapshotListener
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequest.java

@@ -20,7 +20,7 @@
 package org.neo4j.coreedge.catchup.storecopy.core;
 
 import org.neo4j.coreedge.catchup.RequestMessageType;
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 
 public class CoreSnapshotRequest implements Message
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequestHandler.java

@@ -26,8 +26,8 @@
 
 import org.neo4j.coreedge.catchup.CatchupServerProtocol;
 import org.neo4j.coreedge.catchup.ResponseMessageType;
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
-import org.neo4j.coreedge.raft.state.CoreState;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreState;
 
 import static org.neo4j.coreedge.catchup.CatchupServerProtocol.NextMessage;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotResponseHandler.java

@@ -23,7 +23,7 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 
 import org.neo4j.coreedge.catchup.CatchupClientProtocol;
-import org.neo4j.coreedge.raft.state.CoreSnapshot;
+import org.neo4j.coreedge.core.state.CoreSnapshot;
 
 public class CoreSnapshotResponseHandler extends SimpleChannelInboundHandler<CoreSnapshot>
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreStateType.java

@@ -19,11 +19,11 @@
  */
 package org.neo4j.coreedge.catchup.storecopy.core;
 
-import org.neo4j.coreedge.raft.replication.session.GlobalSessionTrackerState;
-import org.neo4j.coreedge.raft.state.StateMarshal;
-import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenState;
+import org.neo4j.coreedge.core.replication.session.GlobalSessionTrackerState;
+import org.neo4j.coreedge.core.state.StateMarshal;
+import org.neo4j.coreedge.core.state.id.IdAllocationState;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenState;
 
 public enum CoreStateType
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreToCoreClient.java

@@ -44,9 +44,9 @@
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseDecoder;
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseHandler;
 import org.neo4j.coreedge.discovery.CoreTopologyService;
-import org.neo4j.coreedge.server.IdleChannelReaperHandler;
-import org.neo4j.coreedge.server.NonBlockingChannels;
-import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
+import org.neo4j.coreedge.messaging.IdleChannelReaperHandler;
+import org.neo4j.coreedge.messaging.NonBlockingChannels;
+import org.neo4j.coreedge.logging.ExceptionLoggingHandler;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.LogProvider;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/GetStoreIdRequestHandler.java

@@ -27,8 +27,8 @@
 import org.neo4j.coreedge.catchup.CatchupServerProtocol;
 import org.neo4j.coreedge.catchup.ResponseMessageType;
 import org.neo4j.coreedge.catchup.storecopy.edge.GetStoreIdRequest;
-import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal;
+import org.neo4j.coreedge.identity.StoreId;
 
 import static org.neo4j.coreedge.catchup.CatchupServerProtocol.NextMessage;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/EdgeToCoreClient.java

@@ -41,9 +41,9 @@
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseDecoder;
 import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseHandler;
 import org.neo4j.coreedge.discovery.EdgeTopologyService;
-import org.neo4j.coreedge.server.IdleChannelReaperHandler;
-import org.neo4j.coreedge.server.NonBlockingChannels;
-import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
+import org.neo4j.coreedge.messaging.IdleChannelReaperHandler;
+import org.neo4j.coreedge.messaging.NonBlockingChannels;
+import org.neo4j.coreedge.logging.ExceptionLoggingHandler;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.LogProvider;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdRequest.java

@@ -20,7 +20,7 @@
 package org.neo4j.coreedge.catchup.storecopy.edge;
 
 import org.neo4j.coreedge.catchup.RequestMessageType;
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 
 public class GetStoreIdRequest implements Message
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponse.java

@@ -21,7 +21,7 @@
 
 import java.util.Objects;
 
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 
 public class GetStoreIdResponse
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponseDecoder.java

@@ -28,8 +28,8 @@
 
 import org.neo4j.coreedge.catchup.CatchupClientProtocol;
 import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4;
-import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal;
+import org.neo4j.coreedge.identity.StoreId;
 
 public class GetStoreIdResponseDecoder  extends MessageToMessageDecoder<ByteBuf>
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreRequest.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup.storecopy.edge;
 
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 
 import org.neo4j.coreedge.catchup.RequestMessageType;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreCopyClient.java

@@ -25,8 +25,8 @@
 import org.neo4j.coreedge.catchup.storecopy.CoreClient;
 import org.neo4j.coreedge.catchup.storecopy.StoreCopyFailedException;
 import org.neo4j.coreedge.catchup.storecopy.StoreIdDownloadFailedException;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.identity.StoreId;
 
 public class StoreCopyClient
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcher.java

@@ -27,8 +27,8 @@
 import org.neo4j.coreedge.catchup.tx.edge.TransactionLogCatchUpFactory;
 import org.neo4j.coreedge.catchup.tx.edge.TransactionLogCatchUpWriter;
 import org.neo4j.coreedge.catchup.tx.edge.TxPullClient;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.logging.Log;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreIdReceiver.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup.storecopy.edge;
 
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 
 public interface StoreIdReceiver
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullRequestHandler.java

@@ -29,7 +29,7 @@
 import org.neo4j.coreedge.catchup.ResponseMessageType;
 import org.neo4j.coreedge.catchup.tx.edge.TxPullRequest;
 import org.neo4j.coreedge.catchup.tx.edge.TxPullResponse;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.cursor.IOCursor;
 import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullResponseEncoder.java

@@ -28,7 +28,7 @@
 import org.neo4j.com.CommittedTransactionSerializer;
 import org.neo4j.coreedge.catchup.storecopy.core.NetworkFlushableByteBuf;
 import org.neo4j.coreedge.catchup.tx.edge.TxPullResponse;
-import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal;
+import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal;
 
 public class TxPullResponseEncoder extends MessageToMessageEncoder<TxPullResponse>
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClient.java

@@ -20,11 +20,11 @@
 package org.neo4j.coreedge.catchup.tx.edge;
 
 import org.neo4j.coreedge.catchup.storecopy.CoreClient;
-import org.neo4j.coreedge.raft.RenewableTimeoutService;
-import org.neo4j.coreedge.raft.RenewableTimeoutService.RenewableTimeout;
-import org.neo4j.coreedge.raft.RenewableTimeoutService.TimeoutName;
-import org.neo4j.coreedge.server.MemberId;
-import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy;
+import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService;
+import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService.RenewableTimeout;
+import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService.TimeoutName;
+import org.neo4j.coreedge.identity.MemberId;
+import org.neo4j.coreedge.messaging.CoreMemberSelectionStrategy;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullClient.java

@@ -24,7 +24,7 @@
 
 import org.neo4j.coreedge.catchup.storecopy.CoreClient;
 import org.neo4j.coreedge.catchup.storecopy.StoreCopyFailedException;
-import org.neo4j.coreedge.server.MemberId;
+import org.neo4j.coreedge.identity.MemberId;
 
 public class TxPullClient
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullRequest.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup.tx.edge;
 
-import org.neo4j.coreedge.network.Message;
+import org.neo4j.coreedge.messaging.Message;
 
 import org.neo4j.coreedge.catchup.RequestMessageType;
 

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponse.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.catchup.tx.edge;
 
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation;
 
 public class TxPullResponse

enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponseDecoder.java

@@ -28,8 +28,8 @@
 
 import org.neo4j.coreedge.catchup.CatchupClientProtocol;
 import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4;
-import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageCommandReaderFactory;
 import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation;
 import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionCursor;

enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ClusterSeed.java

@@ -23,7 +23,7 @@
 import java.util.Base64;
 import java.util.Objects;
 
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 
 public class ClusterSeed
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConversionVerifier.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.coreedge.convert;
 
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.identity.StoreId;
 
 public class ConversionVerifier
 {

enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConvertClassicStoreToCoreCommand.java

@@ -23,10 +23,10 @@
 import java.io.IOException;
 import java.util.Collections;
 
-import org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding;
-import org.neo4j.coreedge.raft.state.DurableStateStorageImporter;
-import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState;
-import org.neo4j.coreedge.server.StoreId;
+import org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding;
+import org.neo4j.coreedge.core.state.DurableStateStorageImporter;
+import org.neo4j.coreedge.core.state.id.IdAllocationState;
+import org.neo4j.coreedge.identity.StoreId;
 import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;