From 1240b9090fd4bdaeb5ae6dbf3777c856744d56e5 Mon Sep 17 00:00:00 2001 From: Alistair Jones Date: Sat, 30 Jul 2016 23:10:04 +0100 Subject: [PATCH] Repackaging. --- .../org/neo4j/coreedge/ReplicationModule.java | 18 +- .../org/neo4j/coreedge/SessionTracker.java | 10 +- .../org/neo4j/coreedge/SnapFlushable.java | 2 +- .../neo4j/coreedge/catchup/CatchupServer.java | 8 +- .../coreedge/catchup/RequestMessageType.java | 2 +- .../catchup/storecopy/CoreClient.java | 12 +- .../catchup/storecopy/LocalDatabase.java | 4 +- .../storecopy/core/CoreSnapshotDecoder.java | 2 +- .../storecopy/core/CoreSnapshotEncoder.java | 2 +- .../storecopy/core/CoreSnapshotListener.java | 2 +- .../storecopy/core/CoreSnapshotRequest.java | 2 +- .../core/CoreSnapshotRequestHandler.java | 4 +- .../core/CoreSnapshotResponseHandler.java | 2 +- .../catchup/storecopy/core/CoreStateType.java | 10 +- .../storecopy/core/CoreToCoreClient.java | 6 +- .../core/GetStoreIdRequestHandler.java | 4 +- .../storecopy/edge/EdgeToCoreClient.java | 6 +- .../storecopy/edge/GetStoreIdRequest.java | 2 +- .../storecopy/edge/GetStoreIdResponse.java | 2 +- .../edge/GetStoreIdResponseDecoder.java | 4 +- .../storecopy/edge/GetStoreRequest.java | 2 +- .../storecopy/edge/StoreCopyClient.java | 4 +- .../catchup/storecopy/edge/StoreFetcher.java | 4 +- .../storecopy/edge/StoreIdReceiver.java | 2 +- .../catchup/tx/core/TxPullRequestHandler.java | 2 +- .../tx/core/TxPullResponseEncoder.java | 2 +- .../catchup/tx/edge/TxPollingClient.java | 10 +- .../catchup/tx/edge/TxPullClient.java | 2 +- .../catchup/tx/edge/TxPullRequest.java | 2 +- .../catchup/tx/edge/TxPullResponse.java | 2 +- .../tx/edge/TxPullResponseDecoder.java | 4 +- .../neo4j/coreedge/convert/ClusterSeed.java | 2 +- .../coreedge/convert/ConversionVerifier.java | 2 +- .../ConvertClassicStoreToCoreCommand.java | 8 +- .../convert/GenerateClusterSeedCommand.java | 2 +- .../neo4j/coreedge/convert/StoreMetadata.java | 2 +- .../CoreEdgeClusterSettings.java | 4 +- .../{server => }/core/CoreGraphDatabase.java | 4 +- .../{server => }/core/CoreStartupProcess.java | 5 +- .../core/EnterpriseCoreEditionModule.java | 34 +-- .../replication/DistributedOperation.java | 10 +- .../{raft => core}/replication/Progress.java | 2 +- .../replication/ProgressTracker.java | 4 +- .../replication/ProgressTrackerImpl.java | 8 +- .../replication/RaftReplicator.java | 10 +- .../replication/ReplicatedContent.java | 2 +- .../replication/Replicator.java | 2 +- .../replication/SendToMyself.java | 4 +- .../replication/session/GlobalSession.java | 4 +- .../session/GlobalSessionTrackerState.java | 10 +- .../replication/session/LocalOperationId.java | 2 +- .../replication/session/LocalSession.java | 2 +- .../replication/session/LocalSessionPool.java | 2 +- .../replication/session/OperationContext.java | 2 +- .../server}/BatchingMessageHandler.java | 5 +- .../{ => core/server}/CoreServerModule.java | 31 +-- .../state/CommandDispatcher.java | 10 +- .../{raft => core}/state/CoreSnapshot.java | 3 +- .../{raft => core}/state/CoreState.java | 9 +- .../state/CoreStateApplier.java | 4 +- .../state/CoreStateDownloader.java | 4 +- .../state/CoreStateMachines.java | 22 +- .../state}/CoreStateMachinesModule.java | 43 ++-- .../core => core/state}/DumpClusterState.java | 27 ++- .../state/DurableStateStorage.java | 3 +- .../state/DurableStateStorageImporter.java | 2 +- .../state/InFlightLogEntryReader.java | 2 +- .../state/InMemoryStateStorage.java | 2 +- .../state/LongIndexMarshal.java | 2 +- .../{raft => core}/state/RaftState.java | 10 +- .../state/ReadableRaftState.java | 6 +- .../coreedge/{raft => core}/state/Result.java | 2 +- .../state/SafeChannelMarshal.java | 4 +- .../state/SafeStateMarshal.java | 2 +- .../{raft => core}/state/StateMachine.java | 2 +- .../{raft => core}/state/StateMarshal.java | 4 +- .../state/StateRecoveryManager.java | 3 +- .../{raft => core}/state/StateStorage.java | 2 +- .../state}/id/IdAllocation.java | 2 +- .../state/id}/IdAllocationState.java | 4 +- .../state}/id/IdGenerationException.java | 2 +- .../state}/id/IdRangeIterator.java | 2 +- .../id/ReplicatedIdAllocationRequest.java | 10 +- ...plicatedIdAllocationRequestSerializer.java | 6 +- .../ReplicatedIdAllocationStateMachine.java | 9 +- .../state}/id/ReplicatedIdGenerator.java | 6 +- .../id/ReplicatedIdGeneratorFactory.java | 2 +- .../state}/id/ReplicatedIdRangeAcquirer.java | 6 +- .../state}/id/SwitchableRaftIdGenerator.java | 2 +- .../state/id}/UnallocatedIds.java | 2 +- .../state}/locks/LeaderOnlyLockManager.java | 8 +- .../core => core/state}/locks/LockToken.java | 2 +- .../locks/ReplicatedLockTokenRequest.java | 10 +- .../locks/ReplicatedLockTokenState.java | 12 +- .../ReplicatedLockTokenStateMachine.java | 8 +- .../token/ReplicatedLabelTokenHolder.java | 4 +- .../ReplicatedPropertyKeyTokenHolder.java | 4 +- ...ReplicatedRelationshipTypeTokenHolder.java | 4 +- .../state}/token/ReplicatedTokenHolder.java | 4 +- .../state}/token/ReplicatedTokenRequest.java | 8 +- .../ReplicatedTokenRequestSerializer.java | 4 +- .../token/ReplicatedTokenStateMachine.java | 8 +- .../state}/token/TokenRegistry.java | 2 +- .../state}/token/TokenType.java | 2 +- .../state}/tx/ConstantTimeRetryStrategy.java | 2 +- .../state}/tx/CoreReplicatedContent.java | 8 +- .../state}/tx/ExponentialBackoffStrategy.java | 2 +- .../state}/tx/LastCommittedIndexFinder.java | 4 +- .../state}/tx/LogIndexTxHeaderEncoding.java | 2 +- .../state}/tx/NeoStoreTransactionCounter.java | 2 +- .../state/tx}/RecoverTransactionLogState.java | 3 +- .../state}/tx/ReplayableCommitProcess.java | 2 +- .../state}/tx/ReplicatedTransaction.java | 6 +- .../ReplicatedTransactionCommitProcess.java | 6 +- .../tx/ReplicatedTransactionFactory.java | 2 +- .../tx/ReplicatedTransactionSerializer.java | 2 +- .../tx/ReplicatedTransactionStateMachine.java | 10 +- .../state}/tx/RetryStrategy.java | 2 +- .../state}/tx/TransactionCounter.java | 2 +- .../coreedge/discovery/ClusterTopology.java | 2 +- .../coreedge/discovery/CoreAddresses.java | 2 +- .../discovery/DiscoveryServiceFactory.java | 2 +- .../coreedge/discovery/EdgeAddresses.java | 2 +- .../discovery/EdgeTopologyService.java | 2 +- .../coreedge/discovery/HazelcastClient.java | 2 +- .../discovery/HazelcastClientConnector.java | 4 +- .../discovery/HazelcastClusterTopology.java | 8 +- .../HazelcastDiscoveryServiceFactory.java | 4 +- .../discovery/HazelcastServerLifecycle.java | 8 +- .../RaftDiscoveryServiceConnector.java | 2 +- .../AcquireEndpointsProcedure.java | 6 +- .../procedures}/ClusterOverviewProcedure.java | 10 +- .../procedures}/DiscoverMembersProcedure.java | 4 +- .../procedures}/RoleProcedure.java | 2 +- .../{server => }/edge/EdgeGraphDatabase.java | 2 +- .../{server => }/edge/EdgeStartupProcess.java | 9 +- .../edge/EnterpriseEdgeEditionModule.java | 17 +- .../{server => identity}/MemberId.java | 4 +- .../{server => identity}/StoreId.java | 2 +- .../logging/BetterMessageLogger.java | 2 +- .../logging/ExceptionLoggingHandler.java | 2 +- .../{server => }/logging/MessageLogger.java | 2 +- .../logging/NullMessageLogger.java | 2 +- .../AdvertisedSocketAddress.java | 9 +- .../AlwaysChooseFirstMember.java | 4 +- .../{server => messaging}/BoltAddress.java | 2 +- .../ByteBufferMarshal.java | 2 +- .../state => messaging}/ChannelMarshal.java | 3 +- .../ConnectToRandomCoreMember.java | 4 +- .../CoreMemberSelectionStrategy.java | 4 +- .../EndOfStreamException.java | 2 +- .../IdleChannelReaperHandler.java | 2 +- .../LeaderOnlySelectionStrategy.java | 5 +- .../ListenSocketAddress.java | 2 +- .../{network => messaging}/Message.java | 2 +- .../NonBlockingChannels.java | 2 +- .../NotMyselfSelectionStrategy.java | 5 +- .../{server => messaging}/SenderService.java | 3 +- .../marsalling}/StringMarshal.java | 2 +- .../marsalling}/storeid/StoreIdMarshal.java | 4 +- .../neo4j/coreedge/raft/ConsensusModule.java | 33 +-- .../neo4j/coreedge/raft/CoreEdgeMetaData.java | 25 --- .../org/neo4j/coreedge/raft/Followers.java | 2 +- .../neo4j/coreedge/raft/LeaderLocator.java | 2 +- .../raft/MismatchedStoreIdService.java | 2 +- .../neo4j/coreedge/raft/NewLeaderBarrier.java | 2 +- .../org/neo4j/coreedge/raft/RaftInstance.java | 15 +- .../coreedge/raft/RaftMessageHandler.java | 2 +- .../org/neo4j/coreedge/raft/RaftMessages.java | 8 +- .../org/neo4j/coreedge/raft/RaftServer.java | 8 +- .../neo4j/coreedge/raft/RaftStateMachine.java | 2 +- .../neo4j/coreedge/raft/log/EntryRecord.java | 6 +- .../neo4j/coreedge/raft/log/RaftLogEntry.java | 2 +- .../log/segmented/DumpSegmentedRaftLog.java | 4 +- .../raft/log/segmented/EntryRecordCursor.java | 6 +- .../raft/log/segmented/RecoveryProtocol.java | 6 +- .../raft/log/segmented/SegmentFile.java | 6 +- .../raft/log/segmented/SegmentHeader.java | 4 +- .../raft/log/segmented/SegmentedRaftLog.java | 4 +- .../coreedge/raft/log/segmented/Segments.java | 4 +- .../coreedge/raft/membership/CatchupGoal.java | 2 +- .../raft/membership/CatchupGoalTracker.java | 2 +- .../coreedge/raft/membership/MemberIdSet.java | 2 +- .../raft/membership/MemberIdSetBuilder.java | 2 +- .../membership/MemberIdSetSerializer.java | 4 +- .../membership/MembershipEntry.java | 8 +- .../raft/membership/MembershipWaiter.java | 4 +- .../MembershipWaiterLifecycle.java | 3 +- .../coreedge/raft/membership/RaftGroup.java | 2 +- .../raft/membership/RaftMembership.java | 2 +- .../membership/RaftMembershipChanger.java | 4 +- .../membership/RaftMembershipManager.java | 9 +- .../membership/RaftMembershipState.java | 8 +- ...aftMembershipStateMachineEventHandler.java | 4 +- .../neo4j/coreedge/raft/net/CoreOutbound.java | 6 +- .../net/CoreReplicatedContentMarshal.java | 22 +- .../org/neo4j/coreedge/raft/net/Inbound.java | 2 +- .../coreedge/raft/net/LoggingInbound.java | 6 +- .../coreedge/raft/net/LoggingOutbound.java | 4 +- .../coreedge/raft/net/NonBlockingChannel.java | 4 +- .../org/neo4j/coreedge/raft/net/Outbound.java | 2 +- .../raft/net/RaftChannelInitializer.java | 6 +- .../neo4j/coreedge/raft/net/RaftOutbound.java | 6 +- .../net/ReplicatedLockTokenSerializer.java | 6 +- .../raft/net/UnknownAddressMonitor.java | 2 +- .../raft/net/codecs/RaftMessageDecoder.java | 12 +- .../raft/net/codecs/RaftMessageEncoder.java | 10 +- .../neo4j/coreedge/raft/outcome/Messages.java | 2 +- .../neo4j/coreedge/raft/outcome/Outcome.java | 8 +- .../coreedge/raft/outcome/ShipCommand.java | 2 +- .../replication/MarshallingException.java | 28 --- .../neo4j/coreedge/raft/roles/Appending.java | 4 +- .../neo4j/coreedge/raft/roles/Candidate.java | 2 +- .../neo4j/coreedge/raft/roles/Election.java | 4 +- .../neo4j/coreedge/raft/roles/Follower.java | 2 +- .../org/neo4j/coreedge/raft/roles/Heart.java | 2 +- .../org/neo4j/coreedge/raft/roles/Leader.java | 10 +- .../org/neo4j/coreedge/raft/roles/Voting.java | 4 +- .../follower/FollowerState.java | 2 +- .../follower/FollowerStates.java | 2 +- .../DelayedRenewableTimeoutService.java | 4 +- .../RenewableTimeoutService.java | 2 +- .../shipping/RaftLogShipper.java | 16 +- .../shipping/RaftLogShippingManager.java | 4 +- .../raft/state/CommandApplicationProcess.java | 16 +- .../term/MonitoredTermStateStorage.java | 4 +- .../raft/{state => }/term/TermState.java | 4 +- .../raft/{state => }/vote/VoteState.java | 10 +- .../org/neo4j/coreedge/server/Decoder.java | 27 --- .../org/neo4j/coreedge/server/Disposable.java | 25 --- .../org/neo4j/coreedge/server/Encodable.java | 25 --- .../org/neo4j/coreedge/server/Encoder.java | 28 --- .../server/core/DeleteStoreOnStartUp.java | 39 ---- .../core/NoBoltConnectivityException.java | 30 --- .../coreedge/EdgeStartupProcessTest.java | 203 ------------------ .../java/org/neo4j/coreedge/TestStoreId.java | 3 +- .../neo4j/coreedge/backup/BackupCoreIT.java | 6 +- .../catchup/storecopy/LocalDatabaseTest.java | 4 +- .../storecopy/edge/StoreFetcherTest.java | 2 +- .../tx/TxPullResponseEncodeDecodeTest.java | 2 +- .../catchup/tx/edge/TxPollingClientTest.java | 8 +- .../convert/ConversionMetaDataTest.java | 2 +- .../convert/ConversionVerifierTest.java | 2 +- .../{ => core}/CoreStartupProcessTest.java | 12 +- .../CoreReplicatedContentMarshalTest.java | 18 +- .../replication/DirectReplicator.java | 4 +- .../replication/ProgressTrackerImplTest.java | 8 +- .../replication/RaftReplicatorTest.java | 16 +- .../session/LocalSessionPoolTest.java | 4 +- .../server}/BatchingMessageHandlerTest.java | 6 +- .../state/CoreStateApplierTest.java | 2 +- .../state/CoreStateMachinesTest.java | 22 +- .../{raft => core}/state/CoreStateTest.java | 7 +- .../state/DurableStateStorageIT.java | 3 +- .../state/DurableStateStorageTest.java | 2 +- .../state/InFlightLogEntryReaderTest.java | 2 +- .../state/RaftStateBuilder.java | 10 +- .../{raft => core}/state/RaftStateTest.java | 12 +- .../state/id}/IdAllocationStateTest.java | 4 +- .../state}/id/IdRangeIteratorTest.java | 2 +- ...eplicatedIdAllocationStateMachineTest.java | 7 +- .../state}/id/ReplicatedIdGeneratorTest.java | 2 +- .../id/ReplicatedIdRangeAcquirerTest.java | 9 +- .../state}/id/StateRecoveryManagerTest.java | 6 +- .../locks/LeaderOnlyLockManagerTest.java | 10 +- .../ReplicatedLockTokenStateMachineTest.java | 14 +- .../token/ReplicatedTokenHolderTest.java | 6 +- .../ReplicatedTokenStateMachineTest.java | 8 +- ...tProcessStateMachineCollaborationTest.java | 8 +- .../tx/ExponentialBackoffStrategyTest.java | 2 +- .../tx/LogIndexTxHeaderEncodingTest.java | 6 +- .../tx/ReplayableCommitProcessTest.java | 2 +- ...eplicatedTransactionCommitProcessTest.java | 6 +- ...ReplicatedTransactionStateMachineTest.java | 6 +- .../org/neo4j/coreedge/discovery/Cluster.java | 12 +- .../coreedge/discovery/CoreClusterMember.java | 12 +- .../coreedge/discovery/EdgeClusterMember.java | 6 +- .../discovery/HazelcastClientTest.java | 2 +- .../HazelcastClusterTopologyTest.java | 12 +- .../discovery/SharedDiscoveryCoreClient.java | 8 +- .../discovery/SharedDiscoveryEdgeClient.java | 2 +- .../discovery/SharedDiscoveryService.java | 2 +- .../AcquireEndpointsProcedureTest.java | 36 ++-- .../ClusterOverviewProcedureTest.java | 14 +- .../DiscoverMembersProcedureTest.java | 8 +- .../procedures}/RoleProcedureTest.java | 2 +- .../coreedge/edge/EdgeStartupProcessTest.java | 199 +++++++++++++++++ .../{server => identity}/RaftTestMember.java | 2 +- .../RaftTestMemberSetBuilder.java | 4 +- .../IdleChannelReaperHandlerTest.java | 2 +- .../TestNetwork.java} | 8 +- ...dvertisedSocketAddressMarshallingTest.java | 5 +- .../marsalling/StringMarshalTest.java} | 4 +- .../org/neo4j/coreedge/raft/CatchUpTest.java | 6 +- .../neo4j/coreedge/raft/DirectNetworking.java | 4 +- .../coreedge/raft/EmptyStateMachine.java | 2 +- .../neo4j/coreedge/raft/HeartbeatBuilder.java | 2 +- .../org/neo4j/coreedge/raft/MessageUtils.java | 2 +- .../raft/OutboundMessageCollector.java | 4 +- .../coreedge/raft/RaftInstanceBuilder.java | 18 +- .../neo4j/coreedge/raft/RaftInstanceTest.java | 7 +- .../neo4j/coreedge/raft/RaftTestFixture.java | 8 +- .../coreedge/raft/ReplicatedInteger.java | 2 +- .../neo4j/coreedge/raft/ReplicatedString.java | 2 +- .../coreedge/raft/TestMessageBuilders.java | 5 + .../elections/DisconnectLeaderScenario.java | 2 +- .../raft/elections/ElectionPerformanceIT.java | 10 +- .../coreedge/raft/elections/ElectionUtil.java | 2 +- .../coreedge/raft/elections/Fixture.java | 16 +- .../explorer/ClusterSafetyViolations.java | 4 +- .../explorer/ClusterSafetyViolationsTest.java | 10 +- .../{state => }/explorer/ClusterState.java | 8 +- .../explorer/ComparableRaftLog.java | 2 +- .../explorer/ComparableRaftState.java | 8 +- .../explorer/ComparableRaftStateTest.java | 4 +- .../{state => }/explorer/action/Action.java | 4 +- .../explorer/action/DropMessage.java | 6 +- .../explorer/action/ElectionTimeout.java | 6 +- .../explorer/action/HeartbeatTimeout.java | 6 +- .../{state => }/explorer/action/NewEntry.java | 6 +- .../explorer/action/OutOfOrderDelivery.java | 6 +- .../action/OutOfOrderDeliveryTest.java | 6 +- .../explorer/action/ProcessMessage.java | 8 +- .../log/DummyRaftableContentSerializer.java | 6 +- .../log/RaftContentByteBufferMarshalTest.java | 12 +- .../raft/log/RaftInstanceLogTest.java | 8 +- .../raft/log/RaftLogDurabilityTest.java | 4 +- .../raft/log/debug/ReplayRaftLog.java | 8 +- .../raft/log/segmented/EntryCursorTest.java | 2 +- .../log/segmented/RecoveryProtocolTest.java | 4 +- .../raft/log/segmented/SegmentHeaderTest.java | 2 +- .../SegmentedConcurrentStressIT.java | 2 +- .../segmented/SegmentedRaftLogCursorIT.java | 2 +- .../SegmentedRaftLogRotationTest.java | 2 +- .../SegmentedRaftLogVerificationIT.java | 2 +- .../raft/log/segmented/SegmentsTest.java | 4 +- .../raft/membership/CatchupGoalTest.java | 2 +- .../membership/CatchupGoalTrackerTest.java | 2 +- .../raft/membership/MemberIdMarshalTest.java | 4 +- .../raft/membership/MembershipWaiterTest.java | 7 +- .../membership/RaftGroupMembershipTest.java | 6 +- .../membership/RaftMembershipManagerTest.java | 5 +- .../membership/RaftMembershipStateTest.java | 6 +- .../raft/membership/RaftTestGroup.java | 4 +- .../raft/net/RaftMessageProcessingTest.java | 8 +- .../raft/net/UnknownAddressMonitorTest.java | 2 +- .../RaftMessageEncodingDecodingTest.java | 18 +- .../AppendEntriesMessageFlowTest.java | 12 +- .../AppendEntriesRequestBuilder.java | 5 +- .../raft/roles/AppendEntriesRequestTest.java | 8 +- .../AppendEntriesResponseBuilder.java | 5 +- .../coreedge/raft/roles/AppendingTest.java | 6 +- .../coreedge/raft/roles/CandidateTest.java | 8 +- .../coreedge/raft/roles/ElectionTest.java | 8 +- .../coreedge/raft/roles/FollowerTest.java | 8 +- .../coreedge/raft/roles/HeartbeatTest.java | 8 +- .../neo4j/coreedge/raft/roles/LeaderTest.java | 14 +- .../roles/NonFollowerVoteRequestTest.java | 8 +- .../coreedge/raft/roles/VoteRequestTest.java | 8 +- .../ControlledRenewableTimeoutService.java | 2 +- .../DelayedRenewableTimeoutServiceTest.java | 2 +- .../shipping/RaftLogShipperTest.java | 6 +- .../state/CommandApplicationProcessTest.java | 21 +- .../term/MonitoredTermStateStorageTest.java | 4 +- .../raft/{state => term}/TermStateTest.java | 4 +- .../raft/{ => vote}/VoteRequestBuilder.java | 5 +- .../raft/{ => vote}/VoteResponseBuilder.java | 5 +- .../raft/{state => vote}/VoteStateTest.java | 34 ++- .../coreedge/raft/{ => vote}/VotingTest.java | 4 +- .../scenarios/ClusterDiscoveryIT.java | 4 +- .../scenarios/ClusterFormationIT.java | 2 +- .../{ => scenarios}/ClusterIdentityIT.java | 4 +- .../coreedge/scenarios/ClusterOverviewIT.java | 2 +- .../scenarios/ConvertNonCoreEdgeStoreIT.java | 4 +- .../coreedge/scenarios/CorePruningIT.java | 6 +- .../coreedge/scenarios/CoreReplicationIT.java | 2 +- .../scenarios/CoreToCoreCopySnapshotIT.java | 8 +- .../scenarios/EdgeServerReplicationIT.java | 8 +- .../neo4j/coreedge/server/StringMessage.java | 29 --- .../neo4j/restore/RestoreClusterCliTest.java | 3 +- .../org/neo4j/metrics/CoreEdgeMetricsIT.java | 4 +- .../enterprise/EnterpriseNeoServer.java | 4 +- .../rest/CoreDatabaseAvailabilityService.java | 2 +- .../rest/EdgeDatabaseAvailabilityService.java | 2 +- 384 files changed, 1268 insertions(+), 1508 deletions(-) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => core}/CoreEdgeClusterSettings.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/core/CoreGraphDatabase.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/core/CoreStartupProcess.java (90%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/core/EnterpriseCoreEditionModule.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/DistributedOperation.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/Progress.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/ProgressTracker.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/ProgressTrackerImpl.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/RaftReplicator.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/ReplicatedContent.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/Replicator.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/SendToMyself.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/GlobalSession.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/GlobalSessionTrackerState.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/LocalOperationId.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/LocalSession.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/LocalSessionPool.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/replication/session/OperationContext.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core/server}/BatchingMessageHandler.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{ => core/server}/CoreServerModule.java (91%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CommandDispatcher.java (80%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CoreSnapshot.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CoreState.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CoreStateApplier.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CoreStateDownloader.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/CoreStateMachines.java (90%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{ => core/state}/CoreStateMachinesModule.java (86%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/DumpClusterState.java (74%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/DurableStateStorage.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/DurableStateStorageImporter.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/InFlightLogEntryReader.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/InMemoryStateStorage.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/LongIndexMarshal.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/RaftState.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/ReadableRaftState.java (89%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/Result.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/SafeChannelMarshal.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/SafeStateMarshal.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/StateMachine.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/StateMarshal.java (91%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/StateRecoveryManager.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft => core}/state/StateStorage.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/IdAllocation.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/state/id_allocation => core/state/id}/IdAllocationState.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/IdGenerationException.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/IdRangeIterator.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdAllocationRequest.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdAllocationRequestSerializer.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdAllocationStateMachine.java (90%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdGenerator.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdGeneratorFactory.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdRangeAcquirer.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/id/SwitchableRaftIdGenerator.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/state/id_allocation => core/state/id}/UnallocatedIds.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/locks/LeaderOnlyLockManager.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/locks/LockToken.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/locks/ReplicatedLockTokenRequest.java (90%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/locks/ReplicatedLockTokenState.java (89%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state}/locks/ReplicatedLockTokenStateMachine.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedLabelTokenHolder.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedPropertyKeyTokenHolder.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedRelationshipTypeTokenHolder.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenHolder.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenRequest.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenRequestSerializer.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenStateMachine.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/TokenRegistry.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/token/TokenType.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ConstantTimeRetryStrategy.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/CoreReplicatedContent.java (82%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ExponentialBackoffStrategy.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/LastCommittedIndexFinder.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/LogIndexTxHeaderEncoding.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/NeoStoreTransactionCounter.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => core/state/tx}/RecoverTransactionLogState.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplayableCommitProcess.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransaction.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionCommitProcess.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionFactory.java (99%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionSerializer.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionStateMachine.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/RetryStrategy.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/TransactionCounter.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => discovery/procedures}/AcquireEndpointsProcedure.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => discovery/procedures}/ClusterOverviewProcedure.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => discovery/procedures}/DiscoverMembersProcedure.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => discovery/procedures}/RoleProcedure.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/edge/EdgeGraphDatabase.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/edge/EdgeStartupProcess.java (93%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/edge/EnterpriseEdgeEditionModule.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => identity}/MemberId.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => identity}/StoreId.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/logging/BetterMessageLogger.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/logging/ExceptionLoggingHandler.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/logging/MessageLogger.java (95%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => }/logging/NullMessageLogger.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/AdvertisedSocketAddress.java (88%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/edge => messaging}/AlwaysChooseFirstMember.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/BoltAddress.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/state => messaging}/ByteBufferMarshal.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/state => messaging}/ChannelMarshal.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/edge => messaging}/ConnectToRandomCoreMember.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/edge => messaging}/CoreMemberSelectionStrategy.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/state => messaging}/EndOfStreamException.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/IdleChannelReaperHandler.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => messaging}/LeaderOnlySelectionStrategy.java (89%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/ListenSocketAddress.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{network => messaging}/Message.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/NonBlockingChannels.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => messaging}/NotMyselfSelectionStrategy.java (92%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server => messaging}/SenderService.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => messaging/marsalling}/StringMarshal.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{raft/replication => messaging/marsalling}/storeid/StoreIdMarshal.java (95%) delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/CoreEdgeMetaData.java rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => }/membership/MembershipEntry.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/{server/core => raft/membership}/MembershipWaiterLifecycle.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => }/membership/RaftMembershipState.java (97%) delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/MarshallingException.java rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => roles}/follower/FollowerState.java (97%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => roles}/follower/FollowerStates.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{ => schedule}/DelayedRenewableTimeoutService.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{ => schedule}/RenewableTimeoutService.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{replication => }/shipping/RaftLogShipper.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{replication => }/shipping/RaftLogShippingManager.java (98%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => }/term/MonitoredTermStateStorage.java (94%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => }/term/TermState.java (96%) rename enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/{state => }/vote/VoteState.java (92%) delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Decoder.java delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Disposable.java delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encodable.java delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encoder.java delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DeleteStoreOnStartUp.java delete mode 100644 enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NoBoltConnectivityException.java delete mode 100644 enterprise/core-edge/src/test/java/org/neo4j/coreedge/EdgeStartupProcessTest.java rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{ => core}/CoreStartupProcessTest.java (91%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/replication/CoreReplicatedContentMarshalTest.java (89%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/replication/DirectReplicator.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/replication/ProgressTrackerImplTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/replication/RaftReplicatorTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/replication/session/LocalSessionPoolTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core/server}/BatchingMessageHandlerTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/CoreStateApplierTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/CoreStateMachinesTest.java (91%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/CoreStateTest.java (91%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/DurableStateStorageIT.java (99%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/DurableStateStorageTest.java (99%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/InFlightLogEntryReaderTest.java (99%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/RaftStateBuilder.java (95%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft => core}/state/RaftStateTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/state/id_allocation => core/state/id}/IdAllocationStateTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/id/IdRangeIteratorTest.java (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdAllocationStateMachineTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdGeneratorTest.java (99%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/id/ReplicatedIdRangeAcquirerTest.java (93%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/id/StateRecoveryManagerTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => core/state}/locks/LeaderOnlyLockManagerTest.java (92%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => core/state}/locks/ReplicatedLockTokenStateMachineTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenHolderTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/token/ReplicatedTokenStateMachineTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/CommitProcessStateMachineCollaborationTest.java (92%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ExponentialBackoffStrategyTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/LogIndexTxHeaderEncodingTest.java (86%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplayableCommitProcessTest.java (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionCommitProcessTest.java (93%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication => core/state}/tx/ReplicatedTransactionStateMachineTest.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => discovery/procedures}/AcquireEndpointsProcedureTest.java (82%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => discovery/procedures}/ClusterOverviewProcedureTest.java (86%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => discovery/procedures}/DiscoverMembersProcedureTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server/core => discovery/procedures}/RoleProcedureTest.java (97%) create mode 100644 enterprise/core-edge/src/test/java/org/neo4j/coreedge/edge/EdgeStartupProcessTest.java rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server => identity}/RaftTestMember.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server => identity}/RaftTestMemberSetBuilder.java (93%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server => messaging}/IdleChannelReaperHandlerTest.java (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/RaftTestNetwork.java => messaging/TestNetwork.java} (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{server => messaging/marsalling}/AdvertisedSocketAddressMarshallingTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{raft/replication/StringByteBufferMarshalTest.java => messaging/marsalling/StringMarshalTest.java} (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ClusterSafetyViolations.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ClusterSafetyViolationsTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ClusterState.java (93%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ComparableRaftLog.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ComparableRaftState.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/ComparableRaftStateTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/Action.java (89%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/DropMessage.java (90%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/ElectionTimeout.java (90%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/HeartbeatTimeout.java (90%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/NewEntry.java (91%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/OutOfOrderDelivery.java (91%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/OutOfOrderDeliveryTest.java (90%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/explorer/action/ProcessMessage.java (92%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/membership/RaftMembershipStateTest.java (96%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => roles}/AppendEntriesMessageFlowTest.java (95%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => roles}/AppendEntriesRequestBuilder.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => roles}/AppendEntriesResponseBuilder.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => schedule}/ControlledRenewableTimeoutService.java (97%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => schedule}/DelayedRenewableTimeoutServiceTest.java (99%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{replication => }/shipping/RaftLogShipperTest.java (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => }/term/MonitoredTermStateStorageTest.java (95%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => term}/TermStateTest.java (94%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => vote}/VoteRequestBuilder.java (93%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => vote}/VoteResponseBuilder.java (92%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{state => vote}/VoteStateTest.java (80%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/{ => vote}/VotingTest.java (98%) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/{ => scenarios}/ClusterIdentityIT.java (98%) delete mode 100644 enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/StringMessage.java diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/ReplicationModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/ReplicationModule.java index c1860e3725a6..aeac6426f600 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/ReplicationModule.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SessionTracker.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SessionTracker.java index 5eb4d310a8f5..b1ef96edb255 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SessionTracker.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SnapFlushable.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SnapFlushable.java index 0432d40a1b5b..e53d12ebb8cb 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/SnapFlushable.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/CatchupServer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/CatchupServer.java index 0f4f2abab5a3..39e38555ae70 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/CatchupServer.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/RequestMessageType.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/RequestMessageType.java index 0c73cc6ed3af..7bcb77b3f7a7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/RequestMessageType.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/CoreClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/CoreClient.java index abf7458f7a1a..56499ad3c721 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/CoreClient.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabase.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabase.java index 08086c03aff2..8984dd8dc93c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabase.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotDecoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotDecoder.java index 219fb15eb062..226a7199e142 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotDecoder.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotEncoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotEncoder.java index d81d9718ec3a..4b95e6ac5fa5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotEncoder.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotListener.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotListener.java index 23369adf1906..c8bab7b2c8c1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotListener.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequest.java index 0e295972c1c0..ee5bd77cc23c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequest.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequestHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequestHandler.java index 293c6a025441..3a5fd3783807 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotRequestHandler.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotResponseHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotResponseHandler.java index 33fe327d2644..8c0ea86b6e4d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreSnapshotResponseHandler.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreStateType.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreStateType.java index 584a29b18960..cc53fed48b4a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreStateType.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreToCoreClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreToCoreClient.java index f24b3583aaad..d102c4af7156 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/CoreToCoreClient.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/GetStoreIdRequestHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/GetStoreIdRequestHandler.java index 53959953869c..a537d9e300a9 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/core/GetStoreIdRequestHandler.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/EdgeToCoreClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/EdgeToCoreClient.java index abf213df239a..cb9e78acf5ee 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/EdgeToCoreClient.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdRequest.java index 72b111cf109b..ed14c8823080 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdRequest.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponse.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponse.java index d42e7b93d4fb..e8a774b0140d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponse.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponseDecoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponseDecoder.java index 4389bb59a6f8..5f7779f3c46e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreIdResponseDecoder.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreRequest.java index a276737d4e2e..93c5886bc3fa 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/GetStoreRequest.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreCopyClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreCopyClient.java index e6386f9d2414..5f46161c7598 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreCopyClient.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcher.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcher.java index 61b430ea8819..5f7e00bb79ed 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcher.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreIdReceiver.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreIdReceiver.java index 742b4576f1a6..061501af6202 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreIdReceiver.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullRequestHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullRequestHandler.java index b4d4e41bea47..7de5301dfaf4 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullRequestHandler.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullResponseEncoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullResponseEncoder.java index fb2b8f07020d..fc5a422ceb77 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/core/TxPullResponseEncoder.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClient.java index 6322cde1250f..5696d17aa3ff 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClient.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullClient.java index 6b32ff8d4360..a480b4b051ef 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullClient.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullRequest.java index fbb45d93823d..8e5ce239f5cb 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullRequest.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponse.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponse.java index a4e298bf9c01..823f461e15a2 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponse.java +++ b/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 diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponseDecoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponseDecoder.java index 8c3ffde2a661..64c6f721e65b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/catchup/tx/edge/TxPullResponseDecoder.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ClusterSeed.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ClusterSeed.java index e6e35e355c65..8dab2816af52 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ClusterSeed.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConversionVerifier.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConversionVerifier.java index 1fdae63831ea..2179acf83cfc 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConversionVerifier.java +++ b/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 { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConvertClassicStoreToCoreCommand.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConvertClassicStoreToCoreCommand.java index a94d3d9daccb..cf4fc7d8e7ad 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/ConvertClassicStoreToCoreCommand.java +++ b/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; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommand.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommand.java index 4ab0232ab977..71fb7b192d6d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommand.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/GenerateClusterSeedCommand.java @@ -22,7 +22,7 @@ import java.io.File; import java.io.IOException; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/StoreMetadata.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/StoreMetadata.java index 9c87fd7c5a90..b953403df6c0 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/StoreMetadata.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/convert/StoreMetadata.java @@ -21,7 +21,7 @@ import java.util.Objects; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; public class StoreMetadata { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/CoreEdgeClusterSettings.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/CoreEdgeClusterSettings.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java index 3ee286a381ac..e5e802c53a0b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/CoreEdgeClusterSettings.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java @@ -17,12 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.core; import java.net.InetSocketAddress; import java.util.List; import java.util.function.Function; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.ListenSocketAddress; import org.neo4j.graphdb.config.Setting; import org.neo4j.graphdb.factory.Description; import org.neo4j.kernel.configuration.Internal; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreGraphDatabase.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreGraphDatabase.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreGraphDatabase.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreGraphDatabase.java index 7417fae869be..3b04e9b0a34e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreGraphDatabase.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreGraphDatabase.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.core; import java.io.File; import java.util.Map; @@ -27,7 +27,7 @@ import org.neo4j.coreedge.discovery.HazelcastDiscoveryServiceFactory; import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.factory.EditionModule; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreStartupProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreStartupProcess.java similarity index 90% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreStartupProcess.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreStartupProcess.java index c1c43b1f113b..b688c823f0b3 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/CoreStartupProcess.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreStartupProcess.java @@ -17,9 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.core; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdGeneratorFactory; +import org.neo4j.coreedge.core.state.id.ReplicatedIdGeneratorFactory; +import org.neo4j.coreedge.raft.membership.MembershipWaiterLifecycle; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.lifecycle.Lifecycle; 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/core/EnterpriseCoreEditionModule.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/EnterpriseCoreEditionModule.java index a82b001781a6..9b815f2e2d8d 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/core/EnterpriseCoreEditionModule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.core; import java.io.File; import java.io.FileNotFoundException; @@ -27,8 +27,8 @@ import java.util.UUID; import java.util.function.Supplier; -import org.neo4j.coreedge.CoreServerModule; -import org.neo4j.coreedge.CoreStateMachinesModule; +import org.neo4j.coreedge.core.server.CoreServerModule; +import org.neo4j.coreedge.core.state.CoreStateMachinesModule; import org.neo4j.coreedge.ReplicationModule; import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.catchup.storecopy.StoreFiles; @@ -44,16 +44,19 @@ import org.neo4j.coreedge.raft.net.RaftChannelInitializer; import org.neo4j.coreedge.raft.net.RaftOutbound; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.MemberId.MemberIdMarshal; -import org.neo4j.coreedge.server.NonBlockingChannels; -import org.neo4j.coreedge.server.SenderService; -import org.neo4j.coreedge.server.logging.BetterMessageLogger; -import org.neo4j.coreedge.server.logging.MessageLogger; -import org.neo4j.coreedge.server.logging.NullMessageLogger; +import org.neo4j.coreedge.core.state.DurableStateStorage; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.MemberId.MemberIdMarshal; +import org.neo4j.coreedge.messaging.NonBlockingChannels; +import org.neo4j.coreedge.messaging.SenderService; +import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure; +import org.neo4j.coreedge.discovery.procedures.ClusterOverviewProcedure; +import org.neo4j.coreedge.discovery.procedures.DiscoverMembersProcedure; +import org.neo4j.coreedge.discovery.procedures.RoleProcedure; +import org.neo4j.coreedge.logging.BetterMessageLogger; +import org.neo4j.coreedge.logging.MessageLogger; +import org.neo4j.coreedge.logging.NullMessageLogger; import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.DefaultFileSystemAbstraction; @@ -88,7 +91,7 @@ import org.neo4j.logging.LogProvider; import org.neo4j.udc.UsageData; -import static org.neo4j.coreedge.server.core.RoleProcedure.CoreOrEdge.CORE; +import static org.neo4j.coreedge.discovery.procedures.RoleProcedure.CoreOrEdge.CORE; /** * This implementation of {@link org.neo4j.kernel.impl.factory.EditionModule} creates the implementations of services @@ -125,7 +128,8 @@ public void registerProcedures( Procedures procedures ) } } - EnterpriseCoreEditionModule( final PlatformModule platformModule, DiscoveryServiceFactory discoveryServiceFactory ) + public EnterpriseCoreEditionModule( final PlatformModule platformModule, DiscoveryServiceFactory + discoveryServiceFactory ) { final Dependencies dependencies = platformModule.dependencies; final Config config = platformModule.config; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/DistributedOperation.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/DistributedOperation.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/DistributedOperation.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/DistributedOperation.java index 086f69002296..4937a4a3ccf8 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/DistributedOperation.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/DistributedOperation.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.io.IOException; import java.util.UUID; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; -import org.neo4j.coreedge.raft.replication.session.GlobalSession; -import org.neo4j.coreedge.raft.replication.session.LocalOperationId; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.session.GlobalSession; +import org.neo4j.coreedge.core.replication.session.LocalOperationId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Progress.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Progress.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Progress.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Progress.java index ee9be19123bc..7541a7c1fc03 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Progress.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Progress.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Semaphore; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTracker.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTracker.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTracker.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTracker.java index b4d77009d0f0..10bb6eb87867 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTracker.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTracker.java @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.state.Result; /** * Keeps track of operations in progress. Operations move through two phases: diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImpl.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTrackerImpl.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImpl.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTrackerImpl.java index 05421649ebcb..591a62f1c9fa 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImpl.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ProgressTrackerImpl.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.neo4j.coreedge.raft.replication.session.GlobalSession; -import org.neo4j.coreedge.raft.replication.session.LocalOperationId; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.replication.session.GlobalSession; +import org.neo4j.coreedge.core.replication.session.LocalOperationId; +import org.neo4j.coreedge.core.state.Result; public class ProgressTrackerImpl implements ProgressTracker { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/RaftReplicator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/RaftReplicator.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/RaftReplicator.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/RaftReplicator.java index c081111d84d0..9ef6a2bc0829 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/RaftReplicator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/RaftReplicator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.util.concurrent.Future; import java.util.function.BiConsumer; @@ -26,10 +26,10 @@ import org.neo4j.coreedge.raft.NoLeaderFoundException; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.raft.replication.session.LocalSessionPool; -import org.neo4j.coreedge.raft.replication.session.OperationContext; -import org.neo4j.coreedge.raft.replication.tx.RetryStrategy; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.session.LocalSessionPool; +import org.neo4j.coreedge.core.replication.session.OperationContext; +import org.neo4j.coreedge.core.state.tx.RetryStrategy; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.util.Listener; /** diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ReplicatedContent.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ReplicatedContent.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ReplicatedContent.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ReplicatedContent.java index 3fa4769b9d81..8625700d775d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/ReplicatedContent.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/ReplicatedContent.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; /** * Marker interface for types that are diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Replicator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Replicator.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Replicator.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Replicator.java index f21c8fab782f..a0bf13280a1a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/Replicator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/Replicator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.util.concurrent.Future; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/SendToMyself.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/SendToMyself.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/SendToMyself.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/SendToMyself.java index e7d1d0a6660a..fa87c3aaf5b5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/SendToMyself.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/SendToMyself.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class SendToMyself { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSession.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSession.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSession.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSession.java index 1e9fe2bbd9a0..d65977577261 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSession.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSession.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import java.util.UUID; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSessionTrackerState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSessionTrackerState.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSessionTrackerState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSessionTrackerState.java index 876d6b9fb3cf..e3528a57fe61 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/GlobalSessionTrackerState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/GlobalSessionTrackerState.java @@ -17,17 +17,17 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalOperationId.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalOperationId.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalOperationId.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalOperationId.java index 2a7ca265b887..7c29485cc45b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalOperationId.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalOperationId.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSession.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSession.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSession.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSession.java index a979f9ae99c3..8b90a05d3069 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSession.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSession.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPool.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSessionPool.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPool.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSessionPool.java index 8499a19614d5..005cb122514d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPool.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/LocalSessionPool.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import java.util.EmptyStackException; import java.util.Stack; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/OperationContext.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/OperationContext.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/OperationContext.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/OperationContext.java index 139941940780..7ffd00eb6e4b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/session/OperationContext.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/replication/session/OperationContext.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; /** Context for operation. Used for acquirement and release. */ public class OperationContext diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/BatchingMessageHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/BatchingMessageHandler.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/BatchingMessageHandler.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/BatchingMessageHandler.java index 891e9b939a73..378acccf9d9e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/BatchingMessageHandler.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/BatchingMessageHandler.java @@ -17,16 +17,17 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.core.server; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; +import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.RaftMessages.RaftMessage; import org.neo4j.coreedge.raft.net.Inbound.MessageHandler; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreServerModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/CoreServerModule.java similarity index 91% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreServerModule.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/CoreServerModule.java index eb73df5da4c9..137ab53d5462 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreServerModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/server/CoreServerModule.java @@ -17,12 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge; +package org.neo4j.coreedge.core.server; import java.io.File; import java.io.IOException; import java.util.function.Supplier; +import org.neo4j.coreedge.core.state.CoreStateMachinesModule; +import org.neo4j.coreedge.ReplicationModule; import org.neo4j.coreedge.catchup.CatchupServer; import org.neo4j.coreedge.catchup.CheckpointerSupplier; import org.neo4j.coreedge.catchup.DataSourceSupplier; @@ -33,7 +35,6 @@ import org.neo4j.coreedge.catchup.tx.edge.TransactionLogCatchUpFactory; import org.neo4j.coreedge.catchup.tx.edge.TxPullClient; import org.neo4j.coreedge.discovery.CoreTopologyService; -import org.neo4j.coreedge.raft.BatchingMessageHandler; import org.neo4j.coreedge.raft.ConsensusModule; import org.neo4j.coreedge.raft.ContinuousJob; import org.neo4j.coreedge.raft.RaftMessages; @@ -44,20 +45,20 @@ import org.neo4j.coreedge.raft.membership.MembershipWaiter; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; import org.neo4j.coreedge.raft.net.LoggingInbound; +import org.neo4j.coreedge.core.state.CoreState; +import org.neo4j.coreedge.core.state.CoreStateApplier; +import org.neo4j.coreedge.core.state.CoreStateDownloader; +import org.neo4j.coreedge.core.state.DurableStateStorage; +import org.neo4j.coreedge.core.state.LongIndexMarshal; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.messaging.ListenSocketAddress; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.messaging.NonBlockingChannels; +import org.neo4j.coreedge.raft.membership.MembershipWaiterLifecycle; +import org.neo4j.coreedge.messaging.NotMyselfSelectionStrategy; +import org.neo4j.coreedge.logging.MessageLogger; import org.neo4j.coreedge.raft.state.CommandApplicationProcess; -import org.neo4j.coreedge.raft.state.CoreState; -import org.neo4j.coreedge.raft.state.CoreStateApplier; -import org.neo4j.coreedge.raft.state.CoreStateDownloader; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.LongIndexMarshal; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.ListenSocketAddress; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.NonBlockingChannels; -import org.neo4j.coreedge.server.core.MembershipWaiterLifecycle; -import org.neo4j.coreedge.server.core.NotMyselfSelectionStrategy; -import org.neo4j.coreedge.server.logging.MessageLogger; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.PlatformModule; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandDispatcher.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CommandDispatcher.java similarity index 80% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandDispatcher.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CommandDispatcher.java index fe53fb705b4f..16eab14883c1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandDispatcher.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CommandDispatcher.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequest; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequest; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; public interface CommandDispatcher extends AutoCloseable { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreSnapshot.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreSnapshot.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreSnapshot.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreSnapshot.java index 7af9aac4ef13..fce2ec0a56ef 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreSnapshot.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreSnapshot.java @@ -17,13 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.HashMap; import java.util.Map; import org.neo4j.coreedge.catchup.storecopy.core.CoreStateType; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreState.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreState.java index adba2f767e2b..ba9467a53272 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreState.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.ArrayList; @@ -26,15 +26,16 @@ import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.catchup.storecopy.StoreCopyFailedException; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.coreedge.raft.MismatchedStoreIdService; import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.log.pruning.LogPruner; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.messaging.CoreMemberSelectionStrategy; import org.neo4j.coreedge.raft.net.Inbound.MessageHandler; import org.neo4j.coreedge.raft.outcome.ConsensusOutcome; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; -import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.raft.state.CommandApplicationProcess; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateApplier.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateApplier.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateApplier.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateApplier.java index 2f254208a65f..e37c4883d7b4 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateApplier.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateApplier.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.util.concurrent.ExecutorService; import java.util.function.Function; @@ -39,7 +39,7 @@ public class Status { private volatile boolean cancelled; - boolean isCancelled() + public boolean isCancelled() { return cancelled; } diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateDownloader.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateDownloader.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateDownloader.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateDownloader.java index bf354409a445..ddabe510eb82 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateDownloader.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateDownloader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.concurrent.CompletableFuture; @@ -28,7 +28,7 @@ import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.catchup.storecopy.StoreCopyFailedException; import org.neo4j.coreedge.catchup.storecopy.edge.StoreFetcher; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateMachines.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachines.java similarity index 90% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateMachines.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachines.java index 94fb0efc59be..86dbb6dce433 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateMachines.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachines.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.function.Consumer; @@ -25,15 +25,15 @@ import org.neo4j.coreedge.SnapFlushable; import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.catchup.storecopy.core.CoreStateType; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationStateMachine; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenStateMachine; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionStateMachine; -import org.neo4j.coreedge.server.core.RecoverTransactionLogState; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationStateMachine; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenStateMachine; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionStateMachine; +import org.neo4j.coreedge.core.state.tx.RecoverTransactionLogState; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.storageengine.api.Token; @@ -76,7 +76,7 @@ public CoreStateMachines( this.localDatabase = localDatabase; } - CommandDispatcher commandDispatcher() + public CommandDispatcher commandDispatcher() { localDatabase.assertHealthy( IllegalStateException.class ); assert !runningBatch; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreStateMachinesModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachinesModule.java similarity index 86% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreStateMachinesModule.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachinesModule.java index 43586f6f4e2d..e850c184f385 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/CoreStateMachinesModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/CoreStateMachinesModule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge; +package org.neo4j.coreedge.core.state; import java.io.File; import java.io.IOException; @@ -25,28 +25,25 @@ import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.raft.LeaderLocator; -import org.neo4j.coreedge.raft.replication.RaftReplicator; -import org.neo4j.coreedge.raft.replication.Replicator; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationStateMachine; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdGeneratorFactory; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdRangeAcquirer; -import org.neo4j.coreedge.raft.replication.token.ReplicatedLabelTokenHolder; -import org.neo4j.coreedge.raft.replication.token.ReplicatedPropertyKeyTokenHolder; -import org.neo4j.coreedge.raft.replication.token.ReplicatedRelationshipTypeTokenHolder; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenStateMachine; -import org.neo4j.coreedge.raft.replication.token.TokenRegistry; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionCommitProcess; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionStateMachine; -import org.neo4j.coreedge.raft.state.CoreStateMachines; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.core.RecoverTransactionLogState; -import org.neo4j.coreedge.server.core.locks.LeaderOnlyLockManager; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenState; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.replication.RaftReplicator; +import org.neo4j.coreedge.core.replication.Replicator; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationStateMachine; +import org.neo4j.coreedge.core.state.id.ReplicatedIdGeneratorFactory; +import org.neo4j.coreedge.core.state.id.ReplicatedIdRangeAcquirer; +import org.neo4j.coreedge.core.state.token.ReplicatedLabelTokenHolder; +import org.neo4j.coreedge.core.state.token.ReplicatedPropertyKeyTokenHolder; +import org.neo4j.coreedge.core.state.token.ReplicatedRelationshipTypeTokenHolder; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenStateMachine; +import org.neo4j.coreedge.core.state.token.TokenRegistry; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionCommitProcess; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionStateMachine; +import org.neo4j.coreedge.core.state.id.IdAllocationState; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.core.state.tx.RecoverTransactionLogState; +import org.neo4j.coreedge.core.state.locks.LeaderOnlyLockManager; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenState; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.CommitProcessFactory; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DumpClusterState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DumpClusterState.java similarity index 74% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DumpClusterState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DumpClusterState.java index 08c7fafeb49e..7bd4577f7ca7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DumpClusterState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DumpClusterState.java @@ -17,34 +17,31 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.core.state; import java.io.File; import java.io.IOException; -import org.neo4j.coreedge.raft.replication.session.GlobalSessionTrackerState; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.LongIndexMarshal; -import org.neo4j.coreedge.raft.state.StateMarshal; -import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState; -import org.neo4j.coreedge.raft.state.membership.RaftMembershipState; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId.MemberIdMarshal; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenState; +import org.neo4j.coreedge.core.replication.session.GlobalSessionTrackerState; +import org.neo4j.coreedge.core.state.id.IdAllocationState; +import org.neo4j.coreedge.raft.membership.RaftMembershipState; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.identity.MemberId.MemberIdMarshal; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenState; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.NullLogProvider; -import static org.neo4j.coreedge.CoreStateMachinesModule.ID_ALLOCATION_NAME; -import static org.neo4j.coreedge.CoreStateMachinesModule.LOCK_TOKEN_NAME; +import static org.neo4j.coreedge.core.state.CoreStateMachinesModule.ID_ALLOCATION_NAME; +import static org.neo4j.coreedge.core.state.CoreStateMachinesModule.LOCK_TOKEN_NAME; import static org.neo4j.coreedge.ReplicationModule.LAST_FLUSHED_NAME; import static org.neo4j.coreedge.ReplicationModule.SESSION_TRACKER_NAME; import static org.neo4j.coreedge.raft.ConsensusModule.RAFT_MEMBERSHIP_NAME; import static org.neo4j.coreedge.raft.ConsensusModule.RAFT_TERM_NAME; import static org.neo4j.coreedge.raft.ConsensusModule.RAFT_VOTE_NAME; -import static org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.CORE_MEMBER_ID_NAME; +import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; +import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.CORE_MEMBER_ID_NAME; public class DumpClusterState { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorage.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorage.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorage.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorage.java index 8dfe42573956..93557248db19 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorage.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorage.java @@ -17,12 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.File; import java.io.IOException; import java.util.function.Supplier; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.impl.transaction.log.PhysicalFlushableChannel; import org.neo4j.kernel.internal.DatabaseHealth; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorageImporter.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorageImporter.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorageImporter.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorageImporter.java index 1e6d525d03cd..d4a163b0216c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/DurableStateStorageImporter.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/DurableStateStorageImporter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.File; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReader.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InFlightLogEntryReader.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReader.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InFlightLogEntryReader.java index 1e04eb97fb01..2619071058ed 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReader.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InFlightLogEntryReader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InMemoryStateStorage.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InMemoryStateStorage.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InMemoryStateStorage.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InMemoryStateStorage.java index 75e2e25f7f08..133910167225 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/InMemoryStateStorage.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/InMemoryStateStorage.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/LongIndexMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/LongIndexMarshal.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/LongIndexMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/LongIndexMarshal.java index 0a43c79bbb49..3a393373e766 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/LongIndexMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/LongIndexMarshal.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/RaftState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/RaftState.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/RaftState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/RaftState.java index 52e60cd97d00..e2c7e573842e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/RaftState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/RaftState.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.HashSet; @@ -30,10 +30,10 @@ import org.neo4j.coreedge.raft.membership.RaftMembership; import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ReadableRaftState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/ReadableRaftState.java similarity index 89% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ReadableRaftState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/ReadableRaftState.java index 5762f9f8bbe1..1bb4181bc4c0 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ReadableRaftState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/ReadableRaftState.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.util.Set; import org.neo4j.coreedge.raft.log.ReadableRaftLog; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; public interface ReadableRaftState { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/Result.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/Result.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/Result.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/Result.java index 86b676ef189f..6bf9b01ad256 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/Result.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/Result.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.util.concurrent.CompletableFuture; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeChannelMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeChannelMarshal.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeChannelMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeChannelMarshal.java index 0c826e517b23..5cc3a320ba75 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeChannelMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeChannelMarshal.java @@ -17,10 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeStateMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeStateMarshal.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeStateMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeStateMarshal.java index ed329d8634be..808a74235579 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/SafeStateMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/SafeStateMarshal.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; /** * Wrapper class to handle ReadPastEndExceptions in a safe manner transforming it diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMachine.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMachine.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMachine.java index aa53ef5f768d..5c56e0c679fa 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMachine.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.function.Consumer; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMarshal.java similarity index 91% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMarshal.java index 9ee3460f2cc1..a81917cb268d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateMarshal.java @@ -17,7 +17,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; + +import org.neo4j.coreedge.messaging.ChannelMarshal; public interface StateMarshal extends ChannelMarshal { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateRecoveryManager.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateRecoveryManager.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateRecoveryManager.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateRecoveryManager.java index d79af962f076..1958936727f7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateRecoveryManager.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateRecoveryManager.java @@ -17,11 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.File; import java.io.IOException; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.transaction.log.ReadAheadChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateStorage.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateStorage.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateStorage.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateStorage.java index 231ebd653cb5..d4d32edb4891 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/StateStorage.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/StateStorage.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdAllocation.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocation.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdAllocation.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocation.java index 499d45d4550e..976ee752a556 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdAllocation.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocation.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.neo4j.kernel.impl.store.id.IdRange; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocationState.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocationState.java index c310e42d9327..6cc4be576c69 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdAllocationState.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.id_allocation; +package org.neo4j.coreedge.core.state.id; import java.io.IOException; import java.util.Arrays; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; +import org.neo4j.coreedge.core.state.SafeStateMarshal; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdGenerationException.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdGenerationException.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdGenerationException.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdGenerationException.java index 1082b8789b8c..c2b6c454b0e8 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdGenerationException.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdGenerationException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.neo4j.graphdb.TransactionFailureException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdRangeIterator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdRangeIterator.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdRangeIterator.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdRangeIterator.java index 7f6e54b3729d..0d0a9b5f522d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/IdRangeIterator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/IdRangeIterator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.neo4j.kernel.impl.store.id.IdGeneratorImpl; import org.neo4j.kernel.impl.store.id.IdRange; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequest.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequest.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequest.java index 760d5c579e33..2f1f09ebfaaa 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequest.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.replication.tx.CoreReplicatedContent; -import org.neo4j.coreedge.raft.state.CommandDispatcher; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.tx.CoreReplicatedContent; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequestSerializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequestSerializer.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequestSerializer.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequestSerializer.java index 989868ead93a..f71769e8c936 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationRequestSerializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationRequestSerializer.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import java.io.IOException; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachine.java similarity index 90% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachine.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachine.java index f09c1ad09fd1..62e40e2df374 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachine.java @@ -17,15 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import java.io.IOException; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.raft.state.StateMachine; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.core.state.StateMachine; +import org.neo4j.coreedge.core.state.StateStorage; import org.neo4j.kernel.impl.store.id.IdType; /** diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGenerator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGenerator.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGenerator.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGenerator.java index e49c3bb75cdd..75140ff36879 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGenerator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGenerator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.id.IdGenerator; @@ -27,8 +27,8 @@ import static java.lang.Math.max; -import static org.neo4j.coreedge.raft.replication.id.IdRangeIterator.EMPTY_ID_RANGE_ITERATOR; -import static org.neo4j.coreedge.raft.replication.id.IdRangeIterator.VALUE_REPRESENTING_NULL; +import static org.neo4j.coreedge.core.state.id.IdRangeIterator.EMPTY_ID_RANGE_ITERATOR; +import static org.neo4j.coreedge.core.state.id.IdRangeIterator.VALUE_REPRESENTING_NULL; public class ReplicatedIdGenerator implements IdGenerator { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorFactory.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorFactory.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorFactory.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorFactory.java index 9c55ae18959c..01150cdc2922 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorFactory.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import java.io.File; import java.util.HashMap; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirer.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirer.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirer.java index c69ebcb11d1a..dd06af95ce32 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirer.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.neo4j.coreedge.raft.replication.Replicator; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.Replicator; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdRange; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/SwitchableRaftIdGenerator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/SwitchableRaftIdGenerator.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/SwitchableRaftIdGenerator.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/SwitchableRaftIdGenerator.java index f3f0b5a3e078..559ff60b35dc 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/id/SwitchableRaftIdGenerator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/SwitchableRaftIdGenerator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.id.IdGenerator; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/UnallocatedIds.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/UnallocatedIds.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/UnallocatedIds.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/UnallocatedIds.java index 27ed0bf55737..508632926639 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/id_allocation/UnallocatedIds.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/id/UnallocatedIds.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.id_allocation; +package org.neo4j.coreedge.core.state.id; import org.neo4j.kernel.impl.store.id.IdType; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManager.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManager.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManager.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManager.java index 87bf1a019299..6cd9e400f011 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManager.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManager.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -25,9 +25,9 @@ import org.neo4j.coreedge.raft.LeaderLocator; import org.neo4j.coreedge.raft.NoLeaderFoundException; -import org.neo4j.coreedge.raft.replication.Replicator; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionStateMachine; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.Replicator; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionStateMachine; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException; import org.neo4j.storageengine.api.lock.ResourceType; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LockToken.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LockToken.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LockToken.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LockToken.java index 491376c66cb3..bda054a26a5d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/LockToken.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/LockToken.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; /** * Represents a lock token by an pairing an id together with its owner. A lock token diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenRequest.java similarity index 90% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenRequest.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenRequest.java index e4f8bd4ec20d..b0edb9f32f1f 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenRequest.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenRequest.java @@ -17,15 +17,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import java.util.Objects; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.replication.tx.CoreReplicatedContent; -import org.neo4j.coreedge.raft.state.CommandDispatcher; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.tx.CoreReplicatedContent; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.identity.MemberId; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenState.java similarity index 89% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenState.java index f72ed4ef25f7..10afe8007f68 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenState.java @@ -17,18 +17,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import java.io.IOException; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; -import static org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest.INVALID_REPLICATED_LOCK_TOKEN_REQUEST; +import static org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest.INVALID_REPLICATED_LOCK_TOKEN_REQUEST; public class ReplicatedLockTokenState { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachine.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachine.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachine.java index ea4816c98f5f..d7be70783443 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachine.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import java.io.IOException; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.raft.state.StateMachine; -import org.neo4j.coreedge.raft.state.StateStorage; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.core.state.StateMachine; +import org.neo4j.coreedge.core.state.StateStorage; /** * Listens for {@link ReplicatedLockTokenRequest}. Keeps track of the current holder of the replicated token, diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedLabelTokenHolder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedLabelTokenHolder.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedLabelTokenHolder.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedLabelTokenHolder.java index 8e216173f9e0..83446c13c8b8 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedLabelTokenHolder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedLabelTokenHolder.java @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; -import org.neo4j.coreedge.raft.replication.Replicator; +import org.neo4j.coreedge.core.replication.Replicator; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.core.LabelTokenHolder; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedPropertyKeyTokenHolder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedPropertyKeyTokenHolder.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedPropertyKeyTokenHolder.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedPropertyKeyTokenHolder.java index b25ffab12020..a3b4faf24cd7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedPropertyKeyTokenHolder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedPropertyKeyTokenHolder.java @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; -import org.neo4j.coreedge.raft.replication.RaftReplicator; +import org.neo4j.coreedge.core.replication.RaftReplicator; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.core.PropertyKeyTokenHolder; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedRelationshipTypeTokenHolder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedRelationshipTypeTokenHolder.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedRelationshipTypeTokenHolder.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedRelationshipTypeTokenHolder.java index 8ac39257fc2c..70d97e73665f 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedRelationshipTypeTokenHolder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedRelationshipTypeTokenHolder.java @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; -import org.neo4j.coreedge.raft.replication.RaftReplicator; +import org.neo4j.coreedge.core.replication.RaftReplicator; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.kernel.impl.core.RelationshipTypeTokenHolder; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolder.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolder.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolder.java index 91e434b7d83a..c994774c6f37 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolder.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.util.ArrayList; import java.util.Collection; @@ -26,7 +26,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import org.neo4j.coreedge.raft.replication.Replicator; +import org.neo4j.coreedge.core.replication.Replicator; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationKernelException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequest.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequest.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequest.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequest.java index a5b55d814803..1bec4be11501 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequest.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.util.Arrays; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.replication.tx.CoreReplicatedContent; -import org.neo4j.coreedge.raft.state.CommandDispatcher; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.state.tx.CoreReplicatedContent; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.Result; public class ReplicatedTokenRequest implements CoreReplicatedContent { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequestSerializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequestSerializer.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequestSerializer.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequestSerializer.java index 9fe0eebcb247..d961efb76364 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenRequestSerializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenRequestSerializer.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -29,7 +29,7 @@ import org.neo4j.coreedge.raft.net.NetworkFlushableChannelNetty4; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.replication.StringMarshal; +import org.neo4j.coreedge.messaging.marsalling.StringMarshal; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageCommandReaderFactory; import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel; import org.neo4j.kernel.impl.transaction.log.entry.LogEntryCommand; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachine.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachine.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachine.java index 95b0fa2cf2f6..ea35ab42ef40 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachine.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.io.IOException; import java.util.Collection; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.raft.state.StateMachine; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.core.state.StateMachine; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; @@ -42,7 +42,7 @@ import org.neo4j.storageengine.api.TransactionApplicationMode; import static java.lang.String.format; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; public class ReplicatedTokenStateMachine implements StateMachine { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenRegistry.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenRegistry.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenRegistry.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenRegistry.java index 85f9c8d9f933..0a1007bace14 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenRegistry.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenRegistry.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.util.List; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenType.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenType.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenType.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenType.java index b0a06f2dd77b..e3e0ca64f471 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/token/TokenType.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/token/TokenType.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; public enum TokenType { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ConstantTimeRetryStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ConstantTimeRetryStrategy.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ConstantTimeRetryStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ConstantTimeRetryStrategy.java index bd613a9803c7..cb9ff3f9e680 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ConstantTimeRetryStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ConstantTimeRetryStrategy.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.concurrent.TimeUnit; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/CoreReplicatedContent.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/CoreReplicatedContent.java similarity index 82% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/CoreReplicatedContent.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/CoreReplicatedContent.java index 6474b8370616..356ef992e92e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/CoreReplicatedContent.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/CoreReplicatedContent.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.CommandDispatcher; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.Result; public interface CoreReplicatedContent extends ReplicatedContent { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategy.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategy.java index ae6b65abb068..fd0ae28673f1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategy.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.concurrent.TimeUnit; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LastCommittedIndexFinder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LastCommittedIndexFinder.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LastCommittedIndexFinder.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LastCommittedIndexFinder.java index 8ae5ff681155..cc47afaffd19 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LastCommittedIndexFinder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LastCommittedIndexFinder.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.neo4j.cursor.IOCursor; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; @@ -26,7 +26,7 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; /** * Finds the last committed transaction in the transaction log, then decodes the header as a raft index. diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncoding.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncoding.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncoding.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncoding.java index 0f9880a454c6..de9afa85af30 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncoding.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncoding.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; /** * Log index is encoded in the header of transactions in the transaction log. diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/NeoStoreTransactionCounter.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/NeoStoreTransactionCounter.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/NeoStoreTransactionCounter.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/NeoStoreTransactionCounter.java index fc1cbe2ff77f..d2b04613f644 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/NeoStoreTransactionCounter.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/NeoStoreTransactionCounter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RecoverTransactionLogState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RecoverTransactionLogState.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RecoverTransactionLogState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RecoverTransactionLogState.java index 1c7e2f1923c3..621fe7f81848 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RecoverTransactionLogState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RecoverTransactionLogState.java @@ -17,9 +17,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.core.state.tx; -import org.neo4j.coreedge.raft.replication.tx.LastCommittedIndexFinder; import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.util.Dependencies; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcess.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcess.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcess.java index 229c95cb0370..241960f5d849 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcess.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcess.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.concurrent.atomic.AtomicLong; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransaction.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransaction.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransaction.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransaction.java index d28109393cc5..7ef3eb631307 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransaction.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransaction.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.Arrays; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.state.CommandDispatcher; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.Result; public class ReplicatedTransaction implements CoreReplicatedContent { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcess.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcess.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcess.java index 8692d52db0e4..1e178ce59b14 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcess.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcess.java @@ -17,19 +17,19 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.neo4j.coreedge.raft.replication.Replicator; +import org.neo4j.coreedge.core.replication.Replicator; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.storageengine.api.TransactionApplicationMode; -import static org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionFactory.createImmutableReplicatedTransaction; +import static org.neo4j.coreedge.core.state.tx.ReplicatedTransactionFactory.createImmutableReplicatedTransaction; public class ReplicatedTransactionCommitProcess implements TransactionCommitProcess { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionFactory.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionFactory.java similarity index 99% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionFactory.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionFactory.java index 8be6a751bef3..b2798123bd7f 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionFactory.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.io.IOException; import java.util.Arrays; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionSerializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionSerializer.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionSerializer.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionSerializer.java index fe9f2d08f224..9ac3ecfd70d7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionSerializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionSerializer.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.io.IOException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachine.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachine.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachine.java index 1228df888ea7..936ea9952f22 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachine.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import java.io.IOException; import java.util.function.Consumer; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.raft.state.StateMachine; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.core.state.StateMachine; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionQueue; @@ -37,7 +37,7 @@ import org.neo4j.storageengine.api.TransactionApplicationMode; import static java.lang.String.format; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; import static org.neo4j.kernel.api.exceptions.Status.Transaction.LockSessionExpired; public class ReplicatedTransactionStateMachine implements StateMachine diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/RetryStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RetryStrategy.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/RetryStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RetryStrategy.java index 1e4b841b00a3..6435e9cc2889 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/RetryStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/RetryStrategy.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; public interface RetryStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/TransactionCounter.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/TransactionCounter.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/TransactionCounter.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/TransactionCounter.java index 69389b771e41..fb52d4babb83 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/tx/TransactionCounter.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/state/tx/TransactionCounter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; public interface TransactionCounter { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/ClusterTopology.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/ClusterTopology.java index 925b95b9ad64..146c6dce1e1c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/ClusterTopology.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/ClusterTopology.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class ClusterTopology { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/CoreAddresses.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/CoreAddresses.java index 74e1e566c204..39d8551dbf71 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/CoreAddresses.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/CoreAddresses.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; public class CoreAddresses { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/DiscoveryServiceFactory.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/DiscoveryServiceFactory.java index cb4bc7571cd2..ce6590477b5f 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/DiscoveryServiceFactory.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/DiscoveryServiceFactory.java @@ -20,7 +20,7 @@ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeAddresses.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeAddresses.java index b29c3cbb3ecd..2e3359ee2100 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeAddresses.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeAddresses.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; public class EdgeAddresses { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeTopologyService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeTopologyService.java index d9f9132f7ed3..84dd75e7e348 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeTopologyService.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/EdgeTopologyService.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; public interface EdgeTopologyService extends TopologyService { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClient.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClient.java index 32f0214560c0..0ad764a95392 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClient.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClient.java @@ -24,7 +24,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.HazelcastInstanceNotActiveException; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClientConnector.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClientConnector.java index 4e7e2aa55be4..961a0f0141ac 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClientConnector.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClientConnector.java @@ -23,8 +23,8 @@ import com.hazelcast.client.config.ClientConfig; import com.hazelcast.core.HazelcastInstance; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; import org.neo4j.kernel.configuration.Config; public class HazelcastClientConnector implements HazelcastConnector diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClusterTopology.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClusterTopology.java index 948898263c58..c65a411977b3 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClusterTopology.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastClusterTopology.java @@ -29,10 +29,10 @@ import java.util.Set; import java.util.UUID; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.edge.EnterpriseEdgeEditionModule; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.edge.EnterpriseEdgeEditionModule; import org.neo4j.helpers.collection.Pair; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastDiscoveryServiceFactory.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastDiscoveryServiceFactory.java index 74ce4fa5d0c8..1360d857533d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastDiscoveryServiceFactory.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastDiscoveryServiceFactory.java @@ -19,8 +19,8 @@ */ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java index 2c11b089444e..d1258dff7b33 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java @@ -29,10 +29,10 @@ import java.util.List; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.ListenSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.messaging.ListenSocketAddress; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/RaftDiscoveryServiceConnector.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/RaftDiscoveryServiceConnector.java index 7f0fac3ed4ee..885b6c3ee656 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/RaftDiscoveryServiceConnector.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/RaftDiscoveryServiceConnector.java @@ -24,7 +24,7 @@ import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.RaftInstance.BootstrapException; import org.neo4j.coreedge.raft.membership.MemberIdSet; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.lifecycle.LifecycleAdapter; public class RaftDiscoveryServiceConnector extends LifecycleAdapter implements CoreTopologyService.Listener diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedure.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedure.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedure.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedure.java index ebb21ea8814e..668378dd7cdf 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedure.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import java.util.Set; import java.util.stream.Collectors; @@ -31,8 +31,8 @@ import org.neo4j.coreedge.discovery.NoKnownAddressesException; import org.neo4j.coreedge.raft.LeaderLocator; import org.neo4j.coreedge.raft.NoLeaderFoundException; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.proc.CallableProcedure; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedure.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedure.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedure.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedure.java index e3b8e2286e3a..fbc949d099c5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedure.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import java.util.ArrayList; import java.util.Collections; @@ -32,8 +32,8 @@ import org.neo4j.coreedge.discovery.NoKnownAddressesException; import org.neo4j.coreedge.raft.LeaderLocator; import org.neo4j.coreedge.raft.NoLeaderFoundException; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.Neo4jTypes; @@ -52,8 +52,8 @@ public class ClusterOverviewProcedure extends CallableProcedure.BasicProcedure private final LeaderLocator leaderLocator; private final Log log; - ClusterOverviewProcedure( CoreTopologyService discoveryService, - LeaderLocator leaderLocator, LogProvider logProvider ) + public ClusterOverviewProcedure( CoreTopologyService discoveryService, + LeaderLocator leaderLocator, LogProvider logProvider ) { super( procedureSignature( new ProcedureSignature.ProcedureName( new String[]{"dbms", "cluster"}, NAME ) ) .out( "id", Neo4jTypes.NTString ).out( "address", Neo4jTypes.NTString ) diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedure.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedure.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedure.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedure.java index a497bf109d55..bedc916aa11e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedure.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import java.util.Set; import java.util.stream.Stream; @@ -26,7 +26,7 @@ import org.neo4j.coreedge.discovery.ClusterTopology; import org.neo4j.coreedge.discovery.CoreAddresses; import org.neo4j.coreedge.discovery.CoreTopologyService; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.proc.CallableProcedure; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RoleProcedure.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/RoleProcedure.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RoleProcedure.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/RoleProcedure.java index 0f0ec3e062b7..b35f719ffa1e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/RoleProcedure.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/procedures/RoleProcedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import org.neo4j.collection.RawIterator; import org.neo4j.kernel.api.exceptions.ProcedureException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeGraphDatabase.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeGraphDatabase.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeGraphDatabase.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeGraphDatabase.java index 614729c45a06..5d4fb1f2174c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeGraphDatabase.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeGraphDatabase.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.edge; import java.io.File; import java.util.Map; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeStartupProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeStartupProcess.java similarity index 93% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeStartupProcess.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeStartupProcess.java index 03d775f020da..c6b0314c4f1c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EdgeStartupProcess.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EdgeStartupProcess.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.edge; import java.util.concurrent.locks.LockSupport; @@ -25,15 +25,16 @@ import org.neo4j.coreedge.catchup.storecopy.edge.StoreFetcher; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; import org.neo4j.coreedge.discovery.EdgeTopologyService; -import org.neo4j.coreedge.raft.replication.tx.RetryStrategy; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.core.state.tx.RetryStrategy; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import static org.neo4j.coreedge.server.edge.EnterpriseEdgeEditionModule.extractBoltAddress; +import static org.neo4j.coreedge.edge.EnterpriseEdgeEditionModule.extractBoltAddress; public class EdgeStartupProcess implements Lifecycle { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EnterpriseEdgeEditionModule.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EnterpriseEdgeEditionModule.java index bcf32d6be6de..1178819d3fa5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/edge/EnterpriseEdgeEditionModule.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.edge; import java.io.File; import java.time.Clock; @@ -37,13 +37,14 @@ import org.neo4j.coreedge.catchup.tx.edge.TxPullClient; import org.neo4j.coreedge.discovery.DiscoveryServiceFactory; import org.neo4j.coreedge.discovery.EdgeTopologyService; +import org.neo4j.coreedge.messaging.ConnectToRandomCoreMember; import org.neo4j.coreedge.raft.ContinuousJob; -import org.neo4j.coreedge.raft.DelayedRenewableTimeoutService; -import org.neo4j.coreedge.raft.replication.tx.ExponentialBackoffStrategy; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.NonBlockingChannels; -import org.neo4j.coreedge.server.core.RoleProcedure; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.core.state.tx.ExponentialBackoffStrategy; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.messaging.NonBlockingChannels; +import org.neo4j.coreedge.discovery.procedures.RoleProcedure; import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.HostnamePort; @@ -91,7 +92,7 @@ import static java.util.Collections.singletonMap; -import static org.neo4j.coreedge.server.core.RoleProcedure.CoreOrEdge.EDGE; +import static org.neo4j.coreedge.discovery.procedures.RoleProcedure.CoreOrEdge.EDGE; import static org.neo4j.kernel.impl.factory.CommunityEditionModule.createLockManager; import static org.neo4j.kernel.impl.util.JobScheduler.SchedulingStrategy.NEW_THREAD; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/MemberId.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/MemberId.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/MemberId.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/MemberId.java index e6f41b09b26b..195fb8bb2125 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/MemberId.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/MemberId.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.identity; import java.io.IOException; import java.util.Objects; import java.util.UUID; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; +import org.neo4j.coreedge.core.state.SafeStateMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/StoreId.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/StoreId.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/StoreId.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/StoreId.java index d2e0a57a41b5..74a9c885d46a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/StoreId.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/identity/StoreId.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.identity; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/BetterMessageLogger.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/BetterMessageLogger.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/BetterMessageLogger.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/BetterMessageLogger.java index 4375c5018d07..2b9f71ed0132 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/BetterMessageLogger.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/BetterMessageLogger.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.logging; +package org.neo4j.coreedge.logging; import java.io.PrintWriter; import java.text.DateFormat; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/ExceptionLoggingHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/ExceptionLoggingHandler.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/ExceptionLoggingHandler.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/ExceptionLoggingHandler.java index 68d8f0b9d195..195b00aa8972 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/ExceptionLoggingHandler.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/ExceptionLoggingHandler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.logging; +package org.neo4j.coreedge.logging; import io.netty.channel.ChannelHandlerAdapter; import io.netty.channel.ChannelHandlerContext; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/MessageLogger.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/MessageLogger.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/MessageLogger.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/MessageLogger.java index e998bdf65c79..097f0b786387 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/MessageLogger.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/MessageLogger.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.logging; +package org.neo4j.coreedge.logging; public interface MessageLogger { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/NullMessageLogger.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/NullMessageLogger.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/NullMessageLogger.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/NullMessageLogger.java index f220cfcb80ef..2e05a6d38599 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/logging/NullMessageLogger.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/logging/NullMessageLogger.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.logging; +package org.neo4j.coreedge.logging; public class NullMessageLogger implements MessageLogger { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/AdvertisedSocketAddress.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AdvertisedSocketAddress.java similarity index 88% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/AdvertisedSocketAddress.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AdvertisedSocketAddress.java index b083d11036f2..b655a42feb51 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/AdvertisedSocketAddress.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AdvertisedSocketAddress.java @@ -17,15 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.io.IOException; import java.net.InetSocketAddress; import java.util.Objects; -import org.neo4j.coreedge.raft.replication.StringMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; +import org.neo4j.coreedge.messaging.marsalling.StringMarshal; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; @@ -74,7 +73,7 @@ public InetSocketAddress socketAddress() return new InetSocketAddress( split[0], Integer.valueOf( split[1] ) ); } - static class AdvertisedSocketAddressChannelMarshal extends SafeChannelMarshal + public static class AdvertisedSocketAddressChannelMarshal extends SafeChannelMarshal { @Override public void marshal( AdvertisedSocketAddress address, WritableChannel channel ) throws IOException diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/AlwaysChooseFirstMember.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AlwaysChooseFirstMember.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/AlwaysChooseFirstMember.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AlwaysChooseFirstMember.java index 98171dd1a1cf..baea66ce945e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/AlwaysChooseFirstMember.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/AlwaysChooseFirstMember.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.messaging; import org.neo4j.coreedge.discovery.ClusterTopology; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; import org.neo4j.coreedge.discovery.TopologyService; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class AlwaysChooseFirstMember implements CoreMemberSelectionStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/BoltAddress.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/BoltAddress.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/BoltAddress.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/BoltAddress.java index 346e05d54702..36fd2000a5cc 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/BoltAddress.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/BoltAddress.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.util.Objects; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ByteBufferMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ByteBufferMarshal.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ByteBufferMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ByteBufferMarshal.java index b5ebc5aaa158..1e25728289cb 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ByteBufferMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ByteBufferMarshal.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.messaging; import java.nio.ByteBuffer; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ChannelMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ChannelMarshal.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ChannelMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ChannelMarshal.java index 98ec071110fa..559beb5a1b34 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/ChannelMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ChannelMarshal.java @@ -17,10 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.messaging; import java.io.IOException; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/ConnectToRandomCoreMember.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ConnectToRandomCoreMember.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/ConnectToRandomCoreMember.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ConnectToRandomCoreMember.java index 4313030d37da..2b98de9e52a9 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/ConnectToRandomCoreMember.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ConnectToRandomCoreMember.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.messaging; import java.util.Iterator; import java.util.Random; @@ -25,7 +25,7 @@ import org.neo4j.coreedge.discovery.ClusterTopology; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; import org.neo4j.coreedge.discovery.TopologyService; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class ConnectToRandomCoreMember implements CoreMemberSelectionStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/CoreMemberSelectionStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/CoreMemberSelectionStrategy.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/CoreMemberSelectionStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/CoreMemberSelectionStrategy.java index 81efff1c4c5f..5fb6fc8ffe71 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/CoreMemberSelectionStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/CoreMemberSelectionStrategy.java @@ -17,10 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.edge; +package org.neo4j.coreedge.messaging; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public interface CoreMemberSelectionStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/EndOfStreamException.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/EndOfStreamException.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/EndOfStreamException.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/EndOfStreamException.java index 27bff452f0d6..283d6ae56b8a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/EndOfStreamException.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/EndOfStreamException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.messaging; /** * An exception which works around the fact that ReadPastEndException inherits from diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/IdleChannelReaperHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandler.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/IdleChannelReaperHandler.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandler.java index 67887aad81ac..4501acd2b5c5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/IdleChannelReaperHandler.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.net.InetSocketAddress; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/LeaderOnlySelectionStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/LeaderOnlySelectionStrategy.java similarity index 89% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/LeaderOnlySelectionStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/LeaderOnlySelectionStrategy.java index 29b9d4959723..a07accbce775 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/LeaderOnlySelectionStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/LeaderOnlySelectionStrategy.java @@ -17,12 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.messaging; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.identity.MemberId; public class LeaderOnlySelectionStrategy implements CoreMemberSelectionStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/ListenSocketAddress.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ListenSocketAddress.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/ListenSocketAddress.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ListenSocketAddress.java index 8e082cdc6096..df0e94041e40 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/ListenSocketAddress.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/ListenSocketAddress.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.net.InetSocketAddress; import java.util.Objects; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/network/Message.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/Message.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/network/Message.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/Message.java index eb632eeb69ff..bc01453437ad 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/network/Message.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/Message.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.network; +package org.neo4j.coreedge.messaging; /** * Marker interface for objects that can be sent over the network. diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/NonBlockingChannels.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NonBlockingChannels.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/NonBlockingChannels.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NonBlockingChannels.java index 1ad7e4d191e4..42978b5f664e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/NonBlockingChannels.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NonBlockingChannels.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NotMyselfSelectionStrategy.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NotMyselfSelectionStrategy.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NotMyselfSelectionStrategy.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NotMyselfSelectionStrategy.java index 7cdb9c52ad78..c5b4b3aaaa6a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NotMyselfSelectionStrategy.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/NotMyselfSelectionStrategy.java @@ -17,14 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.messaging; import java.util.Optional; import org.neo4j.coreedge.discovery.CoreMemberSelectionException; import org.neo4j.coreedge.discovery.CoreTopologyService; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.identity.MemberId; public class NotMyselfSelectionStrategy implements CoreMemberSelectionStrategy { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/SenderService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/SenderService.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/SenderService.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/SenderService.java index fe2225d2cd49..ed0df9ec5a34 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/SenderService.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/SenderService.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.util.Collection; import java.util.Iterator; @@ -30,7 +30,6 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; -import org.neo4j.coreedge.network.Message; import org.neo4j.coreedge.raft.net.NonBlockingChannel; import org.neo4j.coreedge.raft.net.Outbound; import org.neo4j.coreedge.raft.net.monitoring.MessageQueueMonitor; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/StringMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/StringMarshal.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/StringMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/StringMarshal.java index f11180b54034..13416cab6b21 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/StringMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/StringMarshal.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.messaging.marsalling; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/storeid/StoreIdMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/storeid/StoreIdMarshal.java similarity index 95% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/storeid/StoreIdMarshal.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/storeid/StoreIdMarshal.java index df9c90acb1de..fe62dcb2df23 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/storeid/StoreIdMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/messaging/marsalling/storeid/StoreIdMarshal.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.storeid; +package org.neo4j.coreedge.messaging.marsalling.storeid; import java.io.IOException; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/ConsensusModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/ConsensusModule.java index e8f148b94fcc..ebf0327260cc 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/ConsensusModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/ConsensusModule.java @@ -41,22 +41,23 @@ import org.neo4j.coreedge.raft.net.Outbound; import org.neo4j.coreedge.raft.net.RaftChannelInitializer; import org.neo4j.coreedge.raft.net.RaftOutbound; -import org.neo4j.coreedge.raft.replication.SendToMyself; -import org.neo4j.coreedge.raft.replication.shipping.RaftLogShippingManager; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.membership.RaftMembershipState; -import org.neo4j.coreedge.raft.state.term.MonitoredTermStateStorage; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.NonBlockingChannels; -import org.neo4j.coreedge.server.SenderService; -import org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule; -import org.neo4j.coreedge.server.logging.BetterMessageLogger; -import org.neo4j.coreedge.server.logging.MessageLogger; -import org.neo4j.coreedge.server.logging.NullMessageLogger; +import org.neo4j.coreedge.core.replication.SendToMyself; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.raft.shipping.RaftLogShippingManager; +import org.neo4j.coreedge.core.state.DurableStateStorage; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.raft.membership.RaftMembershipState; +import org.neo4j.coreedge.raft.term.MonitoredTermStateStorage; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.messaging.NonBlockingChannels; +import org.neo4j.coreedge.messaging.SenderService; +import org.neo4j.coreedge.core.EnterpriseCoreEditionModule; +import org.neo4j.coreedge.logging.BetterMessageLogger; +import org.neo4j.coreedge.logging.MessageLogger; +import org.neo4j.coreedge.logging.NullMessageLogger; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/CoreEdgeMetaData.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/CoreEdgeMetaData.java deleted file mode 100644 index 8c270f4deacf..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/CoreEdgeMetaData.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.raft; - -public interface CoreEdgeMetaData -{ - boolean isLeader(); -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/Followers.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/Followers.java index 99d22a0c2e94..0121ab187ff1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/Followers.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/Followers.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.TreeMap; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; public class Followers { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/LeaderLocator.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/LeaderLocator.java index 9f37074b8c0a..f6d55fe866f0 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/LeaderLocator.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/LeaderLocator.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.util.Listener; public interface LeaderLocator diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/MismatchedStoreIdService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/MismatchedStoreIdService.java index 39914fb499b0..9599a70af710 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/MismatchedStoreIdService.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/MismatchedStoreIdService.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.kernel.impl.store.StoreFailureException; public interface MismatchedStoreIdService diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/NewLeaderBarrier.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/NewLeaderBarrier.java index 117bf832a712..14bbca5bec89 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/NewLeaderBarrier.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/NewLeaderBarrier.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.ReplicatedContent; /** * When a new leader is elected, it replicates one entry of this type to mark the start of its reign. diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftInstance.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftInstance.java index 6b88415fd03e..4b7e472c4907 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftInstance.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftInstance.java @@ -36,14 +36,15 @@ import org.neo4j.coreedge.raft.outcome.AppendLogEntry; import org.neo4j.coreedge.raft.outcome.ConsensusOutcome; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.replication.shipping.RaftLogShippingManager; +import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService; +import org.neo4j.coreedge.raft.shipping.RaftLogShippingManager; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.util.Listener; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessageHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessageHandler.java index de28268cb854..7e5544cdb5de 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessageHandler.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessageHandler.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; import org.neo4j.logging.Log; public interface RaftMessageHandler diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessages.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessages.java index 887bee600dbf..5c703c5dd4f2 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessages.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftMessages.java @@ -25,11 +25,11 @@ import java.util.List; import java.util.Objects; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftServer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftServer.java index 06954648bdef..95e7ddb7c9f3 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftServer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftServer.java @@ -37,10 +37,10 @@ import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.net.codecs.RaftMessageDecoder; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.server.ListenSocketAddress; -import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.ListenSocketAddress; +import org.neo4j.coreedge.logging.ExceptionLoggingHandler; import org.neo4j.helpers.NamedThreadFactory; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftStateMachine.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftStateMachine.java index b6d55357adc1..f2835ca5f9bf 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftStateMachine.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RaftStateMachine.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; /** * The RAFT external entity that is interested in log entries and diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/EntryRecord.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/EntryRecord.java index 9545289cd860..7a094685e3a1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/EntryRecord.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/EntryRecord.java @@ -21,9 +21,9 @@ import java.io.IOException; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/RaftLogEntry.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/RaftLogEntry.java index 3ef86971556c..bb5f6b48df3c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/RaftLogEntry.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/RaftLogEntry.java @@ -21,7 +21,7 @@ import java.util.Objects; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.ReplicatedContent; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java index d64321611c87..5d07293687f7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java @@ -26,8 +26,8 @@ import org.neo4j.coreedge.raft.log.EntryRecord; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.cursor.IOCursor; import org.neo4j.helpers.Args; import org.neo4j.io.fs.DefaultFileSystemAbstraction; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/EntryRecordCursor.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/EntryRecordCursor.java index 0c58cf43078e..1a3370bf3c85 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/EntryRecordCursor.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/EntryRecordCursor.java @@ -23,9 +23,9 @@ import org.neo4j.coreedge.raft.log.EntryRecord; import org.neo4j.coreedge.raft.log.LogPosition; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.cursor.CursorValue; import org.neo4j.cursor.IOCursor; import org.neo4j.io.fs.StoreChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocol.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocol.java index f2aab9fcaa19..ec15355c23b1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocol.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocol.java @@ -27,9 +27,9 @@ import java.util.SortedMap; import org.neo4j.coreedge.raft.log.EntryRecord; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.cursor.IOCursor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentFile.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentFile.java index 3a396fb59991..9ca7a0ada2b8 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentFile.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentFile.java @@ -25,9 +25,9 @@ import org.neo4j.coreedge.raft.log.EntryRecord; import org.neo4j.coreedge.raft.log.LogPosition; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.cursor.IOCursor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeader.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeader.java index 47cbce185185..5f5f3ad46ff5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeader.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeader.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Objects; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLog.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLog.java index ce3dbe79f262..5edc8ed01ad7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLog.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLog.java @@ -27,8 +27,8 @@ import org.neo4j.coreedge.raft.log.RaftLog; import org.neo4j.coreedge.raft.log.RaftLogCursor; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.cursor.IOCursor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.lifecycle.LifecycleAdapter; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/Segments.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/Segments.java index d6b3b3b7d331..8073f111d239 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/Segments.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/Segments.java @@ -27,8 +27,8 @@ import java.util.ListIterator; import org.neo4j.coreedge.raft.log.segmented.OpenEndRangeMap.ValueRange; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.helpers.collection.Visitor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoal.java index 67a2a1876dcf..79ed654a2e69 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoal.java @@ -22,7 +22,7 @@ import java.time.Clock; import org.neo4j.coreedge.raft.log.ReadableRaftLog; -import org.neo4j.coreedge.raft.state.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; class CatchupGoal { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoalTracker.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoalTracker.java index 931e5a9f7675..fecf24e7b366 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoalTracker.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/CatchupGoalTracker.java @@ -22,7 +22,7 @@ import java.time.Clock; import org.neo4j.coreedge.raft.log.ReadableRaftLog; -import org.neo4j.coreedge.raft.state.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; class CatchupGoalTracker { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSet.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSet.java index 18acd5f61f34..fe0904f95b32 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSet.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSet.java @@ -21,7 +21,7 @@ import java.util.Set; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class MemberIdSet implements RaftGroup { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetBuilder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetBuilder.java index c42b8a0a4c1b..6b969831d23e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetBuilder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetBuilder.java @@ -21,7 +21,7 @@ import java.util.Set; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class MemberIdSetBuilder implements RaftGroup.Builder { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetSerializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetSerializer.java index e0d96c6b33e4..c5535210c895 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetSerializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MemberIdSetSerializer.java @@ -23,8 +23,8 @@ import java.util.HashSet; import java.util.Set; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/MembershipEntry.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipEntry.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/MembershipEntry.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipEntry.java index 7df0cc96eaf7..7b6ee715d609 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/MembershipEntry.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipEntry.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.membership; +package org.neo4j.coreedge.raft.membership; import java.io.IOException; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiter.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiter.java index 97cd81f521dd..d3542e4d0ae3 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiter.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiter.java @@ -23,8 +23,8 @@ import java.util.concurrent.CompletableFuture; import org.neo4j.coreedge.raft.MismatchedStoreIdService; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.util.JobScheduler; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/MembershipWaiterLifecycle.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiterLifecycle.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/MembershipWaiterLifecycle.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiterLifecycle.java index 1f501ebf2fe5..4ef6b9d67dc4 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/MembershipWaiterLifecycle.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/MembershipWaiterLifecycle.java @@ -17,14 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.raft.membership; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.neo4j.coreedge.raft.RaftInstance; -import org.neo4j.coreedge.raft.membership.MembershipWaiter; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftGroup.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftGroup.java index 98747b75621e..5968942a9ceb 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftGroup.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftGroup.java @@ -21,7 +21,7 @@ import java.util.Set; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.ReplicatedContent; public interface RaftGroup extends ReplicatedContent { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembership.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembership.java index 4bbe3ad7ccbd..54eec6bd9f9b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembership.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembership.java @@ -21,7 +21,7 @@ import java.util.Set; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; /** * Exposes a view of the members of a Raft cluster. Essentially it gives access to two sets - the set of voting diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipChanger.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipChanger.java index bd33361b9b57..32d21b0f49d6 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipChanger.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipChanger.java @@ -25,8 +25,8 @@ import org.neo4j.coreedge.raft.log.ReadableRaftLog; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipManager.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipManager.java index 8389affc260e..23586632fba0 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipManager.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipManager.java @@ -29,12 +29,11 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.log.ReadableRaftLog; import org.neo4j.coreedge.raft.outcome.RaftLogCommand; -import org.neo4j.coreedge.raft.replication.SendToMyself; +import org.neo4j.coreedge.core.replication.SendToMyself; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.raft.state.membership.RaftMembershipState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipState.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipState.java index 68da79be0097..62f0cc539ff1 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipState.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.membership; +package org.neo4j.coreedge.raft.membership; import java.io.IOException; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateMachineEventHandler.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateMachineEventHandler.java index 119a915d0232..b59ef14ce15d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateMachineEventHandler.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateMachineEventHandler.java @@ -22,8 +22,8 @@ import java.util.Set; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; interface RaftMembershipStateMachineEventHandler { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreOutbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreOutbound.java index 03ad4f1544f2..101eef161f61 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreOutbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreOutbound.java @@ -25,9 +25,9 @@ import org.neo4j.coreedge.discovery.CoreAddresses; import org.neo4j.coreedge.discovery.NoKnownAddressesException; import org.neo4j.coreedge.discovery.TopologyService; -import org.neo4j.coreedge.network.Message; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.Message; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.LogProvider; public class CoreOutbound implements Outbound diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreReplicatedContentMarshal.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreReplicatedContentMarshal.java index 60869299283d..3f876828573c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreReplicatedContentMarshal.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/CoreReplicatedContentMarshal.java @@ -24,17 +24,17 @@ import org.neo4j.coreedge.raft.NewLeaderBarrier; import org.neo4j.coreedge.raft.membership.MemberIdSet; import org.neo4j.coreedge.raft.membership.MemberIdSetSerializer; -import org.neo4j.coreedge.raft.replication.DistributedOperation; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequestSerializer; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequestSerializer; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionSerializer; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.replication.DistributedOperation; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequestSerializer; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequestSerializer; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionSerializer; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Inbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Inbound.java index 4cd286a3d16c..9f8d264a5409 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Inbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Inbound.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft.net; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; public interface Inbound { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingInbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingInbound.java index 56c42873fe57..9374090920af 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingInbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingInbound.java @@ -19,9 +19,9 @@ */ package org.neo4j.coreedge.raft.net; -import org.neo4j.coreedge.network.Message; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.logging.MessageLogger; +import org.neo4j.coreedge.messaging.Message; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.logging.MessageLogger; public class LoggingInbound implements Inbound { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingOutbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingOutbound.java index f1148b45203f..c0a93cc670fa 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingOutbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/LoggingOutbound.java @@ -21,9 +21,9 @@ import java.util.Collection; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; -import org.neo4j.coreedge.server.logging.MessageLogger; +import org.neo4j.coreedge.logging.MessageLogger; public class LoggingOutbound implements Outbound { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/NonBlockingChannel.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/NonBlockingChannel.java index da497bf3c84a..d6bed9478be7 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/NonBlockingChannel.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/NonBlockingChannel.java @@ -31,13 +31,12 @@ import java.util.concurrent.locks.LockSupport; import org.neo4j.coreedge.raft.net.monitoring.MessageQueueMonitor; -import org.neo4j.coreedge.server.Disposable; import org.neo4j.logging.Log; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.locks.LockSupport.parkNanos; -public class NonBlockingChannel implements Disposable +public class NonBlockingChannel { private static final int CONNECT_BACKOFF_IN_MS = 250; /* This pause is a maximum for retrying in case of a park/unpark race as well as for any other abnormal @@ -108,7 +107,6 @@ private void messageSendingThreadWork() } } - @Override public void dispose() { stillRunning = false; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Outbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Outbound.java index 9497875dccd9..dc5dd7a7add5 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Outbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/Outbound.java @@ -21,7 +21,7 @@ import java.util.Collection; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; /** * A best effort service for delivery of messages to members. No guarantees are made about any of the methods diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftChannelInitializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftChannelInitializer.java index 0e406749fa75..6fc768b14885 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftChannelInitializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftChannelInitializer.java @@ -25,9 +25,9 @@ import io.netty.handler.codec.LengthFieldPrepender; import org.neo4j.coreedge.raft.net.codecs.RaftMessageEncoder; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.logging.ExceptionLoggingHandler; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftOutbound.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftOutbound.java index 7e2d30f96133..9bdc712e7811 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftOutbound.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/RaftOutbound.java @@ -26,11 +26,11 @@ import org.neo4j.coreedge.discovery.CoreAddresses; import org.neo4j.coreedge.discovery.CoreTopologyService; import org.neo4j.coreedge.discovery.NoKnownAddressesException; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.RaftMessages.RaftMessage; import org.neo4j.coreedge.raft.RaftMessages.StoreIdAwareMessage; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.LogProvider; import static java.util.stream.Collectors.toList; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/ReplicatedLockTokenSerializer.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/ReplicatedLockTokenSerializer.java index 3e1f0cedddff..2164c2f65a81 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/ReplicatedLockTokenSerializer.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/ReplicatedLockTokenSerializer.java @@ -21,9 +21,9 @@ import java.io.IOException; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitor.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitor.java index 1035f1ac56d3..03a3c596fd43 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitor.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitor.java @@ -22,7 +22,7 @@ import java.time.Clock; import java.util.HashMap; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; public class UnknownAddressMonitor diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageDecoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageDecoder.java index e621210f2865..0c4f9cd7a003 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageDecoder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageDecoder.java @@ -29,12 +29,12 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.storageengine.api.ReadableChannel; import static org.neo4j.coreedge.raft.RaftMessages.Type.APPEND_ENTRIES_REQUEST; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncoder.java index 9fc826f1a185..b1d24735a85c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncoder.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncoder.java @@ -27,11 +27,11 @@ import org.neo4j.coreedge.catchup.storecopy.core.NetworkFlushableByteBuf; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.storeid.StoreIdMarshal; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.marsalling.storeid.StoreIdMarshal; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; public class RaftMessageEncoder extends MessageToMessageEncoder { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Messages.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Messages.java index 84cad3b45a0a..499ffe7c5174 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Messages.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Messages.java @@ -23,7 +23,7 @@ import java.util.Map; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class Messages implements Iterable> { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Outcome.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Outcome.java index 7fd82e2363c6..4b51c5d2ff4b 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Outcome.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/Outcome.java @@ -24,12 +24,12 @@ import java.util.HashSet; import java.util.Set; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; /** * Holds the outcome of a RAFT role's handling of a message. The role handling logic is stateless diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/ShipCommand.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/ShipCommand.java index b54d42a5d7f9..ac04c80f3eff 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/ShipCommand.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/outcome/ShipCommand.java @@ -24,7 +24,7 @@ import org.neo4j.coreedge.raft.LeaderContext; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.shipping.RaftLogShipper; +import org.neo4j.coreedge.raft.shipping.RaftLogShipper; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/MarshallingException.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/MarshallingException.java deleted file mode 100644 index 30ddc1d0fa56..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/MarshallingException.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.raft.replication; - -public class MarshallingException extends Exception -{ - public MarshallingException( String message ) - { - super( message ); - } -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Appending.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Appending.java index 91c1994d4bfa..271baa1106da 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Appending.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Appending.java @@ -29,8 +29,8 @@ import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.ShipCommand; import org.neo4j.coreedge.raft.outcome.TruncateLogCommand; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ReadableRaftState; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.ReadableRaftState; import org.neo4j.logging.Log; public class Appending diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Candidate.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Candidate.java index 7ab23edf10db..ef76a979d29f 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Candidate.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Candidate.java @@ -25,7 +25,7 @@ import org.neo4j.coreedge.raft.RaftMessageHandler; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; import org.neo4j.logging.Log; import static org.neo4j.coreedge.raft.MajorityIncludingSelfQuorum.isQuorum; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Election.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Election.java index 10bb193aaace..f8269b4f9c3a 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Election.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Election.java @@ -24,8 +24,8 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; public class Election diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Follower.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Follower.java index 38d21f2118df..3d5203d953f2 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Follower.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Follower.java @@ -26,7 +26,7 @@ import org.neo4j.coreedge.raft.RaftMessages.AppendEntries; import org.neo4j.coreedge.raft.RaftMessages.Heartbeat; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; import org.neo4j.logging.Log; import static java.lang.Long.min; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Heart.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Heart.java index 010d24e7c1f2..fcbbae158839 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Heart.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Heart.java @@ -23,7 +23,7 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; import org.neo4j.logging.Log; class Heart diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Leader.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Leader.java index 2824170ed8bb..6b5c193f7d06 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Leader.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Leader.java @@ -28,11 +28,11 @@ import org.neo4j.coreedge.raft.RaftMessages.Heartbeat; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.ShipCommand; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.raft.state.follower.FollowerState; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.FilteringIterable; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Voting.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Voting.java index 09a8e1a17571..901fdc34080d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Voting.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/Voting.java @@ -23,8 +23,8 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.identity.MemberId; public class Voting { diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerState.java similarity index 97% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerState.java index c0e10a941390..89d3297f1638 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerState.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.follower; +package org.neo4j.coreedge.raft.roles.follower; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerStates.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerStates.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerStates.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerStates.java index 27ed8f53952a..825a9f7db87e 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/follower/FollowerStates.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/roles/follower/FollowerStates.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.follower; +package org.neo4j.coreedge.raft.roles.follower; import java.util.HashMap; import java.util.Map; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutService.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutService.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutService.java index c3082d294e36..acf3aafeb4dd 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutService.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutService.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.schedule; import java.time.Clock; import java.util.Collection; @@ -44,7 +44,7 @@ * pool to check for timeouts and as such has a limited resolution of {@link #TIMER_RESOLUTION}, measured in * {@link #TIMER_RESOLUTION_UNIT}. For the same reason, the timeouts are triggered at an approximate delay rather than * exactly at the value requested. - * {@link org.neo4j.coreedge.raft.RenewableTimeoutService.TimeoutHandler} are all called from the same thread, + * {@link RenewableTimeoutService.TimeoutHandler} are all called from the same thread, * so users should be aware to not perform time consuming tasks in them. */ public class DelayedRenewableTimeoutService extends LifecycleAdapter implements Runnable, RenewableTimeoutService diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RenewableTimeoutService.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/RenewableTimeoutService.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RenewableTimeoutService.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/RenewableTimeoutService.java index 7dd03806a0a2..28bbc98c577d 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/RenewableTimeoutService.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/schedule/RenewableTimeoutService.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.schedule; /** * A service for creating {@link RenewableTimeout} instances. Implementations of this interface are expected diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipper.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShipper.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipper.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShipper.java index 7d66ec45f88a..22d9d1f67eef 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipper.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShipper.java @@ -17,30 +17,30 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.shipping; +package org.neo4j.coreedge.raft.shipping; import java.io.IOException; import java.time.Clock; -import org.neo4j.coreedge.raft.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; import org.neo4j.coreedge.raft.LeaderContext; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.raft.RenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.log.ReadableRaftLog; import org.neo4j.coreedge.raft.log.segmented.InFlightMap; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.raft.state.InFlightLogEntryReader; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.InFlightLogEntryReader; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import static java.lang.Long.max; import static java.lang.Long.min; import static java.lang.String.format; -import static org.neo4j.coreedge.raft.RenewableTimeoutService.RenewableTimeout; -import static org.neo4j.coreedge.raft.replication.shipping.RaftLogShipper.Mode.PIPELINE; -import static org.neo4j.coreedge.raft.replication.shipping.RaftLogShipper.Timeouts.RESEND; +import static org.neo4j.coreedge.raft.schedule.RenewableTimeoutService.RenewableTimeout; +import static org.neo4j.coreedge.raft.shipping.RaftLogShipper.Mode.PIPELINE; +import static org.neo4j.coreedge.raft.shipping.RaftLogShipper.Timeouts.RESEND; /// Optimizations // TODO: Have several outstanding batches in catchup mode, to bridge the latency gap. diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShippingManager.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShippingManager.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShippingManager.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShippingManager.java index e7323e50c324..e040bd806360 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShippingManager.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/shipping/RaftLogShippingManager.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.shipping; +package org.neo4j.coreedge.raft.shipping; import java.io.IOException; import java.time.Clock; @@ -33,7 +33,7 @@ import org.neo4j.coreedge.raft.membership.RaftMembership; import org.neo4j.coreedge.raft.net.Outbound; import org.neo4j.coreedge.raft.outcome.ShipCommand; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandApplicationProcess.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandApplicationProcess.java index f52df2f643a4..1f67753949bd 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandApplicationProcess.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CommandApplicationProcess.java @@ -25,13 +25,19 @@ import java.util.function.Supplier; import org.neo4j.coreedge.SessionTracker; +import org.neo4j.coreedge.core.replication.DistributedOperation; +import org.neo4j.coreedge.core.replication.ProgressTracker; +import org.neo4j.coreedge.core.state.CommandDispatcher; +import org.neo4j.coreedge.core.state.CoreSnapshot; +import org.neo4j.coreedge.core.state.CoreStateApplier; +import org.neo4j.coreedge.core.state.CoreStateMachines; +import org.neo4j.coreedge.core.state.InFlightLogEntryReader; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.core.state.tx.CoreReplicatedContent; import org.neo4j.coreedge.raft.log.RaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.log.monitoring.RaftLogCommitIndexMonitor; import org.neo4j.coreedge.raft.log.segmented.InFlightMap; -import org.neo4j.coreedge.raft.replication.DistributedOperation; -import org.neo4j.coreedge.raft.replication.ProgressTracker; -import org.neo4j.coreedge.raft.replication.tx.CoreReplicatedContent; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.kernel.monitoring.Monitors; @@ -190,7 +196,7 @@ private void flush() throws Exception } } - void prune() throws IOException + public void prune() throws IOException { raftLog.prune( lastFlushed ); } @@ -274,7 +280,7 @@ public synchronized CoreSnapshot snapshot() throws IOException, InterruptedExcep return coreSnapshot; } - synchronized void installSnapshot( CoreSnapshot coreSnapshot ) + public synchronized void installSnapshot( CoreSnapshot coreSnapshot ) { coreStateMachines.installSnapshots( coreSnapshot ); long snapshotPrevIndex = coreSnapshot.prevIndex(); diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorage.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorage.java similarity index 94% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorage.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorage.java index cf8190fb7f91..307f522dcbf6 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorage.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorage.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.term; +package org.neo4j.coreedge.raft.term; import java.io.IOException; import org.neo4j.coreedge.raft.log.monitoring.RaftTermMonitor; -import org.neo4j.coreedge.raft.state.StateStorage; +import org.neo4j.coreedge.core.state.StateStorage; import org.neo4j.kernel.monitoring.Monitors; public class MonitoredTermStateStorage implements StateStorage diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/TermState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/TermState.java similarity index 96% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/TermState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/TermState.java index ca8cc406141a..c43791b1d180 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/term/TermState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/term/TermState.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.term; +package org.neo4j.coreedge.raft.term; import java.io.IOException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; +import org.neo4j.coreedge.core.state.SafeStateMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/vote/VoteState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/vote/VoteState.java similarity index 92% rename from enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/vote/VoteState.java rename to enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/vote/VoteState.java index 1bd27cf503a0..0e2bc8124307 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/vote/VoteState.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/vote/VoteState.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.vote; +package org.neo4j.coreedge.raft.vote; import java.io.IOException; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Decoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Decoder.java deleted file mode 100644 index 1c5e3c50a862..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Decoder.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server; - -import java.nio.ByteBuffer; - -public interface Decoder -{ - T decode(ByteBuffer buffer); -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Disposable.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Disposable.java deleted file mode 100644 index ebdb14904e98..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Disposable.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server; - -public interface Disposable -{ - void dispose(); -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encodable.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encodable.java deleted file mode 100644 index 252086299450..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encodable.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server; - -public interface Encodable -{ - Encoder encoder(); -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encoder.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encoder.java deleted file mode 100644 index d14fac910e76..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/Encoder.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server; - -public interface Encoder -{ - /** - * @return true if the encoding is complete, false if further calls to encode are required to completed the encoding. - */ - boolean encode( T target ); -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DeleteStoreOnStartUp.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DeleteStoreOnStartUp.java deleted file mode 100644 index 82ab8541a2e0..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/DeleteStoreOnStartUp.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server.core; - -import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; -import org.neo4j.kernel.lifecycle.LifecycleAdapter; - -public class DeleteStoreOnStartUp extends LifecycleAdapter -{ - private final LocalDatabase localDatabase; - - public DeleteStoreOnStartUp( LocalDatabase localDatabase ) - { - this.localDatabase = localDatabase; - } - - @Override - public void start() throws Throwable - { - localDatabase.deleteStore(); - } -} diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NoBoltConnectivityException.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NoBoltConnectivityException.java deleted file mode 100644 index f188d18d3f5c..000000000000 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/NoBoltConnectivityException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server.core; - -public class NoBoltConnectivityException extends RuntimeException -{ - public NoBoltConnectivityException() - { - super( "No Bolt connector configured. Please refer to the 'Configuring Bolt Connectors' section of the " + - "documentation for more details - " + - "http://neo4j.com/docs/operations-manual/current/#_configuring_bolt_connectors" ); - } -} diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/EdgeStartupProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/EdgeStartupProcessTest.java deleted file mode 100644 index c1be7c8aaaef..000000000000 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/EdgeStartupProcessTest.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge; - -import org.junit.Test; - -import java.util.UUID; - -import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; -import org.neo4j.coreedge.catchup.storecopy.edge.StoreFetcher; -import org.neo4j.coreedge.discovery.ClusterTopology; -import org.neo4j.coreedge.discovery.EdgeTopologyService; -import org.neo4j.coreedge.discovery.TopologyService; -import org.neo4j.coreedge.raft.replication.tx.ConstantTimeRetryStrategy; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; -import org.neo4j.coreedge.server.edge.AlwaysChooseFirstMember; -import org.neo4j.coreedge.server.edge.EdgeStartupProcess; -import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.transaction.state.DataSourceManager; -import org.neo4j.kernel.lifecycle.Lifecycle; -import org.neo4j.logging.NullLogProvider; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; -import static org.neo4j.helpers.collection.Iterators.asSet; - -public class EdgeStartupProcessTest -{ - @Test - public void startShouldReplaceTheEmptyLocalStoreWithStoreFromCoreMemberAndStartPolling() throws Throwable - { - // given - StoreFetcher storeFetcher = mock( StoreFetcher.class ); - LocalDatabase localDatabase = mock( LocalDatabase.class ); - - MemberId memberId = new MemberId( UUID.randomUUID() ); - TopologyService hazelcastTopology = mock( TopologyService.class ); - - ClusterTopology clusterTopology = mock( ClusterTopology.class ); - when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); - - when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); - when( localDatabase.isEmpty() ).thenReturn( true ); - - DataSourceManager dataSourceManager = mock( DataSourceManager.class ); - Lifecycle txPulling = mock( Lifecycle.class ); - - EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, - txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), - new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), - mock( EdgeTopologyService.class ), Config.empty() ); - - // when - edgeStartupProcess.start(); - - // then - verify( dataSourceManager ).start(); - verify( localDatabase ).isEmpty(); - verify( localDatabase ).stop(); - verify( localDatabase ).copyStoreFrom( memberId, storeFetcher ); - verify( localDatabase ).start(); - verify( txPulling ).start(); - verifyNoMoreInteractions( localDatabase, dataSourceManager, txPulling ); - } - - @Test - public void startShouldNotReplaceTheNonEmptyLocalStoreWithStoreFromCoreMemberAndStartPolling() throws Throwable - { - // given - StoreFetcher storeFetcher = mock( StoreFetcher.class ); - MemberId memberId = new MemberId( UUID.randomUUID() ); - LocalDatabase localDatabase = mock( LocalDatabase.class ); - when( localDatabase.isEmpty() ).thenReturn( false ); - doThrow( IllegalStateException.class ).when( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); - - TopologyService hazelcastTopology = mock( TopologyService.class ); - - ClusterTopology clusterTopology = mock( ClusterTopology.class ); - when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); - - when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); - - DataSourceManager dataSourceManager = mock( DataSourceManager.class ); - Lifecycle txPulling = mock( Lifecycle.class ); - - EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, - txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), - new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), - mock( EdgeTopologyService.class ), Config.empty() ); - - // when - try - { - edgeStartupProcess.start(); - fail( "should have thrown" ); - } - catch ( IllegalStateException ex ) - { - // expected - } - - // then - verify( dataSourceManager ).start(); - verify( localDatabase ).isEmpty(); - verify( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); - verifyNoMoreInteractions( localDatabase, dataSourceManager ); - verifyZeroInteractions( txPulling ); - } - - @Test - public void startShouldSimplyStartPollingOnNonEmptyDatabaseAndMatchingStoreId() throws Throwable - { - // given - StoreId storeId = new StoreId( 1, 2, 3, 4 ); - StoreFetcher storeFetcher = mock( StoreFetcher.class ); - when( storeFetcher.storeId( any( MemberId.class ) ) ).thenReturn( storeId ); - LocalDatabase localDatabase = mock( LocalDatabase.class ); - when( localDatabase.storeId() ).thenReturn( storeId ); - - MemberId memberId = new MemberId( UUID.randomUUID() ); - TopologyService hazelcastTopology = mock( TopologyService.class ); - - ClusterTopology clusterTopology = mock( ClusterTopology.class ); - when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); - - when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); - when( localDatabase.isEmpty() ).thenReturn( false ); - - DataSourceManager dataSourceManager = mock( DataSourceManager.class ); - Lifecycle txPulling = mock( Lifecycle.class ); - - EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, - txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), - new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), - mock( EdgeTopologyService.class ), Config.empty() ); - - // when - edgeStartupProcess.start(); - - // then - verify( localDatabase ).isEmpty(); - verify( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); - verify( dataSourceManager ).start(); - verify( txPulling ).start(); - verifyNoMoreInteractions( localDatabase, dataSourceManager, txPulling ); - } - - @Test - public void stopShouldStopTheDatabaseAndStopPolling() throws Throwable - { - // given - StoreFetcher storeFetcher = mock( StoreFetcher.class ); - LocalDatabase localDatabase = mock( LocalDatabase.class ); - - MemberId memberId = new MemberId( UUID.randomUUID() ); - TopologyService hazelcastTopology = mock( TopologyService.class ); - ClusterTopology clusterTopology = mock( ClusterTopology.class ); - when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); - - when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); - when( localDatabase.isEmpty() ).thenReturn( true ); - - DataSourceManager dataSourceManager = mock( DataSourceManager.class ); - Lifecycle txPulling = mock( Lifecycle.class ); - EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, - txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), - new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), - mock( EdgeTopologyService.class ), null ); - - // when - edgeStartupProcess.stop(); - - // then - verify( txPulling ).stop(); - verify( dataSourceManager ).stop(); - verifyNoMoreInteractions( txPulling, dataSourceManager ); - } -} diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/TestStoreId.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/TestStoreId.java index f6b1ac1ed8a5..a6b18c7843bd 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/TestStoreId.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/TestStoreId.java @@ -23,10 +23,9 @@ import java.io.IOException; import java.util.HashSet; import java.util.List; -import java.util.Objects; import java.util.Set; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java index 0569803ad939..cf1bbeecdd31 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/backup/BackupCoreIT.java @@ -38,9 +38,9 @@ import org.neo4j.coreedge.TestStoreId; import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.StoreId; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.StoreId; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.MapUtil; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java index 5aa1d43d1814..b2c8fe526363 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/LocalDatabaseTest.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.io.fs.FileSystemAbstraction; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcherTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcherTest.java index bb46530311de..5d4c8c1d73a3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcherTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/storecopy/edge/StoreFetcherTest.java @@ -30,7 +30,7 @@ import org.neo4j.coreedge.catchup.tx.edge.TransactionLogCatchUpWriter; import org.neo4j.coreedge.catchup.tx.edge.TxPullClient; import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseListener; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPullResponseEncodeDecodeTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPullResponseEncodeDecodeTest.java index 443a3a14b23f..182dca5c48ec 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPullResponseEncodeDecodeTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/TxPullResponseEncodeDecodeTest.java @@ -26,7 +26,7 @@ import org.neo4j.coreedge.catchup.tx.core.TxPullResponseEncoder; import org.neo4j.coreedge.catchup.tx.edge.TxPullResponse; import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseDecoder; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; import org.neo4j.kernel.impl.transaction.command.Command; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClientTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClientTest.java index 62500387a908..3e65d72af9ae 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClientTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/catchup/tx/edge/TxPollingClientTest.java @@ -23,10 +23,10 @@ import org.junit.Test; import org.neo4j.coreedge.catchup.storecopy.CoreClient; -import org.neo4j.coreedge.raft.ControlledRenewableTimeoutService; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; -import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.raft.schedule.ControlledRenewableTimeoutService; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; +import org.neo4j.coreedge.messaging.CoreMemberSelectionStrategy; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.logging.NullLogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionMetaDataTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionMetaDataTest.java index 98bf1423213b..d855cd87a246 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionMetaDataTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionMetaDataTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import static org.junit.Assert.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionVerifierTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionVerifierTest.java index 0e5c46ae5fdf..227701c5be54 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionVerifierTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/convert/ConversionVerifierTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/CoreStartupProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/CoreStartupProcessTest.java similarity index 91% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/CoreStartupProcessTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/CoreStartupProcessTest.java index bf7783241056..bcf724a92904 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/CoreStartupProcessTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/CoreStartupProcessTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge; +package org.neo4j.coreedge.core; import java.util.List; @@ -25,12 +25,10 @@ import org.hamcrest.TypeSafeMatcher; import org.junit.Test; -import org.neo4j.coreedge.raft.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; import org.neo4j.coreedge.raft.RaftServer; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdGeneratorFactory; -import org.neo4j.coreedge.raft.state.CoreState; -import org.neo4j.coreedge.server.core.CoreStartupProcess; -import org.neo4j.coreedge.server.core.MembershipWaiterLifecycle; +import org.neo4j.coreedge.core.state.id.ReplicatedIdGeneratorFactory; +import org.neo4j.coreedge.raft.membership.MembershipWaiterLifecycle; import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.kernel.lifecycle.LifeSupport; @@ -39,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; -import static org.neo4j.coreedge.CoreStartupProcessTest.LifeSupportMatcherBuilder.startsComponent; +import static org.neo4j.coreedge.core.CoreStartupProcessTest.LifeSupportMatcherBuilder.startsComponent; public class CoreStartupProcessTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/CoreReplicatedContentMarshalTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/CoreReplicatedContentMarshalTest.java similarity index 89% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/CoreReplicatedContentMarshalTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/CoreReplicatedContentMarshalTest.java index 2d7484bd0831..0c6a24ded310 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/CoreReplicatedContentMarshalTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/CoreReplicatedContentMarshalTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -32,14 +32,14 @@ import org.neo4j.coreedge.raft.membership.MemberIdSet; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequestSerializer; -import org.neo4j.coreedge.raft.replication.token.TokenType; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionFactory; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequestSerializer; +import org.neo4j.coreedge.core.state.token.TokenType; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionFactory; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.transaction.command.Command; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/DirectReplicator.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/DirectReplicator.java index 0240d3f3ccc7..ae78caeea967 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/DirectReplicator.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; -import org.neo4j.coreedge.raft.state.StateMachine; +import org.neo4j.coreedge.core.state.StateMachine; public class DirectReplicator implements Replicator { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImplTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/ProgressTrackerImplTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImplTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/ProgressTrackerImplTest.java index b44eb57e8359..3ee7116614ce 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/ProgressTrackerImplTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/ProgressTrackerImplTest.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import org.junit.Test; import java.util.UUID; import org.neo4j.coreedge.raft.ReplicatedInteger; -import org.neo4j.coreedge.raft.replication.session.GlobalSession; -import org.neo4j.coreedge.raft.replication.session.LocalOperationId; -import org.neo4j.coreedge.raft.state.Result; +import org.neo4j.coreedge.core.replication.session.GlobalSession; +import org.neo4j.coreedge.core.replication.session.LocalOperationId; +import org.neo4j.coreedge.core.state.Result; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/RaftReplicatorTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/RaftReplicatorTest.java index a70e28e9375b..158e5be1e803 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/RaftReplicatorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/RaftReplicatorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.core.replication; import org.junit.Test; @@ -26,17 +26,17 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.LeaderLocator; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.ReplicatedInteger; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.raft.replication.session.GlobalSession; -import org.neo4j.coreedge.raft.replication.session.LocalSessionPool; -import org.neo4j.coreedge.raft.replication.tx.ConstantTimeRetryStrategy; -import org.neo4j.coreedge.raft.replication.tx.RetryStrategy; -import org.neo4j.coreedge.raft.state.Result; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.session.GlobalSession; +import org.neo4j.coreedge.core.replication.session.LocalSessionPool; +import org.neo4j.coreedge.core.state.tx.ConstantTimeRetryStrategy; +import org.neo4j.coreedge.core.state.tx.RetryStrategy; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.identity.MemberId; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPoolTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/session/LocalSessionPoolTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPoolTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/session/LocalSessionPoolTest.java index d554daaf817e..8f28f8cb814c 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/session/LocalSessionPoolTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/replication/session/LocalSessionPoolTest.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.session; +package org.neo4j.coreedge.core.replication.session; import org.junit.Test; import java.util.UUID; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/BatchingMessageHandlerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/server/BatchingMessageHandlerTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/BatchingMessageHandlerTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/server/BatchingMessageHandlerTest.java index 77b95ee9e4ff..af15361091fe 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/BatchingMessageHandlerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/server/BatchingMessageHandlerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.core.server; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -27,8 +27,10 @@ import org.junit.Test; import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; +import org.neo4j.coreedge.raft.RaftMessages; +import org.neo4j.coreedge.raft.ReplicatedString; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.coreedge.raft.net.Inbound.MessageHandler; -import org.neo4j.coreedge.server.StoreId; import org.neo4j.logging.NullLogProvider; import static org.mockito.Mockito.mock; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateApplierTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateApplierTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateApplierTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateApplierTest.java index 4cef6910a173..094f8899cdc7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateApplierTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateApplierTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateMachinesTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateMachinesTest.java similarity index 91% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateMachinesTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateMachinesTest.java index 67de8025be22..22e2201af875 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateMachinesTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateMachinesTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Test; import org.mockito.InOrder; @@ -26,16 +26,16 @@ import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; import org.neo4j.coreedge.raft.log.MonitoredRaftLog; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationStateMachine; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequest; -import org.neo4j.coreedge.raft.replication.token.ReplicatedTokenStateMachine; -import org.neo4j.coreedge.raft.replication.token.TokenType; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionStateMachine; -import org.neo4j.coreedge.server.core.RecoverTransactionLogState; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationStateMachine; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenRequest; +import org.neo4j.coreedge.core.state.token.ReplicatedTokenStateMachine; +import org.neo4j.coreedge.core.state.token.TokenType; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionStateMachine; +import org.neo4j.coreedge.core.state.tx.RecoverTransactionLogState; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.storageengine.api.Token; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateTest.java similarity index 91% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateTest.java index b91b4256927d..833e44233fc4 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CoreStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/CoreStateTest.java @@ -17,20 +17,21 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Test; import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.raft.state.CommandApplicationProcess; import org.neo4j.logging.AssertableLogProvider; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class CoreStateTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageIT.java similarity index 99% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageIT.java index 54a7e148fbf9..e5e976863da3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Rule; import org.junit.Test; @@ -30,6 +30,7 @@ import org.neo4j.adversaries.CountingAdversary; import org.neo4j.adversaries.MethodGuardedAdversary; import org.neo4j.adversaries.fs.AdversarialFileSystemAbstraction; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.graphdb.mockfs.SelectiveFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageTest.java similarity index 99% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageTest.java index d0374f0205d5..977d40accf38 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/DurableStateStorageTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/DurableStateStorageTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Rule; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReaderTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/InFlightLogEntryReaderTest.java similarity index 99% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReaderTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/InFlightLogEntryReaderTest.java index dc7a3eb58bef..f72d7a143948 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/InFlightLogEntryReaderTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/InFlightLogEntryReaderTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateBuilder.java similarity index 95% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateBuilder.java index 3e3af57075f9..8847bd13859f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateBuilder.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import java.io.IOException; import java.util.Collection; @@ -32,10 +32,10 @@ import org.neo4j.coreedge.raft.membership.RaftMembership; import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.NullLogProvider; import static java.util.Collections.emptySet; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateTest.java index db2b4b633d21..a50289223771 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/RaftStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/RaftStateTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.core.state; import org.junit.Test; @@ -38,10 +38,10 @@ import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.TruncateLogCommand; -import org.neo4j.coreedge.raft.state.follower.FollowerState; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; import org.neo4j.logging.NullLogProvider; import static java.util.Collections.emptySet; @@ -50,7 +50,7 @@ import static org.junit.Assert.assertNull; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; import static org.neo4j.coreedge.raft.roles.Role.CANDIDATE; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class RaftStateTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdAllocationStateTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdAllocationStateTest.java index 3ca416983ad4..2bbd3d7c75f8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/id_allocation/IdAllocationStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdAllocationStateTest.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.id_allocation; +package org.neo4j.coreedge.core.state.id; import org.junit.Test; import java.io.IOException; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.transaction.log.InMemoryVersionableReadableClosablePositionAwareChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/IdRangeIteratorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdRangeIteratorTest.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/IdRangeIteratorTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdRangeIteratorTest.java index 90da201365f1..6ba560c64dd7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/IdRangeIteratorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/IdRangeIteratorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.junit.Test; import org.neo4j.kernel.impl.store.id.IdRange; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachineTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachineTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachineTest.java index 8dea2843ee26..1c019e66f50e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdAllocationStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdAllocationStateMachineTest.java @@ -17,16 +17,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.junit.Test; import java.io.IOException; import java.util.UUID; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; import static junit.framework.TestCase.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorTest.java similarity index 99% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorTest.java index c32b3511b5a7..68d5f3dca405 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdGeneratorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdGeneratorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.junit.Before; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirerTest.java similarity index 93% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirerTest.java index d9e14fa1bf0b..c35cf5a7cc04 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/ReplicatedIdRangeAcquirerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.junit.Test; @@ -25,10 +25,9 @@ import java.util.Set; import java.util.UUID; -import org.neo4j.coreedge.raft.replication.DirectReplicator; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.raft.state.id_allocation.IdAllocationState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.DirectReplicator; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.logging.NullLogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/StateRecoveryManagerTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/StateRecoveryManagerTest.java index 150cbde28803..7c04b8dc6086 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/StateRecoveryManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/id/StateRecoveryManagerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.id; +package org.neo4j.coreedge.core.state.id; import org.junit.Before; import org.junit.Rule; @@ -27,8 +27,8 @@ import java.io.IOException; import java.nio.ByteBuffer; -import org.neo4j.coreedge.raft.state.SafeStateMarshal; -import org.neo4j.coreedge.raft.state.StateRecoveryManager; +import org.neo4j.coreedge.core.state.SafeStateMarshal; +import org.neo4j.coreedge.core.state.StateRecoveryManager; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.storageengine.api.ReadableChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManagerTest.java similarity index 92% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManagerTest.java index 29ac730cd0e9..146f372a05f3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/LeaderOnlyLockManagerTest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import org.junit.Test; import org.neo4j.coreedge.raft.LeaderLocator; -import org.neo4j.coreedge.raft.replication.DirectReplicator; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.DirectReplicator; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.ResourceTypes; import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException; @@ -32,7 +32,7 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @SuppressWarnings("unchecked") public class LeaderOnlyLockManagerTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachineTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachineTest.java index 1c0fb58cd2cf..0cfc4fe1bbdf 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/locks/ReplicatedLockTokenStateMachineTest.java @@ -17,18 +17,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core.locks; +package org.neo4j.coreedge.core.state.locks; import org.junit.Rule; import org.junit.Test; import java.util.function.Supplier; -import org.neo4j.coreedge.raft.state.DurableStateStorage; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.raft.state.StateMarshal; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.DurableStateStorage; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.core.state.StateMarshal; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.logging.NullLogProvider; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class ReplicatedLockTokenStateMachineTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolderTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolderTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolderTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolderTest.java index 4027cf295cd3..ee550842f2a0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenHolderTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenHolderTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.util.Collection; import java.util.concurrent.CompletableFuture; @@ -25,8 +25,8 @@ import org.junit.Test; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.Replicator; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.Replicator; import org.neo4j.graphdb.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.store.id.IdGenerator; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachineTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachineTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachineTest.java index 5bbea3706f37..3fd25ac99368 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/token/ReplicatedTokenStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/token/ReplicatedTokenStateMachineTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.token; +package org.neo4j.coreedge.core.state.token; import java.util.ArrayList; import java.util.List; @@ -44,9 +44,9 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; -import static org.neo4j.coreedge.raft.replication.token.ReplicatedTokenRequestSerializer.commandBytes; -import static org.neo4j.coreedge.raft.replication.token.TokenType.LABEL; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; +import static org.neo4j.coreedge.core.state.token.ReplicatedTokenRequestSerializer.commandBytes; +import static org.neo4j.coreedge.core.state.token.TokenType.LABEL; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; public class ReplicatedTokenStateMachineTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/CommitProcessStateMachineCollaborationTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/CommitProcessStateMachineCollaborationTest.java similarity index 92% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/CommitProcessStateMachineCollaborationTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/CommitProcessStateMachineCollaborationTest.java index 413bad300386..c92f03cefcef 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/CommitProcessStateMachineCollaborationTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/CommitProcessStateMachineCollaborationTest.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; -import org.neo4j.coreedge.raft.replication.DirectReplicator; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.replication.DirectReplicator; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategyTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategyTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategyTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategyTest.java index 26706e12c16e..93ff67cadab0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ExponentialBackoffStrategyTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ExponentialBackoffStrategyTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncodingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncodingTest.java similarity index 86% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncodingTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncodingTest.java index 2531c2ea1335..f919b1fd8119 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/LogIndexTxHeaderEncodingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/LogIndexTxHeaderEncodingTest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; import static org.junit.Assert.*; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; -import static org.neo4j.coreedge.raft.replication.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.decodeLogIndexFromTxHeader; +import static org.neo4j.coreedge.core.state.tx.LogIndexTxHeaderEncoding.encodeLogIndexAsTxHeader; public class LogIndexTxHeaderEncodingTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcessTest.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcessTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcessTest.java index 699074d1f3e8..bc510c751f12 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplayableCommitProcessTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplayableCommitProcessTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcessTest.java similarity index 93% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcessTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcessTest.java index 2c4711b4be0f..ff145d93c5a2 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionCommitProcessTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionCommitProcessTest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; import java.util.concurrent.CompletableFuture; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.Replicator; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.Replicator; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.TransactionRepresentation; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachineTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachineTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachineTest.java index d44dc57bd799..4cef097ffb9f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/tx/ReplicatedTransactionStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/core/state/tx/ReplicatedTransactionStateMachineTest.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.tx; +package org.neo4j.coreedge.core.state.tx; import org.junit.Test; import java.util.concurrent.atomic.AtomicBoolean; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenRequest; -import org.neo4j.coreedge.server.core.locks.ReplicatedLockTokenStateMachine; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenRequest; +import org.neo4j.coreedge.core.state.locks.ReplicatedLockTokenStateMachine; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java index 2e1ebf76bee3..0cfc4d15f7b7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/Cluster.java @@ -40,13 +40,13 @@ import java.util.stream.Collectors; import org.neo4j.coreedge.raft.NoLeaderFoundException; -import org.neo4j.coreedge.raft.replication.id.IdGenerationException; +import org.neo4j.coreedge.core.state.id.IdGenerationException; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; -import org.neo4j.coreedge.server.core.locks.LeaderOnlyLockManager; -import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.state.locks.LeaderOnlyLockManager; +import org.neo4j.coreedge.edge.EdgeGraphDatabase; import org.neo4j.function.Predicates; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionFailureException; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java index 5dd1333492aa..fb9274a0e162 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java @@ -27,11 +27,11 @@ import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.log.segmented.FileNames; -import org.neo4j.coreedge.raft.state.CoreState; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.state.CoreState; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.GraphDatabaseDependencies; @@ -41,7 +41,7 @@ import static java.util.stream.Collectors.joining; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; +import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; import static org.neo4j.helpers.collection.MapUtil.stringMap; public class CoreClusterMember diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/EdgeClusterMember.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/EdgeClusterMember.java index c7fed7c74094..4ba6595d6e5a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/EdgeClusterMember.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/EdgeClusterMember.java @@ -24,9 +24,9 @@ import java.util.Map; import java.util.function.IntFunction; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.edge.EdgeGraphDatabase; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.GraphDatabaseDependencies; import org.neo4j.logging.Level; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java index 250294f19b92..7498e5891bba 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java @@ -35,7 +35,7 @@ import java.util.Spliterator; import java.util.UUID; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java index 2f226eb662a2..f44d3db1253d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java @@ -34,12 +34,12 @@ import java.util.concurrent.TimeUnit; import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; -import org.neo4j.coreedge.raft.replication.tx.ConstantTimeRetryStrategy; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.edge.CoreMemberSelectionStrategy; -import org.neo4j.coreedge.server.edge.EdgeStartupProcess; +import org.neo4j.coreedge.core.state.tx.ConstantTimeRetryStrategy; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.messaging.CoreMemberSelectionStrategy; +import org.neo4j.coreedge.edge.EdgeStartupProcess; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Pair; import org.neo4j.kernel.configuration.Config; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryCoreClient.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryCoreClient.java index 98cdeb36b2bb..ef8481063c56 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryCoreClient.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryCoreClient.java @@ -22,10 +22,10 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.edge.EnterpriseEdgeEditionModule; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.edge.EnterpriseEdgeEditionModule; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryEdgeClient.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryEdgeClient.java index 47ccd438a0be..0f03b5af6ae8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryEdgeClient.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryEdgeClient.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.discovery; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryService.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryService.java index d1f66603ef56..7a240ac415c3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryService.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/SharedDiscoveryService.java @@ -30,7 +30,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedureTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedureTest.java similarity index 82% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedureTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedureTest.java index fee13f942b24..39deb195bc8c 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/AcquireEndpointsProcedureTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/AcquireEndpointsProcedureTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -31,7 +31,7 @@ import org.neo4j.coreedge.discovery.CoreTopologyService; import org.neo4j.coreedge.raft.LeaderLocator; import org.neo4j.coreedge.raft.NoLeaderFoundException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.NullLogProvider; import static java.util.stream.Collectors.toList; @@ -40,9 +40,7 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; -import static org.neo4j.coreedge.server.core.DiscoverMembersProcedureTest.addresses; -import static org.neo4j.coreedge.server.core.DiscoverMembersProcedureTest.coreAddresses; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asList; public class AcquireEndpointsProcedureTest @@ -55,9 +53,9 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio Map coreMembers = new HashMap<>(); MemberId theLeader = member( 0 ); - coreMembers.put( theLeader, coreAddresses( 0 ) ); + coreMembers.put( theLeader, DiscoverMembersProcedureTest.coreAddresses( 0 ) ); - final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 1 ) ); + final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverMembersProcedureTest.addresses( 1 ) ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); LeaderLocator leaderLocator = mock( LeaderLocator.class ); @@ -71,8 +69,8 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio // then MatcherAssert.assertThat( members, containsInAnyOrder( - new Object[]{coreAddresses( 0 ).getRaftServer().toString(), "write"}, - new Object[]{coreAddresses( 1 ).getRaftServer().toString(), "read"} + new Object[]{DiscoverMembersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "write"}, + new Object[]{DiscoverMembersProcedureTest.coreAddresses( 1 ).getRaftServer().toString(), "read"} ) ); } @@ -84,9 +82,9 @@ public void shouldOnlyRecommendOneReadServerEvenIfMultipleAreAvailable() throws Map coreMembers = new HashMap<>(); MemberId theLeader = member( 0 ); - coreMembers.put( theLeader, coreAddresses( 0 ) ); + coreMembers.put( theLeader, DiscoverMembersProcedureTest.coreAddresses( 0 ) ); - final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses( 1, 2, 3 ) ); + final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverMembersProcedureTest.addresses( 1, 2, 3 ) ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); LeaderLocator leaderLocator = mock( LeaderLocator.class ); @@ -110,8 +108,8 @@ public void shouldReturnCoreMemberAsReadServerIfNoEdgeServersAvailable() throws Map coreMembers = new HashMap<>(); MemberId theLeader = member( 0 ); - coreMembers.put( theLeader, coreAddresses( 0 ) ); - final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses() ); + coreMembers.put( theLeader, DiscoverMembersProcedureTest.coreAddresses( 0 ) ); + final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverMembersProcedureTest.addresses() ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); @@ -126,8 +124,8 @@ public void shouldReturnCoreMemberAsReadServerIfNoEdgeServersAvailable() throws // then assertThat( members, containsInAnyOrder( - new Object[]{coreAddresses( 0 ).getRaftServer().toString(), "write"}, - new Object[]{coreAddresses( 0 ).getRaftServer().toString(), "read"} + new Object[]{DiscoverMembersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "write"}, + new Object[]{DiscoverMembersProcedureTest.coreAddresses( 0 ).getRaftServer().toString(), "read"} ) ); } @@ -138,9 +136,9 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception final CoreTopologyService topologyService = mock( CoreTopologyService.class ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), coreAddresses( 0 ) ); + coreMembers.put( member( 0 ), DiscoverMembersProcedureTest.coreAddresses( 0 ) ); - final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses() ); + final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverMembersProcedureTest.addresses() ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); @@ -165,9 +163,9 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws final CoreTopologyService topologyService = mock( CoreTopologyService.class ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), coreAddresses( 0 ) ); + coreMembers.put( member( 0 ), DiscoverMembersProcedureTest.coreAddresses( 0 ) ); - final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, addresses() ); + final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, DiscoverMembersProcedureTest.addresses() ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedureTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedureTest.java similarity index 86% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedureTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedureTest.java index 16e8afcf66e3..59404ec1384e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/ClusterOverviewProcedureTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/ClusterOverviewProcedureTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import java.util.HashMap; import java.util.List; @@ -33,15 +33,13 @@ import org.neo4j.coreedge.discovery.CoreTopologyService; import org.neo4j.coreedge.discovery.EdgeAddresses; import org.neo4j.coreedge.raft.LeaderLocator; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.NullLogProvider; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.core.DiscoverMembersProcedureTest.addresses; -import static org.neo4j.coreedge.server.core.DiscoverMembersProcedureTest.coreAddresses; import static org.neo4j.helpers.collection.Iterators.asList; public class ClusterOverviewProcedureTest @@ -57,11 +55,11 @@ public void shouldRecommendTheCoreLeaderForWriteAndEdgeForRead() throws Exceptio MemberId follower1 = new MemberId( UUID.randomUUID() ); MemberId follower2 = new MemberId( UUID.randomUUID() ); - coreMembers.put( follower2, coreAddresses( 2 ) ); - coreMembers.put( follower1, coreAddresses( 1 ) ); - coreMembers.put( theLeader, coreAddresses( 0 ) ); + coreMembers.put( follower2, DiscoverMembersProcedureTest.coreAddresses( 2 ) ); + coreMembers.put( follower1, DiscoverMembersProcedureTest.coreAddresses( 1 ) ); + coreMembers.put( theLeader, DiscoverMembersProcedureTest.coreAddresses( 0 ) ); - Set edges = addresses( 4, 5 ); + Set edges = DiscoverMembersProcedureTest.addresses( 4, 5 ); final ClusterTopology clusterTopology = new ClusterTopology( false, coreMembers, edges ); when( topologyService.currentTopology() ).thenReturn( clusterTopology ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedureTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedureTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedureTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedureTest.java index a4606c2a77f0..a6a550408da5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/DiscoverMembersProcedureTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/DiscoverMembersProcedureTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import org.junit.Test; @@ -32,8 +32,8 @@ import org.neo4j.coreedge.discovery.CoreAddresses; import org.neo4j.coreedge.discovery.CoreTopologyService; import org.neo4j.coreedge.discovery.EdgeAddresses; -import org.neo4j.coreedge.server.AdvertisedSocketAddress; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.NullLogProvider; import static org.hamcrest.MatcherAssert.assertThat; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asList; public class DiscoverMembersProcedureTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/RoleProcedureTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/RoleProcedureTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/RoleProcedureTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/RoleProcedureTest.java index 4a4fb355cf52..b8302ee0b0a5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/RoleProcedureTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/procedures/RoleProcedureTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server.core; +package org.neo4j.coreedge.discovery.procedures; import org.junit.Test; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/edge/EdgeStartupProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/edge/EdgeStartupProcessTest.java new file mode 100644 index 000000000000..21a9f1868333 --- /dev/null +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/edge/EdgeStartupProcessTest.java @@ -0,0 +1,199 @@ +/* + * Copyright (c) 2002-2016 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.neo4j.coreedge.edge; + +import java.util.UUID; + +import org.junit.Test; +import org.mockito.Matchers; +import org.mockito.Mockito; + +import org.neo4j.coreedge.catchup.storecopy.LocalDatabase; +import org.neo4j.coreedge.catchup.storecopy.edge.StoreFetcher; +import org.neo4j.coreedge.core.state.tx.ConstantTimeRetryStrategy; +import org.neo4j.coreedge.discovery.ClusterTopology; +import org.neo4j.coreedge.discovery.EdgeTopologyService; +import org.neo4j.coreedge.discovery.TopologyService; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; +import org.neo4j.coreedge.messaging.AlwaysChooseFirstMember; +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.transaction.state.DataSourceManager; +import org.neo4j.kernel.lifecycle.Lifecycle; +import org.neo4j.logging.NullLogProvider; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +import static org.junit.Assert.fail; + +import static org.neo4j.helpers.collection.Iterators.asSet; + +public class EdgeStartupProcessTest +{ + @Test + public void startShouldReplaceTheEmptyLocalStoreWithStoreFromCoreMemberAndStartPolling() throws Throwable + { + // given + StoreFetcher storeFetcher = Mockito.mock( StoreFetcher.class ); + LocalDatabase localDatabase = Mockito.mock( LocalDatabase.class ); + + MemberId memberId = new MemberId( UUID.randomUUID() ); + TopologyService hazelcastTopology = Mockito.mock( TopologyService.class ); + + ClusterTopology clusterTopology = Mockito.mock( ClusterTopology.class ); + Mockito.when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); + + Mockito.when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); + Mockito.when( localDatabase.isEmpty() ).thenReturn( true ); + + DataSourceManager dataSourceManager = Mockito.mock( DataSourceManager.class ); + Lifecycle txPulling = Mockito.mock( Lifecycle.class ); + + EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, + txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), + new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), + Mockito.mock( EdgeTopologyService.class ), Config.empty() ); + + // when + edgeStartupProcess.start(); + + // then + Mockito.verify( dataSourceManager ).start(); + Mockito.verify( localDatabase ).isEmpty(); + Mockito.verify( localDatabase ).stop(); + Mockito.verify( localDatabase ).copyStoreFrom( memberId, storeFetcher ); + Mockito.verify( localDatabase ).start(); + Mockito.verify( txPulling ).start(); + Mockito.verifyNoMoreInteractions( localDatabase, dataSourceManager, txPulling ); + } + + @Test + public void startShouldNotReplaceTheNonEmptyLocalStoreWithStoreFromCoreMemberAndStartPolling() throws Throwable + { + // given + StoreFetcher storeFetcher = Mockito.mock( StoreFetcher.class ); + MemberId memberId = new MemberId( UUID.randomUUID() ); + LocalDatabase localDatabase = Mockito.mock( LocalDatabase.class ); + Mockito.when( localDatabase.isEmpty() ).thenReturn( false ); + Mockito.doThrow( IllegalStateException.class ).when( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); + + TopologyService hazelcastTopology = Mockito.mock( TopologyService.class ); + + ClusterTopology clusterTopology = Mockito.mock( ClusterTopology.class ); + Mockito.when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); + + Mockito.when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); + + DataSourceManager dataSourceManager = Mockito.mock( DataSourceManager.class ); + Lifecycle txPulling = Mockito.mock( Lifecycle.class ); + + EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, + txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), + new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), + Mockito.mock( EdgeTopologyService.class ), Config.empty() ); + + // when + try + { + edgeStartupProcess.start(); + fail( "should have thrown" ); + } + catch ( IllegalStateException ex ) + { + // expected + } + + // then + Mockito.verify( dataSourceManager ).start(); + Mockito.verify( localDatabase ).isEmpty(); + Mockito.verify( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); + Mockito.verifyNoMoreInteractions( localDatabase, dataSourceManager ); + Mockito.verifyZeroInteractions( txPulling ); + } + + @Test + public void startShouldSimplyStartPollingOnNonEmptyDatabaseAndMatchingStoreId() throws Throwable + { + // given + StoreId storeId = new StoreId( 1, 2, 3, 4 ); + StoreFetcher storeFetcher = Mockito.mock( StoreFetcher.class ); + Mockito.when( storeFetcher.storeId( Matchers.any( MemberId.class ) ) ).thenReturn( storeId ); + LocalDatabase localDatabase = Mockito.mock( LocalDatabase.class ); + Mockito.when( localDatabase.storeId() ).thenReturn( storeId ); + + MemberId memberId = new MemberId( UUID.randomUUID() ); + TopologyService hazelcastTopology = Mockito.mock( TopologyService.class ); + + ClusterTopology clusterTopology = Mockito.mock( ClusterTopology.class ); + Mockito.when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); + + Mockito.when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); + Mockito.when( localDatabase.isEmpty() ).thenReturn( false ); + + DataSourceManager dataSourceManager = Mockito.mock( DataSourceManager.class ); + Lifecycle txPulling = Mockito.mock( Lifecycle.class ); + + EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, + txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), + new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), + Mockito.mock( EdgeTopologyService.class ), Config.empty() ); + + // when + edgeStartupProcess.start(); + + // then + Mockito.verify( localDatabase ).isEmpty(); + Mockito.verify( localDatabase ).ensureSameStoreId( memberId, storeFetcher ); + Mockito.verify( dataSourceManager ).start(); + Mockito.verify( txPulling ).start(); + Mockito.verifyNoMoreInteractions( localDatabase, dataSourceManager, txPulling ); + } + + @Test + public void stopShouldStopTheDatabaseAndStopPolling() throws Throwable + { + // given + StoreFetcher storeFetcher = Mockito.mock( StoreFetcher.class ); + LocalDatabase localDatabase = Mockito.mock( LocalDatabase.class ); + + MemberId memberId = new MemberId( UUID.randomUUID() ); + TopologyService hazelcastTopology = Mockito.mock( TopologyService.class ); + ClusterTopology clusterTopology = Mockito.mock( ClusterTopology.class ); + Mockito.when( clusterTopology.coreMembers() ).thenReturn( asSet( memberId ) ); + + Mockito.when( hazelcastTopology.currentTopology() ).thenReturn( clusterTopology ); + Mockito.when( localDatabase.isEmpty() ).thenReturn( true ); + + DataSourceManager dataSourceManager = Mockito.mock( DataSourceManager.class ); + Lifecycle txPulling = Mockito.mock( Lifecycle.class ); + EdgeStartupProcess edgeStartupProcess = new EdgeStartupProcess( storeFetcher, localDatabase, + txPulling, dataSourceManager, new AlwaysChooseFirstMember( hazelcastTopology ), + new ConstantTimeRetryStrategy( 1, MILLISECONDS ), NullLogProvider.getInstance(), + Mockito.mock( EdgeTopologyService.class ), null ); + + // when + edgeStartupProcess.stop(); + + // then + Mockito.verify( txPulling ).stop(); + Mockito.verify( dataSourceManager ).stop(); + Mockito.verifyNoMoreInteractions( txPulling, dataSourceManager ); + } +} diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMember.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMember.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMember.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMember.java index 9de325162457..17acfd9aa5f8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMember.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMember.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.identity; import java.util.HashMap; import java.util.Map; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMemberSetBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMemberSetBuilder.java similarity index 93% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMemberSetBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMemberSetBuilder.java index bd5aef0ea158..78016171c827 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/RaftTestMemberSetBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/identity/RaftTestMemberSetBuilder.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.identity; import java.util.HashSet; import java.util.Set; @@ -25,7 +25,7 @@ import org.neo4j.coreedge.raft.membership.RaftGroup; import org.neo4j.coreedge.raft.membership.RaftTestGroup; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class RaftTestMemberSetBuilder implements RaftGroup.Builder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/IdleChannelReaperHandlerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandlerTest.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/IdleChannelReaperHandlerTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandlerTest.java index fee1dddf95b4..786106c6c21b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/IdleChannelReaperHandlerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/IdleChannelReaperHandlerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging; import java.net.InetSocketAddress; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestNetwork.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/TestNetwork.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestNetwork.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/TestNetwork.java index a5b34e98cac3..379e9cd156e8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestNetwork.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/TestNetwork.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.messaging; import java.util.Collection; import java.util.Comparator; @@ -33,9 +33,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiFunction; -import org.neo4j.coreedge.network.Message; - -public class RaftTestNetwork +public class TestNetwork { private final Map inboundChannels = new HashMap<>(); private final Map outboundChannels = new HashMap<>(); @@ -43,7 +41,7 @@ public class RaftTestNetwork private final AtomicLong seqGen = new AtomicLong(); private final BiFunction latencySpecMillis; - public RaftTestNetwork( BiFunction latencySpecMillis ) + public TestNetwork( BiFunction latencySpecMillis ) { this.latencySpecMillis = latencySpecMillis; } diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/AdvertisedSocketAddressMarshallingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/AdvertisedSocketAddressMarshallingTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/AdvertisedSocketAddressMarshallingTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/AdvertisedSocketAddressMarshallingTest.java index 21e3dfd36110..a0fef4f641ea 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/AdvertisedSocketAddressMarshallingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/AdvertisedSocketAddressMarshallingTest.java @@ -17,15 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.server; +package org.neo4j.coreedge.messaging.marsalling; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.Test; +import org.neo4j.coreedge.messaging.AdvertisedSocketAddress; import org.neo4j.coreedge.raft.net.NetworkFlushableChannelNetty4; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.messaging.EndOfStreamException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StringByteBufferMarshalTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/StringMarshalTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StringByteBufferMarshalTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/StringMarshalTest.java index 617819143f1c..ed6b25883de7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StringByteBufferMarshalTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/messaging/marsalling/StringMarshalTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication; +package org.neo4j.coreedge.messaging.marsalling; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; -public class StringByteBufferMarshalTest +public class StringMarshalTest { @Test public void shouldSerializeAndDeserializeString() diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/CatchUpTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/CatchUpTest.java index 3015e4a41e9e..9baee512b67e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/CatchUpTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/CatchUpTest.java @@ -28,15 +28,15 @@ import org.neo4j.coreedge.raft.RaftMessages.NewEntry.Request; import org.neo4j.coreedge.raft.log.ReadableRaftLog; import org.neo4j.coreedge.raft.membership.RaftTestGroup; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.identity.MemberId; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.Matchers.empty; import static org.junit.Assert.assertThat; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class CatchUpTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DirectNetworking.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DirectNetworking.java index c2eec50f43c9..911c41a088f5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DirectNetworking.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DirectNetworking.java @@ -28,8 +28,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.neo4j.coreedge.network.Message; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.Message; +import org.neo4j.coreedge.identity.MemberId; public class DirectNetworking { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/EmptyStateMachine.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/EmptyStateMachine.java index c3749c0b8cb2..1b4b9698b31f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/EmptyStateMachine.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/EmptyStateMachine.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; class EmptyStateMachine implements RaftStateMachine { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/HeartbeatBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/HeartbeatBuilder.java index dc78a9a7207e..c1ec5b1d306e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/HeartbeatBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/HeartbeatBuilder.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class HeartbeatBuilder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/MessageUtils.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/MessageUtils.java index b9e5154e9fdf..9b3c0bcedb83 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/MessageUtils.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/MessageUtils.java @@ -23,7 +23,7 @@ import java.util.function.Predicate; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.FilteringIterable; import org.neo4j.helpers.collection.Iterables; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/OutboundMessageCollector.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/OutboundMessageCollector.java index 1c164d0fb102..ed3855fb15e8 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/OutboundMessageCollector.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/OutboundMessageCollector.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.Map; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class OutboundMessageCollector implements Outbound { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceBuilder.java index 0d852b7f046e..eeec0bb9f7f6 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceBuilder.java @@ -32,14 +32,16 @@ import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.net.Outbound; import org.neo4j.coreedge.raft.outcome.ConsensusOutcome; -import org.neo4j.coreedge.raft.replication.SendToMyself; -import org.neo4j.coreedge.raft.replication.shipping.RaftLogShippingManager; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.raft.state.StateStorage; -import org.neo4j.coreedge.raft.state.membership.RaftMembershipState; -import org.neo4j.coreedge.raft.state.term.TermState; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.SendToMyself; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService; +import org.neo4j.coreedge.raft.shipping.RaftLogShippingManager; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.core.state.StateStorage; +import org.neo4j.coreedge.raft.membership.RaftMembershipState; +import org.neo4j.coreedge.raft.term.TermState; +import org.neo4j.coreedge.raft.vote.VoteState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceTest.java index 0dff30e6dd5e..0f9637370e0e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftInstanceTest.java @@ -29,8 +29,9 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.membership.RaftTestGroup; import org.neo4j.coreedge.raft.net.Inbound; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.raft.schedule.ControlledRenewableTimeoutService; import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.internal.KernelEventHandlers; @@ -51,7 +52,7 @@ import static org.neo4j.coreedge.raft.TestMessageBuilders.voteResponse; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; import static org.neo4j.coreedge.raft.roles.Role.FOLLOWER; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterables.last; import static org.neo4j.helpers.collection.Iterators.asSet; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestFixture.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestFixture.java index bc04e2a37c32..96b0ed6efa5f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestFixture.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/RaftTestFixture.java @@ -30,9 +30,11 @@ import org.neo4j.coreedge.raft.net.LoggingOutbound; import org.neo4j.coreedge.raft.net.Outbound; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; -import org.neo4j.coreedge.server.logging.NullMessageLogger; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.logging.NullMessageLogger; +import org.neo4j.coreedge.raft.schedule.ControlledRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.RenewableTimeoutService; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedInteger.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedInteger.java index 4af994dbfee3..357b3a51662b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedInteger.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedInteger.java @@ -21,7 +21,7 @@ import java.util.Objects; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.ReplicatedContent; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedString.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedString.java index 549fc735c2a3..d62fd53d9257 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedString.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ReplicatedString.java @@ -19,7 +19,7 @@ */ package org.neo4j.coreedge.raft; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; +import org.neo4j.coreedge.core.replication.ReplicatedContent; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/TestMessageBuilders.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/TestMessageBuilders.java index e5fe53766546..4b8819772b6e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/TestMessageBuilders.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/TestMessageBuilders.java @@ -19,6 +19,11 @@ */ package org.neo4j.coreedge.raft; +import org.neo4j.coreedge.raft.roles.AppendEntriesRequestBuilder; +import org.neo4j.coreedge.raft.roles.AppendEntriesResponseBuilder; +import org.neo4j.coreedge.raft.vote.VoteRequestBuilder; +import org.neo4j.coreedge.raft.vote.VoteResponseBuilder; + public class TestMessageBuilders { public static AppendEntriesRequestBuilder appendEntriesRequest() diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/DisconnectLeaderScenario.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/DisconnectLeaderScenario.java index 0af223b1a30b..60302cf79746 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/DisconnectLeaderScenario.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/DisconnectLeaderScenario.java @@ -24,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeoutException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.FilteringIterable; /** diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionPerformanceIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionPerformanceIT.java index 315e031835a0..4e90e30c7a89 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionPerformanceIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionPerformanceIT.java @@ -23,14 +23,14 @@ import java.util.Set; -import org.neo4j.coreedge.raft.RaftTestNetwork; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.TestNetwork; +import org.neo4j.coreedge.identity.MemberId; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; /** @@ -61,7 +61,7 @@ public void electionPerformance_NormalConditions() throws Throwable final long heartbeatInterval = 250L; final int iterations = 10; - RaftTestNetwork net = new RaftTestNetwork<>( ( i, o ) -> networkLatency ); + TestNetwork net = new TestNetwork<>( ( i, o ) -> networkLatency ); Set members = asSet( member( 0 ), member( 1 ), member( 2 ) ); Fixture fixture = new Fixture( members, net, electionTimeout, heartbeatInterval ); DisconnectLeaderScenario scenario = new DisconnectLeaderScenario( fixture, electionTimeout ); @@ -102,7 +102,7 @@ public void electionPerformance_RapidConditions() throws Throwable final long heartbeatInterval = 15L; final int iterations = 100; - RaftTestNetwork net = new RaftTestNetwork<>( ( i, o ) -> networkLatency ); + TestNetwork net = new TestNetwork<>( ( i, o ) -> networkLatency ); Set members = asSet( member( 0 ), member( 1 ), member( 2 ) ); Fixture fixture = new Fixture( members, net, electionTimeout, heartbeatInterval ); DisconnectLeaderScenario scenario = new DisconnectLeaderScenario( fixture, electionTimeout ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionUtil.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionUtil.java index 8839fc3e0b59..77d85d62dca7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionUtil.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/ElectionUtil.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeoutException; import org.neo4j.coreedge.raft.RaftInstance; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.Iterables; import org.neo4j.kernel.impl.util.Listener; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/Fixture.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/Fixture.java index ec2174488bc9..664a8f205453 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/Fixture.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/elections/Fixture.java @@ -27,17 +27,17 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import org.neo4j.coreedge.raft.DelayedRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.DelayedRenewableTimeoutService; import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.RaftInstance.BootstrapException; import org.neo4j.coreedge.raft.RaftInstanceBuilder; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.RaftStateMachine; -import org.neo4j.coreedge.raft.RaftTestNetwork; +import org.neo4j.coreedge.messaging.TestNetwork; import org.neo4j.coreedge.raft.log.InMemoryRaftLog; import org.neo4j.coreedge.raft.membership.RaftTestGroup; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; import org.neo4j.function.Predicates; import org.neo4j.helpers.collection.Iterables; import org.neo4j.logging.NullLogProvider; @@ -51,16 +51,16 @@ public class Fixture private final Set bootstrapWaiters = new HashSet<>(); private final List timeoutServices = new ArrayList<>(); final Set rafts = new HashSet<>(); - final RaftTestNetwork net; + final TestNetwork net; - Fixture( Set memberIds, RaftTestNetwork net, long electionTimeout, long heartbeatInterval ) + Fixture( Set memberIds, TestNetwork net, long electionTimeout, long heartbeatInterval ) { this.net = net; for ( MemberId member : memberIds ) { - RaftTestNetwork.Inbound inbound = net.new Inbound( member ); - RaftTestNetwork.Outbound outbound = net.new Outbound( member ); + TestNetwork.Inbound inbound = net.new Inbound( member ); + TestNetwork.Outbound outbound = net.new Outbound( member ); members.add( member ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolations.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolations.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolations.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolations.java index b8cc5c40b9f8..984b1a8773a2 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolations.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolations.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.roles.Leader; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolationsTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolationsTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolationsTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolationsTest.java index b491ad4c8576..ad409917159b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterSafetyViolationsTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterSafetyViolationsTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import org.junit.Test; @@ -26,14 +26,14 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; -import static org.neo4j.coreedge.raft.state.explorer.ClusterSafetyViolations.inconsistentCommittedLogEntries; -import static org.neo4j.coreedge.raft.state.explorer.ClusterSafetyViolations.multipleLeadersInSameTerm; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.raft.explorer.ClusterSafetyViolations.inconsistentCommittedLogEntries; +import static org.neo4j.coreedge.raft.explorer.ClusterSafetyViolations.multipleLeadersInSameTerm; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; public class ClusterSafetyViolationsTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterState.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterState.java similarity index 93% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterState.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterState.java index f9c417c9dffa..5dcc955d9d9d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ClusterState.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ClusterState.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import java.io.IOException; import java.util.HashMap; @@ -29,10 +29,10 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; public class ClusterState { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftLog.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftLog.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftLog.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftLog.java index 86778d4635b6..31349bbacdaf 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftLog.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftLog.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import java.io.IOException; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftState.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftState.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftState.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftState.java index 6716c6df2ca6..d7647f1f68c6 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftState.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftState.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import java.io.IOException; import java.util.HashSet; @@ -30,9 +30,9 @@ import org.neo4j.coreedge.raft.log.segmented.InFlightMap; import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; import static java.lang.String.format; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftStateTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftStateTest.java index 64e97d919d34..0267eeddef29 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/ComparableRaftStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/ComparableRaftStateTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer; +package org.neo4j.coreedge.raft.explorer; import org.junit.Test; @@ -25,7 +25,7 @@ import org.neo4j.coreedge.raft.log.segmented.InFlightMap; import static org.junit.Assert.assertEquals; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; public class ComparableRaftStateTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/Action.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/Action.java similarity index 89% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/Action.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/Action.java index a1fdfc66cb0f..e0d365a6f70b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/Action.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/Action.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.io.IOException; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; +import org.neo4j.coreedge.raft.explorer.ClusterState; public interface Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/DropMessage.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/DropMessage.java similarity index 90% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/DropMessage.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/DropMessage.java index 5ff77248462e..7f9b375a1917 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/DropMessage.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/DropMessage.java @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.util.LinkedList; import java.util.Queue; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.identity.MemberId; public class DropMessage implements Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ElectionTimeout.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ElectionTimeout.java similarity index 90% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ElectionTimeout.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ElectionTimeout.java index 4978e029a950..67b4bd4e67b4 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ElectionTimeout.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ElectionTimeout.java @@ -17,15 +17,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.io.IOException; import java.util.LinkedList; import java.util.Queue; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.identity.MemberId; public class ElectionTimeout implements Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/HeartbeatTimeout.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/HeartbeatTimeout.java similarity index 90% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/HeartbeatTimeout.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/HeartbeatTimeout.java index 9168a14bf71a..bc4e8f10070b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/HeartbeatTimeout.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/HeartbeatTimeout.java @@ -17,15 +17,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.io.IOException; import java.util.LinkedList; import java.util.Queue; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.identity.MemberId; public class HeartbeatTimeout implements Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/NewEntry.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/NewEntry.java similarity index 91% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/NewEntry.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/NewEntry.java index 9d7996d995c0..99b25d8dbede 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/NewEntry.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/NewEntry.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.io.IOException; import java.util.LinkedList; @@ -25,8 +25,8 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.ReplicatedString; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.identity.MemberId; public class NewEntry implements Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDelivery.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDelivery.java similarity index 91% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDelivery.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDelivery.java index 99130c8d84ad..b5e54727f069 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDelivery.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDelivery.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.util.LinkedList; import org.neo4j.coreedge.raft.RaftMessages; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.identity.MemberId; public class OutOfOrderDelivery implements Action { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDeliveryTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDeliveryTest.java similarity index 90% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDeliveryTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDeliveryTest.java index bf4f195a4ff0..d943702be92e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/OutOfOrderDeliveryTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/OutOfOrderDeliveryTest.java @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import org.junit.Test; import org.neo4j.coreedge.raft.RaftMessages.Timeout.Election; import org.neo4j.coreedge.raft.RaftMessages.Timeout.Heartbeat; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; +import org.neo4j.coreedge.raft.explorer.ClusterState; import static org.junit.Assert.assertEquals; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; public class OutOfOrderDeliveryTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ProcessMessage.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ProcessMessage.java similarity index 92% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ProcessMessage.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ProcessMessage.java index 2230f251a954..7bceddde123d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/explorer/action/ProcessMessage.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/explorer/action/ProcessMessage.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.explorer.action; +package org.neo4j.coreedge.raft.explorer.action; import java.io.IOException; import java.util.LinkedList; @@ -25,9 +25,9 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.explorer.ClusterState; -import org.neo4j.coreedge.raft.state.explorer.ComparableRaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.explorer.ClusterState; +import org.neo4j.coreedge.raft.explorer.ComparableRaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLog; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/DummyRaftableContentSerializer.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/DummyRaftableContentSerializer.java index 899d802879b6..e72ca4ef5283 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/DummyRaftableContentSerializer.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/DummyRaftableContentSerializer.java @@ -23,9 +23,9 @@ import org.neo4j.coreedge.raft.ReplicatedInteger; import org.neo4j.coreedge.raft.ReplicatedString; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftContentByteBufferMarshalTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftContentByteBufferMarshalTest.java index 78fac519d9b1..aecbf3662652 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftContentByteBufferMarshalTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftContentByteBufferMarshalTest.java @@ -32,12 +32,12 @@ import org.neo4j.coreedge.raft.membership.MemberIdSet; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.id.ReplicatedIdAllocationRequest; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionFactory; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.id.ReplicatedIdAllocationRequest; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionFactory; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.kernel.impl.index.IndexCommand; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.transaction.TransactionRepresentation; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftInstanceLogTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftInstanceLogTest.java index d321eae21b61..cd9bd72c90dc 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftInstanceLogTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftInstanceLogTest.java @@ -29,15 +29,15 @@ import org.neo4j.coreedge.raft.RaftInstanceBuilder; import org.neo4j.coreedge.raft.RaftStateMachine; import org.neo4j.coreedge.raft.ReplicatedInteger; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; import static org.junit.Assert.assertEquals; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesRequest; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(MockitoJUnitRunner.class) public class RaftInstanceLogTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java index 195e7c9bb1b7..b807770c515c 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/RaftLogDurabilityTest.java @@ -33,7 +33,7 @@ import org.neo4j.coreedge.raft.ReplicatedInteger; import org.neo4j.coreedge.raft.ReplicatedString; import org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog; -import org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.RaftLogImplementation; +import org.neo4j.coreedge.core.EnterpriseCoreEditionModule.RaftLogImplementation; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.NullLogProvider; @@ -47,7 +47,7 @@ import static org.neo4j.coreedge.raft.log.RaftLogHelper.hasNoContent; import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.RaftLogImplementation.SEGMENTED; +import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.RaftLogImplementation.SEGMENTED; @RunWith(Parameterized.class) public class RaftLogDurabilityTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/debug/ReplayRaftLog.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/debug/ReplayRaftLog.java index cb0c10dde1b4..2383257f222a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/debug/ReplayRaftLog.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/debug/ReplayRaftLog.java @@ -25,10 +25,10 @@ import org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog; import org.neo4j.coreedge.raft.net.CoreReplicatedContentMarshal; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransactionFactory; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransactionFactory; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; import org.neo4j.helpers.Args; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.configuration.Config; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/EntryCursorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/EntryCursorTest.java index 02811d4e55b7..0788b1d12fb6 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/EntryCursorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/EntryCursorTest.java @@ -23,7 +23,7 @@ import java.io.File; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.NullLogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocolTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocolTest.java index 012c3f48c7e0..65cb67fcb6b6 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocolTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/RecoveryProtocolTest.java @@ -26,8 +26,8 @@ import java.io.IOException; import org.neo4j.coreedge.raft.log.DummyRaftableContentSerializer; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.transaction.log.PhysicalFlushableChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeaderTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeaderTest.java index c9101fa416bb..96eef0100b5d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeaderTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentHeaderTest.java @@ -24,7 +24,7 @@ import org.junit.Test; -import org.neo4j.coreedge.raft.state.EndOfStreamException; +import org.neo4j.coreedge.messaging.EndOfStreamException; import org.neo4j.kernel.impl.transaction.log.InMemoryClosableChannel; public class SegmentHeaderTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedConcurrentStressIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedConcurrentStressIT.java index 289dab5e509d..180ab5477832 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedConcurrentStressIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedConcurrentStressIT.java @@ -27,7 +27,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.time.FakeClock; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; public class SegmentedConcurrentStressIT extends ConcurrentStressIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogCursorIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogCursorIT.java index a10acfaea0f0..b42b26d0175f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogCursorIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogCursorIT.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; public class SegmentedRaftLogCursorIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogRotationTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogRotationTest.java index 87c03ba30756..4033b70f1e54 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogRotationTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogRotationTest.java @@ -35,7 +35,7 @@ import org.neo4j.time.FakeClock; import static org.junit.Assert.assertEquals; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; import static org.neo4j.test.rule.Resources.InitialLifecycle.STARTED; import static org.neo4j.test.rule.Resources.TestPath.EXISTING_DIRECTORY; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogVerificationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogVerificationIT.java index cbdacf7a5736..f2888450c05b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogVerificationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentedRaftLogVerificationIT.java @@ -29,7 +29,7 @@ import org.neo4j.logging.NullLogProvider; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; public class SegmentedRaftLogVerificationIT extends RaftLogVerificationIT { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentsTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentsTest.java index ddc518b04df9..899b6ccf7a1a 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentsTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/log/segmented/SegmentsTest.java @@ -27,8 +27,8 @@ import java.util.List; import org.neo4j.coreedge.raft.log.EntryRecord; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; import org.neo4j.cursor.IOCursor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.logging.LogProvider; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTest.java index cea6f4ab4b1e..319921393b04 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTest.java @@ -25,7 +25,7 @@ import org.neo4j.coreedge.raft.log.RaftLogCursor; import org.neo4j.coreedge.raft.log.ReadableRaftLog; -import org.neo4j.coreedge.raft.state.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; import org.neo4j.time.FakeClock; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTrackerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTrackerTest.java index 30ce7abad92f..03a10cf454b0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTrackerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/CatchupGoalTrackerTest.java @@ -26,7 +26,7 @@ import org.neo4j.coreedge.raft.log.RaftLogCursor; import org.neo4j.coreedge.raft.log.ReadableRaftLog; -import org.neo4j.coreedge.raft.state.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; import org.neo4j.time.FakeClock; import static org.junit.Assert.assertFalse; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MemberIdMarshalTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MemberIdMarshalTest.java index ade17d275113..6d108a782d12 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MemberIdMarshalTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MemberIdMarshalTest.java @@ -27,8 +27,8 @@ import org.neo4j.coreedge.raft.net.NetworkFlushableChannelNetty4; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.raft.state.EndOfStreamException; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.messaging.EndOfStreamException; +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MembershipWaiterTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MembershipWaiterTest.java index 8f8a223e8665..b861927cadf1 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MembershipWaiterTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/MembershipWaiterTest.java @@ -24,12 +24,11 @@ import org.junit.Test; -import org.neo4j.coreedge.raft.BatchingMessageHandler; import org.neo4j.coreedge.raft.MismatchedStoreIdService; import org.neo4j.coreedge.raft.log.InMemoryRaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.raft.state.RaftStateBuilder; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.core.state.RaftStateBuilder; import org.neo4j.logging.NullLogProvider; import org.neo4j.test.OnDemandJobScheduler; @@ -40,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class MembershipWaiterTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftGroupMembershipTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftGroupMembershipTest.java index abadb27146b0..c68076764425 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftGroupMembershipTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftGroupMembershipTest.java @@ -27,12 +27,12 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.neo4j.coreedge.network.Message; +import org.neo4j.coreedge.messaging.Message; import org.neo4j.coreedge.raft.DirectNetworking; import org.neo4j.coreedge.raft.RaftTestFixture; import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -42,7 +42,7 @@ import static org.neo4j.coreedge.raft.RaftInstance.Timeouts.HEARTBEAT; import static org.neo4j.coreedge.raft.roles.Role.FOLLOWER; import static org.neo4j.coreedge.raft.roles.Role.LEADER; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(MockitoJUnitRunner.class) public class RaftGroupMembershipTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java index 139bf1b5b312..6fc2cb51fec3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java @@ -28,9 +28,8 @@ import org.neo4j.coreedge.raft.outcome.AppendLogEntry; import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.TruncateLogCommand; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; -import org.neo4j.coreedge.raft.state.membership.RaftMembershipState; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; import org.neo4j.logging.NullLogProvider; import org.neo4j.time.FakeClock; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateTest.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateTest.java index fcd6b4ce9ff8..a3a4aa54773f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/membership/RaftMembershipStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipStateTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.membership; +package org.neo4j.coreedge.raft.membership; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -27,14 +27,14 @@ import org.neo4j.coreedge.raft.net.NetworkFlushableChannelNetty4; import org.neo4j.coreedge.raft.net.NetworkReadableClosableChannelNetty4; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; public class RaftMembershipStateTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftTestGroup.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftTestGroup.java index 4437dfdad4f3..84ae69089a7d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftTestGroup.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftTestGroup.java @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Set; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static java.lang.String.format; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class RaftTestGroup implements RaftGroup { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/RaftMessageProcessingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/RaftMessageProcessingTest.java index 20c0c439317b..a8135d3c578f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/RaftMessageProcessingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/RaftMessageProcessingTest.java @@ -33,10 +33,10 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.net.codecs.RaftMessageDecoder; import org.neo4j.coreedge.raft.net.codecs.RaftMessageEncoder; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.storageengine.api.ReadPastEndException; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitorTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitorTest.java index e544c1ceb66b..39acaddcedef 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitorTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/UnknownAddressMonitorTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class UnknownAddressMonitorTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncodingDecodingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncodingDecodingTest.java index 820b8747cbe6..202d0eae82d6 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncodingDecodingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/net/codecs/RaftMessageEncodingDecodingTest.java @@ -29,18 +29,18 @@ import java.util.LinkedList; import java.util.UUID; -import org.neo4j.coreedge.raft.AppendEntriesRequestBuilder; -import org.neo4j.coreedge.raft.AppendEntriesResponseBuilder; +import org.neo4j.coreedge.raft.roles.AppendEntriesRequestBuilder; +import org.neo4j.coreedge.raft.roles.AppendEntriesResponseBuilder; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.ReplicatedInteger; -import org.neo4j.coreedge.raft.VoteRequestBuilder; -import org.neo4j.coreedge.raft.VoteResponseBuilder; +import org.neo4j.coreedge.raft.vote.VoteRequestBuilder; +import org.neo4j.coreedge.raft.vote.VoteResponseBuilder; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -import org.neo4j.coreedge.raft.state.ChannelMarshal; -import org.neo4j.coreedge.raft.state.SafeChannelMarshal; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +import org.neo4j.coreedge.messaging.ChannelMarshal; +import org.neo4j.coreedge.core.state.SafeChannelMarshal; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesMessageFlowTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesMessageFlowTest.java similarity index 95% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesMessageFlowTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesMessageFlowTest.java index 87dce8a7d493..86cb8ce3c04f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesMessageFlowTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesMessageFlowTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.roles; import org.junit.Before; import org.junit.Test; @@ -26,10 +26,14 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.neo4j.coreedge.raft.RaftInstance; +import org.neo4j.coreedge.raft.RaftInstanceBuilder; +import org.neo4j.coreedge.raft.RaftMessages; +import org.neo4j.coreedge.raft.ReplicatedInteger; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.same; @@ -38,7 +42,7 @@ import static org.mockito.Mockito.verify; import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesRequest; import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesResponse; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(MockitoJUnitRunner.class) public class AppendEntriesMessageFlowTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesRequestBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestBuilder.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesRequestBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestBuilder.java index 9610cbe7c198..41dff427b486 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesRequestBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestBuilder.java @@ -17,13 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.roles; import java.util.LinkedList; import java.util.List; +import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; public class AppendEntriesRequestBuilder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestTest.java index a2a8cfc65576..0fee0b34a833 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesRequestTest.java @@ -35,8 +35,8 @@ import org.neo4j.coreedge.raft.outcome.BatchAppendLogEntries; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.TruncateLogCommand; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; @@ -49,8 +49,8 @@ import static org.neo4j.coreedge.raft.MessageUtils.messageFor; import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesRequest; import static org.neo4j.coreedge.raft.roles.AppendEntriesRequestTest.ContentGenerator.content; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(Parameterized.class) public class AppendEntriesRequestTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesResponseBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesResponseBuilder.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesResponseBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesResponseBuilder.java index af494595a562..e7d9efcd5789 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/AppendEntriesResponseBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendEntriesResponseBuilder.java @@ -17,9 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.roles; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.raft.RaftMessages; +import org.neo4j.coreedge.identity.MemberId; public class AppendEntriesResponseBuilder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendingTest.java index 8d4b3df355bf..f40459bb0b68 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/AppendingTest.java @@ -30,8 +30,8 @@ import org.neo4j.coreedge.raft.outcome.RaftLogCommand; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.TruncateLogCommand; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.NullLog; import static org.junit.Assert.fail; @@ -42,7 +42,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; public class AppendingTest { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/CandidateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/CandidateTest.java index 84659b6e19fd..cedace315fba 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/CandidateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/CandidateTest.java @@ -31,8 +31,8 @@ import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.outcome.AppendLogEntry; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; @@ -44,8 +44,8 @@ import static org.neo4j.coreedge.raft.roles.Role.CANDIDATE; import static org.neo4j.coreedge.raft.roles.Role.FOLLOWER; import static org.neo4j.coreedge.raft.roles.Role.LEADER; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(MockitoJUnitRunner.class) public class CandidateTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/ElectionTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/ElectionTest.java index 3d4fd57e681e..059da5c7aeb5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/ElectionTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/ElectionTest.java @@ -24,15 +24,15 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.neo4j.coreedge.raft.ControlledRenewableTimeoutService; +import org.neo4j.coreedge.raft.schedule.ControlledRenewableTimeoutService; import org.neo4j.coreedge.raft.RaftInstance; import org.neo4j.coreedge.raft.RaftInstanceBuilder; import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.membership.RaftTestGroup; import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.net.Outbound; -import org.neo4j.coreedge.server.MemberId; -import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.identity.RaftTestMemberSetBuilder; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; @@ -44,7 +44,7 @@ import static org.neo4j.coreedge.raft.TestMessageBuilders.voteResponse; import static org.neo4j.coreedge.raft.roles.Role.CANDIDATE; import static org.neo4j.coreedge.raft.roles.Role.LEADER; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; @RunWith(MockitoJUnitRunner.class) diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/FollowerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/FollowerTest.java index 596837408d6c..946a85283b40 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/FollowerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/FollowerTest.java @@ -33,8 +33,8 @@ import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.net.Inbound; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; @@ -47,8 +47,8 @@ import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesRequest; import static org.neo4j.coreedge.raft.roles.Role.CANDIDATE; import static org.neo4j.coreedge.raft.roles.Role.FOLLOWER; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asSet; @RunWith(MockitoJUnitRunner.class) diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/HeartbeatTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/HeartbeatTest.java index 0e19f86ed157..517ead2ed5f3 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/HeartbeatTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/HeartbeatTest.java @@ -31,8 +31,8 @@ import org.neo4j.coreedge.raft.log.InMemoryRaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; @@ -40,8 +40,8 @@ import static org.junit.Assert.assertThat; import static org.neo4j.coreedge.raft.TestMessageBuilders.heartbeat; import static org.neo4j.coreedge.raft.roles.AppendEntriesRequestTest.ContentGenerator.content; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(Parameterized.class) public class HeartbeatTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/LeaderTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/LeaderTest.java index 3acbaf69f742..f08fe71a09d2 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/LeaderTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/LeaderTest.java @@ -39,11 +39,11 @@ import org.neo4j.coreedge.raft.outcome.BatchAppendLogEntries; import org.neo4j.coreedge.raft.outcome.Outcome; import org.neo4j.coreedge.raft.outcome.ShipCommand; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.raft.state.ReadableRaftState; -import org.neo4j.coreedge.raft.state.follower.FollowerState; -import org.neo4j.coreedge.raft.state.follower.FollowerStates; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.core.state.ReadableRaftState; +import org.neo4j.coreedge.raft.roles.follower.FollowerState; +import org.neo4j.coreedge.raft.roles.follower.FollowerStates; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; @@ -58,8 +58,8 @@ import static org.neo4j.coreedge.raft.ReplicatedInteger.valueOf; import static org.neo4j.coreedge.raft.TestMessageBuilders.appendEntriesResponse; import static org.neo4j.coreedge.raft.roles.Role.FOLLOWER; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.Iterables.single; import static org.neo4j.helpers.collection.Iterators.asSet; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/NonFollowerVoteRequestTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/NonFollowerVoteRequestTest.java index 05d91e0dc0f8..895a954e7af5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/NonFollowerVoteRequestTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/NonFollowerVoteRequestTest.java @@ -28,8 +28,8 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; @@ -38,8 +38,8 @@ import static org.junit.Assert.assertFalse; import static org.neo4j.coreedge.raft.MessageUtils.messageFor; import static org.neo4j.coreedge.raft.TestMessageBuilders.voteRequest; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; @RunWith(Parameterized.class) public class NonFollowerVoteRequestTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/VoteRequestTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/VoteRequestTest.java index c033ce166345..6f59b68079d5 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/VoteRequestTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/roles/VoteRequestTest.java @@ -28,8 +28,8 @@ import org.neo4j.coreedge.raft.RaftMessages; import org.neo4j.coreedge.raft.outcome.Outcome; -import org.neo4j.coreedge.raft.state.RaftState; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.core.state.RaftState; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.logging.Log; import org.neo4j.logging.NullLogProvider; @@ -39,8 +39,8 @@ import static org.junit.Assert.assertTrue; import static org.neo4j.coreedge.raft.MessageUtils.messageFor; import static org.neo4j.coreedge.raft.TestMessageBuilders.voteRequest; -import static org.neo4j.coreedge.raft.state.RaftStateBuilder.raftState; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.core.state.RaftStateBuilder.raftState; +import static org.neo4j.coreedge.identity.RaftTestMember.member; /** * Most behaviour for handling vote requests is identical for all roles. diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ControlledRenewableTimeoutService.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/ControlledRenewableTimeoutService.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ControlledRenewableTimeoutService.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/ControlledRenewableTimeoutService.java index a045bc5fcb0e..21edc1ccc697 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/ControlledRenewableTimeoutService.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/ControlledRenewableTimeoutService.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.schedule; import java.util.HashMap; import java.util.Map; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutServiceTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutServiceTest.java similarity index 99% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutServiceTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutServiceTest.java index 0d394ab655c1..629ac056034f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/DelayedRenewableTimeoutServiceTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/schedule/DelayedRenewableTimeoutServiceTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.schedule; import java.time.Clock; import java.util.concurrent.CountDownLatch; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipperTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/shipping/RaftLogShipperTest.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipperTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/shipping/RaftLogShipperTest.java index 5a3e00d1151b..82e1bbfcec3d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/shipping/RaftLogShipperTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/shipping/RaftLogShipperTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.replication.shipping; +package org.neo4j.coreedge.raft.shipping; import org.junit.After; import org.junit.Before; @@ -38,7 +38,7 @@ import org.neo4j.coreedge.raft.log.RaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.log.segmented.InFlightMap; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import org.neo4j.helpers.collection.Iterables; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.coreedge.server.RaftTestMember.member; +import static org.neo4j.coreedge.identity.RaftTestMember.member; import static org.neo4j.test.matchers.Matchers.hasMessage; public class RaftLogShipperTest diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CommandApplicationProcessTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CommandApplicationProcessTest.java index 3f7a236f9d5e..dec5f08fdb6e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CommandApplicationProcessTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/CommandApplicationProcessTest.java @@ -27,19 +27,24 @@ import java.util.function.Consumer; import org.neo4j.coreedge.SessionTracker; +import org.neo4j.coreedge.core.replication.DistributedOperation; +import org.neo4j.coreedge.core.replication.ProgressTrackerImpl; +import org.neo4j.coreedge.core.replication.ReplicatedContent; +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.CommandDispatcher; +import org.neo4j.coreedge.core.state.CoreStateApplier; +import org.neo4j.coreedge.core.state.CoreStateMachines; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; +import org.neo4j.coreedge.core.state.Result; +import org.neo4j.coreedge.core.state.tx.CoreReplicatedContent; +import org.neo4j.coreedge.core.state.tx.ReplicatedTransaction; import org.neo4j.coreedge.raft.NewLeaderBarrier; import org.neo4j.coreedge.raft.log.InMemoryRaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; import org.neo4j.coreedge.raft.log.monitoring.RaftLogCommitIndexMonitor; import org.neo4j.coreedge.raft.log.segmented.InFlightMap; -import org.neo4j.coreedge.raft.replication.DistributedOperation; -import org.neo4j.coreedge.raft.replication.ProgressTrackerImpl; -import org.neo4j.coreedge.raft.replication.ReplicatedContent; -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.replication.tx.CoreReplicatedContent; -import org.neo4j.coreedge.raft.replication.tx.ReplicatedTransaction; import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.monitoring.Monitors; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorageTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorageTest.java similarity index 95% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorageTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorageTest.java index 1f34dd9ba439..89e02d0a6782 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/term/MonitoredTermStateStorageTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/MonitoredTermStateStorageTest.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state.term; +package org.neo4j.coreedge.raft.term; import org.junit.Test; import org.neo4j.coreedge.raft.log.monitoring.RaftTermMonitor; -import org.neo4j.coreedge.raft.state.InMemoryStateStorage; +import org.neo4j.coreedge.core.state.InMemoryStateStorage; import org.neo4j.kernel.monitoring.Monitors; import static org.junit.Assert.assertEquals; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/TermStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/TermStateTest.java similarity index 94% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/TermStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/TermStateTest.java index d63cb11a4570..b65c5c4471a0 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/TermStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/term/TermStateTest.java @@ -17,12 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; +package org.neo4j.coreedge.raft.term; import org.junit.Test; -import org.neo4j.coreedge.raft.state.term.TermState; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteRequestBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteRequestBuilder.java similarity index 93% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteRequestBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteRequestBuilder.java index 9fda4aee56af..9242b6b22c82 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteRequestBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteRequestBuilder.java @@ -17,9 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.vote; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.raft.RaftMessages; public class VoteRequestBuilder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteResponseBuilder.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteResponseBuilder.java similarity index 92% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteResponseBuilder.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteResponseBuilder.java index 572769dd47cb..f291d7c8b30f 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VoteResponseBuilder.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteResponseBuilder.java @@ -17,9 +17,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.vote; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; +import org.neo4j.coreedge.raft.RaftMessages; public class VoteResponseBuilder { diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/VoteStateTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteStateTest.java similarity index 80% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/VoteStateTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteStateTest.java index cd2abefebb7d..4991beca0d1b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/state/VoteStateTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VoteStateTest.java @@ -17,20 +17,16 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft.state; - -import org.junit.Test; +package org.neo4j.coreedge.raft.vote; import java.util.UUID; -import org.neo4j.coreedge.raft.state.vote.VoteState; -import org.neo4j.coreedge.server.MemberId; +import org.junit.Assert; +import org.junit.Test; + +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; public class VoteStateTest { @@ -55,7 +51,7 @@ public void shouldStartWithNoVote() throws Exception VoteState voteState = new VoteState(); // then - assertNull( voteState.votedFor() ); + Assert.assertNull( voteState.votedFor() ); } @Test @@ -87,7 +83,7 @@ public void shouldClearVote() throws Exception voteState.update( null, 1 ); // then - assertNull( voteState.votedFor() ); + Assert.assertNull( voteState.votedFor() ); } @Test @@ -104,7 +100,7 @@ public void shouldNotUpdateVoteForSameTerm() throws Exception { // when voteState.update( member2, 0 ); - fail( "Should have thrown IllegalArgumentException" ); + Assert.fail( "Should have thrown IllegalArgumentException" ); } catch ( IllegalArgumentException expected ) { @@ -125,7 +121,7 @@ public void shouldNotClearVoteForSameTerm() throws Exception { // when voteState.update( null, 0 ); - fail( "Should have thrown IllegalArgumentException" ); + Assert.fail( "Should have thrown IllegalArgumentException" ); } catch ( IllegalArgumentException expected ) { @@ -142,11 +138,11 @@ public void shouldReportNoUpdateWhenVoteStateUnchanged() throws Exception MemberId member2 = new MemberId( UUID.randomUUID() ); // when - assertTrue( voteState.update( null, 0 ) ); - assertFalse( voteState.update( null, 0 ) ); - assertTrue( voteState.update( member1, 0 ) ); - assertFalse( voteState.update( member1, 0 ) ); - assertTrue( voteState.update( member2, 1 ) ); - assertFalse( voteState.update( member2, 1 ) ); + Assert.assertTrue( voteState.update( null, 0 ) ); + Assert.assertFalse( voteState.update( null, 0 ) ); + Assert.assertTrue( voteState.update( member1, 0 ) ); + Assert.assertFalse( voteState.update( member1, 0 ) ); + Assert.assertTrue( voteState.update( member2, 1 ) ); + Assert.assertFalse( voteState.update( member2, 1 ) ); } } diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VotingTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VotingTest.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VotingTest.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VotingTest.java index ae6d7039b25a..ad5e37f2d9ca 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/VotingTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/vote/VotingTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge.raft; +package org.neo4j.coreedge.raft.vote; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,7 +26,7 @@ import java.util.UUID; import org.neo4j.coreedge.raft.roles.Voting; -import org.neo4j.coreedge.server.MemberId; +import org.neo4j.coreedge.identity.MemberId; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterDiscoveryIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterDiscoveryIT.java index 22d53f2f1109..78f202e9eb38 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterDiscoveryIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterDiscoveryIT.java @@ -25,8 +25,8 @@ import java.util.List; import org.neo4j.coreedge.discovery.Cluster; -import org.neo4j.coreedge.server.core.AcquireEndpointsProcedure; -import org.neo4j.coreedge.server.core.DiscoverMembersProcedure; +import org.neo4j.coreedge.discovery.procedures.AcquireEndpointsProcedure; +import org.neo4j.coreedge.discovery.procedures.DiscoverMembersProcedure; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.KernelTransaction.Type; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java index 5c5f98ea2fbc..ec00f98ebdf1 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterFormationIT.java @@ -28,7 +28,7 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.graphdb.Transaction; import org.neo4j.test.coreedge.ClusterRule; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/ClusterIdentityIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterIdentityIT.java similarity index 98% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/ClusterIdentityIT.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterIdentityIT.java index d05a3f1b4e13..99ed7f314c31 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/ClusterIdentityIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterIdentityIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.coreedge; +package org.neo4j.coreedge.scenarios; import org.junit.Before; import org.junit.Rule; @@ -32,7 +32,7 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; import org.neo4j.graphdb.Node; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterOverviewIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterOverviewIT.java index dcd7bf5e11a1..80d94475a68c 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterOverviewIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ClusterOverviewIT.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.neo4j.coreedge.discovery.Cluster; -import org.neo4j.coreedge.server.core.ClusterOverviewProcedure; +import org.neo4j.coreedge.discovery.procedures.ClusterOverviewProcedure; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.KernelTransaction.Type; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java index a82b7fc91a1e..31384ff6543d 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/ConvertNonCoreEdgeStoreIT.java @@ -33,7 +33,7 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.function.ThrowingSupplier; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_advertised_address; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_advertised_address; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.restore.ArgsBuilder.args; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CorePruningIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CorePruningIT.java index 6d1315bbdd9b..6d18a3f3f4e1 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CorePruningIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CorePruningIT.java @@ -27,14 +27,14 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.EnterpriseCoreEditionModule; import org.neo4j.test.coreedge.ClusterRule; import static org.hamcrest.Matchers.equalTo; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; import static org.neo4j.coreedge.scenarios.CoreToCoreCopySnapshotIT.createData; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; import static org.neo4j.test.assertion.Assert.assertEventually; public class CorePruningIT diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreReplicationIT.java index 599c8b57d6bc..2f3443f811da 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreReplicationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreReplicationIT.java @@ -25,7 +25,7 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.test.coreedge.ClusterRule; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java index b3b939c33bf0..4b3515c8cf0e 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/CoreToCoreCopySnapshotIT.java @@ -28,8 +28,8 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; @@ -41,8 +41,8 @@ import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_frequency; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_log_pruning_strategy; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_frequency; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_log_pruning_strategy; import static org.neo4j.helpers.collection.MapUtil.stringMap; public class CoreToCoreCopySnapshotIT diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java index 1cd2d4e83e08..b5f5f4cd5a33 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/scenarios/EdgeServerReplicationIT.java @@ -37,9 +37,9 @@ import org.neo4j.coreedge.discovery.EdgeClusterMember; import org.neo4j.coreedge.raft.log.segmented.FileNames; import org.neo4j.coreedge.raft.roles.Role; -import org.neo4j.coreedge.server.CoreEdgeClusterSettings; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; -import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; +import org.neo4j.coreedge.core.CoreEdgeClusterSettings; +import org.neo4j.coreedge.core.CoreGraphDatabase; +import org.neo4j.coreedge.edge.EdgeGraphDatabase; import org.neo4j.function.ThrowingSupplier; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; @@ -77,7 +77,7 @@ import static org.mockito.Mockito.mock; import static org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog.SEGMENTED_LOG_DIRECTORY_NAME; -import static org.neo4j.coreedge.server.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; +import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; import static org.neo4j.function.Predicates.awaitEx; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/StringMessage.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/StringMessage.java deleted file mode 100644 index 1ad2d1c35d5f..000000000000 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/StringMessage.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2002-2016 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.neo4j.coreedge.server; - -import org.neo4j.coreedge.network.Message; - -public class StringMessage implements Message -{ - public StringMessage( String content ) - { - } -} diff --git a/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java b/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java index e2424e0bd93c..9e0dbdebf71b 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/restore/RestoreClusterCliTest.java @@ -32,7 +32,7 @@ import org.neo4j.coreedge.convert.ClusterSeed; import org.neo4j.coreedge.convert.StoreMetadata; -import org.neo4j.coreedge.server.StoreId; +import org.neo4j.coreedge.identity.StoreId; import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; @@ -48,7 +48,6 @@ import org.neo4j.kernel.impl.pagecache.StandalonePageCacheFactory; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.format.standard.StandardV3_0; -import org.neo4j.logging.NullLog; import org.neo4j.server.configuration.ConfigLoader; import org.neo4j.test.rule.TargetDirectory; diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java index 1815f32f08ba..492cfa04e16e 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/CoreEdgeMetricsIT.java @@ -31,7 +31,7 @@ import org.neo4j.coreedge.discovery.Cluster; import org.neo4j.coreedge.discovery.CoreClusterMember; import org.neo4j.coreedge.discovery.EdgeClusterMember; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.function.ThrowingSupplier; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; -import static org.neo4j.coreedge.server.CoreEdgeClusterSettings.raft_advertised_address; +import static org.neo4j.coreedge.core.CoreEdgeClusterSettings.raft_advertised_address; import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.Iterables.count; import static org.neo4j.metrics.MetricsSettings.csvPath; diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java index 116c8e458e3d..f407326a7e29 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.regex.Pattern; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; -import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; +import org.neo4j.coreedge.edge.EdgeGraphDatabase; import org.neo4j.dbms.DatabaseManagementSystemSettings; import org.neo4j.graphdb.EnterpriseGraphDatabase; import org.neo4j.helpers.collection.Iterables; diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java index bbf8233796aa..f11aa86a4dbb 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java @@ -24,7 +24,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.neo4j.coreedge.server.core.CoreGraphDatabase; +import org.neo4j.coreedge.core.CoreGraphDatabase; import org.neo4j.coreedge.raft.roles.Role; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.server.rest.management.AdvertisableService; diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/EdgeDatabaseAvailabilityService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/EdgeDatabaseAvailabilityService.java index f725662725fc..2dcf8f582ca6 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/EdgeDatabaseAvailabilityService.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/EdgeDatabaseAvailabilityService.java @@ -24,7 +24,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.neo4j.coreedge.server.edge.EdgeGraphDatabase; +import org.neo4j.coreedge.edge.EdgeGraphDatabase; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.server.rest.management.AdvertisableService; import org.neo4j.server.rest.repr.OutputFormat;