ignite 18aaee039908821d9d962a7bf3659578164e375d

18aaee039908821d9d962a7bf3659578164e375d

Files Diff

Added: 1
Removed: 0
Renamed: 0
Modified: 8

Link to commit

Dependency Action

Refactorings reported:

Refactoring Name	Occurences
Pull Up Method	6
Pull Up Method public trackable() : boolean from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture to public trackable() : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Method public onResult(nodeId UUID, res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture to public onResult(nodeId UUID, res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Method public trackable() : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture to public trackable() : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Method public onResult(nodeId UUID, res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture to public onResult(nodeId UUID, res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Method public onNodeLeft(nodeId UUID) : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture to public onNodeLeft(nodeId UUID) : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Method public onNodeLeft(nodeId UUID) : boolean from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture to public onNodeLeft(nodeId UUID) : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Move Method	14
Move Method package onResult(e Throwable) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public onResult(e Throwable) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method private postProcessResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to protected postProcessResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package futureId() : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public futureId() : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Move Method public keys() : Collection<KeyCacheObject> from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public keys() : Collection<KeyCacheObject> from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package onResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public onResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package onNodeLeft() : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public onNodeLeft(e ClusterTopologyCheckedException) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package onResult(e Throwable) : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public onResult(e Throwable) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package futureId() : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public futureId() : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Move Method package onResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public onResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method package onNodeLeft(e ClusterTopologyCheckedException) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public onNodeLeft(e ClusterTopologyCheckedException) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method private postProcessResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to protected postProcessResult(res GridNearGetResponse) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method public node() : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public node() : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method public node() : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture.MiniFuture to public node() : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Method public keys() : Collection<KeyCacheObject> from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to public keys() : Collection<KeyCacheObject> from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Rename Variable	1
Rename Variable topFut : IgniteInternalFuture<AffinityTopologyVersion> to awaitTopologyVersionFuture : IgniteInternalFuture<AffinityTopologyVersion> in method private awaitVersionAndRemap(topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Inline Method	2
Inline Method public futureId() : IgniteUuid inlined to protected map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture	From	To
Inline Method public futureId() : IgniteUuid inlined to protected map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture	From	To
Pull Up Attribute	4
Pull Up Attribute private logRef : AtomicReference<IgniteLogger> from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture to protected logRef : AtomicReference<IgniteLogger> from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Attribute private logRef : AtomicReference<IgniteLogger> from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture to protected logRef : AtomicReference<IgniteLogger> from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Attribute private log : IgniteLogger from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture to protected log : IgniteLogger from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Pull Up Attribute private log : IgniteLogger from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture to protected log : IgniteLogger from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Move Attribute	5
Move Attribute private keys : LinkedHashMap<KeyCacheObject,Boolean> from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to protected keys : LinkedHashMap<KeyCacheObject,Boolean> from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Attribute private futId : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to private futId : IgniteUuid from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Attribute private node : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to protected node : ClusterNode from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Attribute private remapped : boolean from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to private remapped : boolean from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Move Attribute private topVer : AffinityTopologyVersion from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture.MiniFuture to protected topVer : AffinityTopologyVersion from class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter.AbstractMiniFuture	From	To
Extract Variable	4
Extract Variable topVer : AffinityTopologyVersion in method public apply(f IgniteInternalFuture<Collection<GridCacheEntryInfo>>) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter.processNearGetRequest.listen	From	To
Extract Variable part : int in method protected map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture	From	To
Extract Variable part : int in method protected map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void from class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture	From	To
Extract Variable mappingtopVermappingtopVer : AffinityTopologyVersion in method public init() : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Inline Variable	1
Inline Variable topVer : AffinityTopologyVersion in method public applyx(fut IgniteInternalFuture<AffinityTopologyVersion>) : void from class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture.checkError.listen	From	To
Extract Method	7
Extract Method private addNodeMapping(key KeyCacheObject, node ClusterNode, mappings Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : void extracted from private map(key KeyCacheObject, mappings Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, locVals Map<K,V>, topVer AffinityTopologyVersion, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture	From	To
Extract Method private tryLocalGet(key KeyCacheObject, part int, topVer AffinityTopologyVersion, affNodes List<ClusterNode>, locVals Map<K,V>) : boolean extracted from private map(key KeyCacheObject, mappings Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, locVals Map<K,V>, topVer AffinityTopologyVersion, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture	From	To
Extract Method private validate(cacheNodes Collection<ClusterNode>, topVer AffinityTopologyVersion) : void extracted from private map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture	From	To
Extract Method private awaitVersionAndRemap(topVer AffinityTopologyVersion) : void extracted from private checkError(err IgniteCheckedException, invalidParts boolean, rmtTopVer AffinityTopologyVersion, nodeId UUID) : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Extract Method private tryLocalGet(key KeyCacheObject, part int, topVer AffinityTopologyVersion, affNodes List<ClusterNode>) : boolean extracted from private mapKeyToNode(topVer AffinityTopologyVersion) : ClusterNode in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Extract Method private registrateFutureInMvccManager(fut GridCacheFuture<?>) : void extracted from private map(topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Extract Method private awaitVersionAndRemap(topVer AffinityTopologyVersion) : void extracted from public onNodeLeft(nodeId UUID) : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture	From	To
Extract And Move Method	9
Extract And Move Method protected initLogger(aclass Class<?>) : void extracted from public GridPartitionedGetFuture(cctx GridCacheContext<K,V>, keys Collection<KeyCacheObject>, readThrough boolean, forcePrimary boolean, subjId UUID, taskName String, deserializeBinary boolean, recovery boolean, expiryPlc IgniteCacheExpiryPolicy, skipVals boolean, needVer boolean, keepCacheObjects boolean, txLbl String, mvccSnapshot MvccSnapshot) in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected registrateFutureInMvccManager(fut GridCacheFuture<?>) : void extracted from private map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method public toString() : String extracted from public toString() : String in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected registrateFutureInMvccManager(fut GridCacheFuture<?>) : void extracted from private map(keys Collection<KeyCacheObject>, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected initLogger(aclass Class<?>) : void extracted from public GridNearGetFuture(cctx GridCacheContext<K,V>, keys Collection<KeyCacheObject>, readThrough boolean, forcePrimary boolean, tx IgniteTxLocalEx, subjId UUID, taskName String, deserializeBinary boolean, expiryPlc IgniteCacheExpiryPolicy, skipVals boolean, needVer boolean, keepCacheObjects boolean, recovery boolean) in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected registrateFutureInMvccManager(fut GridCacheFuture<?>) : void extracted from public init(topVer AffinityTopologyVersion) : void in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected checkRetryPermits(key KeyCacheObject, node ClusterNode, missedNodesToKeysMapping Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : boolean extracted from private map(key KeyCacheObject, mappings Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, locVals Map<K,V>, topVer AffinityTopologyVersion, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : boolean in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method protected checkRetryPermits(key KeyCacheObject, node ClusterNode, missedNodesToKeysMapping Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>) : boolean extracted from private map(key KeyCacheObject, mappings Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, topVer AffinityTopologyVersion, mapped Map<ClusterNode,LinkedHashMap<KeyCacheObject,Boolean>>, saved Map<KeyCacheObject,GridNearCacheEntry>) : Map<KeyCacheObject,GridNearCacheEntry> in class org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To
Extract And Move Method public toString() : String extracted from public toString() : String in class org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture & moved to class org.apache.ignite.internal.processors.cache.distributed.dht.CacheDistributedGetFutureAdapter	From	To

18aaee039908821d9d962a7bf3659578164e375d

Files Diff

Link to commit

Third party dependencies:

Refactorings reported: