2000f70fb154256bfac31ded4dd0581e7daa611f
Files Diff
- Added: 13
- Removed: 4
- Renamed: 0
- Modified: 34
Refactorings reported:
| Refactoring Name | Occurences | ||
|---|---|---|---|
| Move And Rename Method | 2 | ||
| Move And Rename Method private readHighIdFromHeader(channel StoreChannel, fileName File) : ByteBuffer from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private readAndValidate(channel StoreChannel, fileName File) : long from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move And Rename Method private initGenerator() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to public init() : void from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Change Parameter Type | 1 | ||
| Change Parameter Type leaderLocator : LeaderLocator to raftMachine : RaftMachine in method public CoreStateMachinesModule(myself MemberId, platformModule PlatformModule, clusterStateDirectory File, config Config, replicator RaftReplicator, raftMachine RaftMachine, dependencies Dependencies, localDatabase LocalDatabase) in class org.neo4j.causalclustering.core.state.machines.CoreStateMachinesModule | From | To | |
| Move Method | 9 | ||
| Move Method public freeId(id long) : void from class org.neo4j.causalclustering.core.state.machines.id.SwitchableRaftIdGenerator to public freeId(id long) : void from class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGenerator | From | To | |
| Move Method public shouldForceStickyMark() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImplTest to public shouldForceStickyMark() : void from class org.neo4j.kernel.impl.store.id.IdContainerTest | From | To | |
| Move Method private closeChannel() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private closeChannel() : void from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Method public delete() : void from class org.neo4j.causalclustering.core.state.machines.id.SwitchableRaftIdGenerator to public delete() : void from class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGenerator | From | To | |
| Move Method public shouldTruncateTheFileIfOverwriting() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImplTest to public shouldTruncateTheFileIfOverwriting() : void from class org.neo4j.kernel.impl.store.id.IdContainerTest | From | To | |
| Move Method private isClosed() : boolean from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to public isClosed() : boolean from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Method public markAsSticky(fileChannel StoreChannel, buffer ByteBuffer) : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private markAsSticky() : void from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Method public shouldDeleteIfClosed() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImplTest to public shouldDeleteIfClosed() : void from class org.neo4j.kernel.impl.store.id.IdContainerTest | From | To | |
| Move Method public shouldDeleteIfOpen() : void from class org.neo4j.kernel.impl.store.id.IdGeneratorImplTest to public shouldDeleteIfOpen() : void from class org.neo4j.kernel.impl.store.id.IdContainerTest | From | To | |
| Move Attribute | 8 | ||
| Move Attribute private STICKY_GENERATOR : byte from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private STICKY_GENERATOR : byte from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private aggressiveReuse : boolean from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private aggressiveReuse : boolean from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private grabSize : int from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private grabSize : int from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private file : File from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private file : File from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private fileChannel : StoreChannel from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private fileChannel : StoreChannel from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private fs : FileSystemAbstraction from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private fs : FileSystemAbstraction from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute private CLEAN_GENERATOR : byte from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to private CLEAN_GENERATOR : byte from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Move Attribute public HEADER_SIZE : int from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl to package HEADER_SIZE : int from class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Extract Class | 2 | ||
| Extract Class org.neo4j.kernel.impl.store.id.IdContainerTest from class org.neo4j.kernel.impl.store.id.IdGeneratorImplTest | From | To | |
| Extract Class org.neo4j.kernel.impl.store.id.IdContainer from class org.neo4j.kernel.impl.store.id.IdGeneratorImpl | From | To | |
| Rename Class | 3 | ||
| Rename Class org.neo4j.kernel.impl.factory.CommunityEditionModuleTest renamed to org.neo4j.kernel.impl.factory.CommunityEditionModuleIntegrationTest | From | To | |
| Rename Class org.neo4j.causalclustering.core.EnterpriseCoreEditionModuleTest renamed to org.neo4j.causalclustering.core.EnterpriseCoreEditionModuleIntegrationTest | From | To | |
| Rename Class org.neo4j.kernel.ha.factory.HighlyAvailableEditionModuleTest renamed to org.neo4j.kernel.ha.factory.HighlyAvailableEditionModuleIntegrationTest | From | To | |
| Change Variable Type | 5 | ||
| Change Variable Type previous : SwitchableRaftIdGenerator to other : ReplicatedIdGenerator in method private openGenerator(file File, grabSize int, idType IdType, highId long, aggressiveReuse boolean) : IdGenerator in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Change Variable Type switchableIdGenerator : SwitchableRaftIdGenerator to replicatedIdGenerator : ReplicatedIdGenerator in method private openGenerator(file File, grabSize int, idType IdType, highId long, aggressiveReuse boolean) : IdGenerator in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Change Variable Type idController : IdController to idGeneratorFactory : IdGeneratorFactory in method private getHighestUsedIdForRelationships() : long in class org.neo4j.graphdb.store.id.RelationshipIdReuseStressIT | From | To | |
| Change Variable Type txSnapshotSupplier : Supplier<KernelTransactionsSnapshot> to bufferingIdGeneratorFactory : BufferingIdGeneratorFactory in method private get(fs FileSystemAbstraction, pageCache PageCache, schemaIndexProvider SchemaIndexProvider, databaseHealth DatabaseHealth, storeDirectory File, transactionApplierTransformer Function<BatchTransactionApplierFacade,BatchTransactionApplierFacade>, monitors Monitors) : RecordStorageEngine in class org.neo4j.test.rule.RecordStorageEngineRule | From | To | |
| Change Variable Type fired : AtomicBoolean to fired : MutableBoolean in method public shouldCloseStoreFileOnFailureToOpen() : void in class org.neo4j.kernel.impl.store.NodeStoreTest | From | To | |
| Extract Method | 14 | ||
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int, aggresiveReuse boolean) : FreeIdKeeper extracted from public shouldReturnIdsRestoredAndIgnoreNewlyReleasedIfAggressiveReuseIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldStoreAndRestoreIds() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int) : FreeIdKeeper extracted from public shouldReturnIdsRestoredAndIgnoreNewlyReleasedIfAggressiveReuseIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldReturnIdsRestoredAndIgnoreNewlyReleasedIfAggressiveReuseIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public persistedIdsShouldStillBeCounted() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int, aggresiveReuse boolean) : FreeIdKeeper extracted from public shouldReturnNoResultIfIdsAreRestoredAndExhaustedAndThereAreFreeIdsFromThisRunWithAggressiveFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int) : FreeIdKeeper extracted from public shouldNotReturnIdsPersistedDuringThisRunIfAggressiveIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldReturnNoResultIfIdsAreRestoredAndExhaustedAndThereAreFreeIdsFromThisRunWithAggressiveFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldReadBackPersistedIdsWhenAggressiveReuseIsSet() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldFirstReturnNonPersistedIdsAndThenPersistedOnesWhenAggressiveReuse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int) : FreeIdKeeper extracted from public shouldReturnNoResultIfIdsAreRestoredAndExhaustedAndThereAreFreeIdsFromThisRunWithAggressiveFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldNotReturnNewlyReleasedIdsIfAggressiveIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getFreeIdKeeper(channel StoreChannel, threshold int) : FreeIdKeeper extracted from public shouldNotReturnNewlyReleasedIdsIfAggressiveIsFalse() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Extract Method private getStoreChannel() : StoreChannel extracted from public shouldReadBackManyPersistedIdBatchesWhenAggressiveReuseIsSet() : void in class org.neo4j.kernel.impl.store.id.FreeIdKeeperTest | From | To | |
| Split Attribute | 1 | ||
| Split Attribute keeper : FreeIdKeeper to [idContainer : IdContainer, highId : long] in class org.neo4j.kernel.impl.store.id.IdGeneratorImpl | From | To | |
| Rename Variable | 4 | ||
| Rename Variable txSnapshotSupplier : Supplier<KernelTransactionsSnapshot> to bufferingIdGeneratorFactory : BufferingIdGeneratorFactory in method private get(fs FileSystemAbstraction, pageCache PageCache, schemaIndexProvider SchemaIndexProvider, databaseHealth DatabaseHealth, storeDirectory File, transactionApplierTransformer Function<BatchTransactionApplierFacade,BatchTransactionApplierFacade>, monitors Monitors) : RecordStorageEngine in class org.neo4j.test.rule.RecordStorageEngineRule | From | To | |
| Rename Variable idController : IdController to idGeneratorFactory : IdGeneratorFactory in method private getHighestUsedIdForRelationships() : long in class org.neo4j.graphdb.store.id.RelationshipIdReuseStressIT | From | To | |
| Rename Variable switchableIdGenerator : SwitchableRaftIdGenerator to replicatedIdGenerator : ReplicatedIdGenerator in method private openGenerator(file File, grabSize int, idType IdType, highId long, aggressiveReuse boolean) : IdGenerator in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Rename Variable previous : SwitchableRaftIdGenerator to other : ReplicatedIdGenerator in method private openGenerator(file File, grabSize int, idType IdType, highId long, aggressiveReuse boolean) : IdGenerator in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Inline Method | 2 | ||
| Inline Method private restoreIdsOnStartup() : void inlined to public FreeIdKeeper(channel StoreChannel, threshold int, aggressiveReuse boolean, initialPosition int) in class org.neo4j.kernel.impl.store.id.FreeIdKeeper | From | To | |
| Inline Method private initialize(boundaries Supplier<KernelTransactionsSnapshot>, eligibleForReuse IdReuseEligibility) : void inlined to public BufferingIdGeneratorFactory(delegate IdGeneratorFactory, eligibleForReuse IdReuseEligibility, idTypeConfigurationProvider IdTypeConfigurationProvider) in class org.neo4j.kernel.impl.store.id.BufferingIdGeneratorFactory | From | To | |
| Change Return Type | 2 | ||
| Change Return Type ByteBuffer to long in method private readAndValidate(channel StoreChannel, fileName File) : long in class org.neo4j.kernel.impl.store.id.IdContainer | From | To | |
| Change Return Type ReplicatedIdGeneratorFactory to IdGeneratorFactory in method private createIdGeneratorFactory(fileSystem FileSystemAbstraction, idRangeAcquirer ReplicatedIdRangeAcquirer, logProvider LogProvider, idTypeConfigurationProvider IdTypeConfigurationProvider) : IdGeneratorFactory in class org.neo4j.causalclustering.core.state.machines.CoreStateMachinesModule | From | To | |
| Rename Attribute | 1 | ||
| Rename Attribute idTypeConfigurationProvider : IdTypeConfigurationProvider to idController : IdController in class org.neo4j.kernel.NeoStoreDataSource | From | To | |
| Change Attribute Type | 4 | ||
| Change Attribute Type idTypeConfigurationProvider : IdTypeConfigurationProvider to idController : IdController in class org.neo4j.kernel.NeoStoreDataSource | From | To | |
| Change Attribute Type idGeneratorFactory : ReplicatedIdGeneratorFactory to idGeneratorFactory : IdGeneratorFactory in class org.neo4j.causalclustering.core.state.machines.CoreStateMachinesModule | From | To | |
| Change Attribute Type highId : AtomicLong to highId : long in class org.neo4j.kernel.impl.store.id.IdGeneratorImpl | From | To | |
| Change Attribute Type generators : Map<IdType,SwitchableRaftIdGenerator> to generators : Map<IdType,ReplicatedIdGenerator> in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Rename Parameter | 2 | ||
| Rename Parameter fileName : File to file : File in method private openGenerator(file File, grabSize int, idType IdType, highId long, aggressiveReuse boolean) : IdGenerator in class org.neo4j.causalclustering.core.state.machines.id.ReplicatedIdGeneratorFactory | From | To | |
| Rename Parameter leaderLocator : LeaderLocator to raftMachine : RaftMachine in method public CoreStateMachinesModule(myself MemberId, platformModule PlatformModule, clusterStateDirectory File, config Config, replicator RaftReplicator, raftMachine RaftMachine, dependencies Dependencies, localDatabase LocalDatabase) in class org.neo4j.causalclustering.core.state.machines.CoreStateMachinesModule | From | To |