2be8301ee4ea587192d065933a94de303cc1f893
Files Diff
- Added: 5
- Removed: 3
- Renamed: 0
- Modified: 28
Refactorings reported:
Refactoring Name | Occurences | ||
---|---|---|---|
Merge Attribute | 1 | ||
Merge Attribute [triangleOrderManager : TriangleOrderManager, remoteExecutorService : BlockingTaskAwareExecutorService, clusteringDependentLogic : ClusteringDependentLogic] to handler : TrianglePerCacheInboundInvocationHandler in class org.infinispan.remoting.inboundhandler.action.TriangleOrderAction | From | To | |
Move And Rename Method | 2 | ||
Move And Rename Method package doCompleteExceptionally(throwable Throwable) : void from class org.infinispan.util.concurrent.CommandAckCollector.SingleKeyCollector to public primaryException(throwable Throwable) : void from class org.infinispan.interceptors.distribution.PrimaryOwnerOnlyCollector | From | To | |
Move And Rename Method package doCompleteExceptionally(throwable Throwable) : void from class org.infinispan.util.concurrent.CommandAckCollector.MultiKeyCollector to public primaryException(throwable Throwable) : void from class org.infinispan.interceptors.distribution.PrimaryOwnerOnlyCollector | From | To | |
Change Parameter Type | 1 | ||
Change Parameter Type triangleOrderManager : TriangleOrderManager to handler : TrianglePerCacheInboundInvocationHandler in method public TriangleOrderAction(handler TrianglePerCacheInboundInvocationHandler, sequenceNumber long, key Object) in class org.infinispan.remoting.inboundhandler.action.TriangleOrderAction | From | To | |
Move Attribute | 3 | ||
Move Attribute private triangleOrderManager : TriangleOrderManager from class org.infinispan.remoting.inboundhandler.NonTotalOrderPerCacheInboundInvocationHandler to private triangleOrderManager : TriangleOrderManager from class org.infinispan.remoting.inboundhandler.TrianglePerCacheInboundInvocationHandler | From | To | |
Move Attribute private triangleOrderManager : TriangleOrderManager from class org.infinispan.remoting.inboundhandler.action.TriangleOrderAction to private triangleOrderManager : TriangleOrderManager from class org.infinispan.remoting.inboundhandler.TrianglePerCacheInboundInvocationHandler | From | To | |
Move Attribute private clusteringDependentLogic : ClusteringDependentLogic from class org.infinispan.remoting.inboundhandler.action.TriangleOrderAction to private clusteringDependentLogic : ClusteringDependentLogic from class org.infinispan.remoting.inboundhandler.TrianglePerCacheInboundInvocationHandler | From | To | |
Rename Class | 1 | ||
Rename Class org.infinispan.util.concurrent.CommandAckCollector.Collector renamed to org.infinispan.util.concurrent.CommandAckCollector.BaseCollector | From | To | |
Move And Rename Attribute | 1 | ||
Move And Rename Attribute private returnValue : Object renamed to package primaryResult : T and moved from class org.infinispan.util.concurrent.CommandAckCollector.SingleKeyCollector to class org.infinispan.util.concurrent.CommandAckCollector.BaseCollector | From | To | |
Change Variable Type | 3 | ||
Change Variable Type collector : Collector<?> to collector : BaseCollector<?> in method public completeExceptionally(id long, throwable Throwable, topologyId int) : void in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Change Variable Type collector : Collector<?> to collector : BaseCollector<?> in method public onMembersChange(members Collection<Address>) : void in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Change Variable Type collector : Collector<?> to collector : BaseCollector<?> in method public hasPendingBackupAcks(id long) : boolean in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Extract Variable | 1 | ||
Extract Variable topologyId : int in method private localWriteInvocation(context InvocationContext, command DataWriteCommand, distributionInfo DistributionInfo) : Object from class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Extract Method | 2 | ||
Extract Method private sendToBackups(distributionInfo DistributionInfo, command DataWriteCommand, backupOwners Collection<Address>) : void extracted from private primaryOwnerWrite(context InvocationContext, command DataWriteCommand, distributionInfo DistributionInfo) : Object in class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Extract Method private remoteBackupOwnerWrite(context InvocationContext, command DataWriteCommand) : Object extracted from private handleDataWriteCommand(context InvocationContext, command AbstractDataWriteCommand) : Object in class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Rename Method | 1 | ||
Rename Method private primaryOwnerWrite(context InvocationContext, command DataWriteCommand, distributionInfo DistributionInfo) : Object renamed to private localPrimaryOwnerWrite(context InvocationContext, command DataWriteCommand, distributionInfo DistributionInfo) : Object in class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Pull Up Method | 1 | ||
Pull Up Method private createReadyActionRunnable(command CacheRpcCommand, reply Reply, commandTopologyId int, sync boolean, readyAction ReadyAction) : BlockingRunnable from class org.infinispan.remoting.inboundhandler.NonTotalOrderPerCacheInboundInvocationHandler to package createNonNullReadyActionRunnable(command CacheRpcCommand, reply Reply, commandTopologyId int, sync boolean, readyAction ReadyAction) : BlockingRunnable from class org.infinispan.remoting.inboundhandler.BasePerCacheInboundInvocationHandler | From | To | |
Inline Method | 2 | ||
Inline Method private hasSomeBackupLeft(members Collection<Address>) : boolean inlined to public onMembersChange(members Collection<Address>) : void in class org.infinispan.util.concurrent.CommandAckCollector.MultiKeyCollector | From | To | |
Change Return Type | 3 | ||
Change Return Type void to Object in method private localWriteInvocation(context InvocationContext, command DataWriteCommand, distributionInfo DistributionInfo) : Object in class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Change Return Type void to Collector<Map<Object,Object>> in method public createMultiKeyCollector(id long, primary Collection<Address>, backups Map<Address,Collection<Integer>>, topologyId int) : Collector<Map<Object,Object>> in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Change Return Type void to Collector<Object> in method public create(id long, backupOwners Collection<Address>, topologyId int) : Collector<Object> in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Parameterize Variable | 1 | ||
Parameterize Variable dwCommand : DataWriteCommand to command : DataWriteCommand in method private sendToBackups(distributionInfo DistributionInfo, command DataWriteCommand, backupOwners Collection<Address>) : void in class org.infinispan.interceptors.distribution.TriangleDistributionInterceptor | From | To | |
Extract Interface | 1 | ||
Extract Interface org.infinispan.interceptors.distribution.Collector from classes [org.infinispan.util.concurrent.CommandAckCollector.BaseCollector] | From | To | |
Change Attribute Type | 3 | ||
Change Attribute Type backups : HashMap<Address,Collection<Integer>> to backups : Map<Address,Collection<Integer>> in class org.infinispan.util.concurrent.CommandAckCollector.MultiKeyCollector | From | To | |
Change Attribute Type collectorMap : ConcurrentHashMap<Long,Collector<?>> to collectorMap : ConcurrentHashMap<Long,BaseCollector<?>> in class org.infinispan.util.concurrent.CommandAckCollector | From | To | |
Change Attribute Type owners : HashSet<Address> to owners : Collection<Address> in class org.infinispan.util.concurrent.CommandAckCollector.SingleKeyCollector | From | To | |
Rename Parameter | 2 | ||
Rename Parameter triangleOrderManager : TriangleOrderManager to handler : TrianglePerCacheInboundInvocationHandler in method public TriangleOrderAction(handler TrianglePerCacheInboundInvocationHandler, sequenceNumber long, key Object) in class org.infinispan.remoting.inboundhandler.action.TriangleOrderAction | From | To | |
Rename Parameter owners : Collection<Address> to backupOwners : Collection<Address> in method public create(id long, backupOwners Collection<Address>, topologyId int) : Collector<Object> in class org.infinispan.util.concurrent.CommandAckCollector | From | To |