guava 5803c43d7e79b969b12fb61ed423dbb07fddfc6c

5803c43d7e79b969b12fb61ed423dbb07fddfc6c

Files Diff

Added: 0
Removed: 0
Renamed: 0
Modified: 4

Link to commit

Dependency Action

Refactorings reported:

Refactoring Name	Occurences
Merge Attribute	1
Merge Attribute [keyStrength : Strength, valueStrength : Strength] to entryHelper : InternalEntryHelper<K,V,E,S> in class com.google.common.collect.MapMakerInternalMap	From	To
Move And Rename Method	1
Move And Rename Method package WeakValueReference(queue ReferenceQueue<V>, referent V, entry ReferenceEntry<K,V>) from class com.google.common.collect.MapMakerInternalMap.WeakValueReference to package WeakValueReferenceImpl(queue ReferenceQueue<V>, referent V, entry E) from class com.google.common.collect.MapMakerInternalMap.WeakValueReferenceImpl	From	To
Move And Inline Method	4
Move And Inline Method package usesValueReferences() : boolean moved from class com.google.common.collect.MapMakerInternalMap to class com.google.common.collect.MapMakerInternalMapTest & inlined to public testDrainValueReferenceQueueOnWrite() : void	From	To
Move And Inline Method package usesKeyReferences() : boolean moved from class com.google.common.collect.MapMakerInternalMap to class com.google.common.collect.MapMakerInternalMapTest & inlined to public testDrainKeyReferenceQueueOnWrite() : void	From	To
Move And Inline Method package usesKeyReferences() : boolean moved from class com.google.common.collect.MapMakerInternalMap to class com.google.common.collect.MapMakerInternalMapTest & inlined to public testDrainKeyReferenceQueueOnRead() : void	From	To
Move And Inline Method package usesValueReferences() : boolean moved from class com.google.common.collect.MapMakerInternalMap to class com.google.common.collect.MapMakerInternalMapTest & inlined to public testDrainValueReferenceQueueOnRead() : void	From	To
Change Parameter Type	20
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package advanceTo(entry E) : boolean in class com.google.common.collect.MapMakerInternalMap.HashIterator	From	To
Change Parameter Type newTable : AtomicReferenceArray<ReferenceEntry<K,V>> to newTable : AtomicReferenceArray<E> in method package initTable(newTable AtomicReferenceArray<E>) : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type map : MapMakerInternalMap<K,V> to map : MapMakerInternalMap<K,V,?,?> in method private countLiveEntries(map MapMakerInternalMap<K,V,?,?>) : int in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Parameter Type first : ReferenceEntry<K,V> to first : E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type newNext : ReferenceEntry<K,V> to newNext : E in method package copyEntry(original E, newNext E) : E in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method public copyFor(queue ReferenceQueue<V>, entry E) : WeakValueReference<K,V,E> in class com.google.common.collect.MapMakerInternalMap.WeakValueReferenceImpl	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package reclaimKey(entry E) : void in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method private checkStrength(map MapMakerInternalMap<Object,Object,?,?>, keyStrength Strength, valueStrength Strength) : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Parameter Type valueReference : ValueReference<K,V> to valueReference : WeakValueReference<K,V,? extends InternalEntry<K,V,?>> in method package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package getLiveValue(entry E) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type map : MapMakerInternalMap<K,V> to map : MapMakerInternalMap<K,V,E,S> in method package Segment(map MapMakerInternalMap<K,V,E,S>, initialCapacity int, maxSegmentSize int) in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package WeakValueReferenceImpl(queue ReferenceQueue<V>, referent V, entry E) in class com.google.common.collect.MapMakerInternalMap.WeakValueReferenceImpl	From	To
Change Parameter Type valueReference : ValueReference<K,V> to valueReference : WeakValueReference<K,V,E> in method package reclaimValue(valueReference WeakValueReference<K,V,E>) : void in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type valueReference : ValueReference<K,V> to valueReference : WeakValueReference<K,V,E> in method package reclaimValue(key K, hash int, valueReference WeakValueReference<K,V,E>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package reclaimKey(entry E, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : E in method package getLiveValue(entry E) : V in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type entry : ReferenceEntry<K,V> to entry : InternalEntry<K,V,?> in method package isLiveForTesting(entry InternalEntry<K,V,?>) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type original : ReferenceEntry<K,V> to original : E in method package copyEntry(original E, newNext E) : E in class com.google.common.collect.MapMakerInternalMap	From	To
Change Parameter Type map : MapMakerInternalMap<?,?> to map : MapMakerInternalMap<?,?,?,?> in method public CleanupMapTask(map MapMakerInternalMap<?,?,?,?>) in class com.google.common.collect.MapMakerInternalMap.CleanupMapTask	From	To
Move Method	1
Move Method public copyFor(queue ReferenceQueue<V>, value V, entry ReferenceEntry<K,V>) : ValueReference<K,V> from class com.google.common.collect.MapMakerInternalMap.WeakValueReference to public copyFor(queue ReferenceQueue<V>, entry E) : WeakValueReference<K,V,E> from class com.google.common.collect.MapMakerInternalMap.WeakValueReferenceImpl	From	To
Rename Class	3
Rename Class com.google.common.collect.MapMakerInternalMap.ReferenceEntry renamed to com.google.common.collect.MapMakerInternalMap.InternalEntry	From	To
Rename Class com.google.common.collect.MapMakerInternalMap.ReferenceEntry renamed to com.google.common.collect.MapMakerInternalMap.WeakValueEntry	From	To
Change Variable Type	135
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testDrainValueReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<K,V> to entry : E in method package drainKeyReferenceQueue(keyReferenceQueue ReferenceQueue<K>) : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentRemove() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<? extends InternalEntry<K,V,?>> in method private countLiveEntries(map MapMakerInternalMap<K,V,?,?>) : int in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testDrainKeyReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<K,V> to segment : Segment<K,V,E,S> in method public clear() : void in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type next : ReferenceEntry<K,V> to next : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package remove(key Object, hash int, value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentRemove() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testDrainKeyReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method public containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentPut() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testSegmentPut() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testClear() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testDrainValueReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testDrainValueReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentReplaceValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type next : ReferenceEntry<K,V> to next : E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package reclaimKey(entry E, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testClear() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testRemoveFromChain() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package put(key K, hash int, value V, onlyIfAbsent boolean) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<?,?> to map : MapMakerInternalMap<?,?,?,?> in method public run() : void in class com.google.common.collect.MapMakerInternalMap.CleanupMapTask	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package replace(key K, hash int, newValue V) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package reclaimKey(entry E, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSetWeakKeys() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package containsKey(key Object, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentReplace() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method private checkConcurrencyLevel(concurrencyLevel int, segmentCount int) : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package remove(key Object, hash int, value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testCopyEntry() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type newTable : AtomicReferenceArray<ReferenceEntry<K,V>> to newTable : AtomicReferenceArray<E> in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testDrainKeyReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package get(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package reclaimValue(key K, hash int, valueReference WeakValueReference<K,V,E>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method private checkMaximumSize(concurrencyLevel int, initialCapacity int, maxSize int) : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : InternalEntry<K,V,?> in method private countLiveEntries(map MapMakerInternalMap<K,V,?,?>) : int in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testDrainKeyReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : WeakValueEntry<Object,Object,?> in method public testDrainValueReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segments : Segment<K,V>[] to segments : Segment<K,V,E,S>[] in method public containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package reclaimValue(key K, hash int, valueReference WeakValueReference<K,V,E>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<K,V> to segment : Segment<K,V,?,?> in method private countLiveEntries(map MapMakerInternalMap<K,V,?,?>) : int in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type newNext : ReferenceEntry<K,V> to newNext : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<?,?> to segment : Segment<?,?,?,?> in method public run() : void in class com.google.common.collect.MapMakerInternalMap.CleanupMapTask	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testRemoveEntry() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testSegmentReplace() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package remove(key Object, hash int, value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method public containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package replace(key K, hash int, oldValue V, newValue V) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segments : Segment<K,V>[] to segments : Segment<K,V,E,S>[] in method public size() : int in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentPut() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segments : Segment<K,V>[] to segments : Segment<K,V,E,S>[] in method public isEmpty() : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentPutIfAbsent() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testExpand_cleanup() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package remove(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentReplace() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testRemoveEntry() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<K,V> to segment : Segment<K,V,E,S> in method public containsValue(value Object) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package reclaimValue(key K, hash int, valueReference WeakValueReference<K,V,E>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package replace(key K, hash int, oldValue V, newValue V) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testSegmentRemoveValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type valueReference : ValueReference<Object,Object> to valueReference : WeakValueReference<Object,Object,?> in method public testDrainValueReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSetKeyEquivalence() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testDefaults() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentPutIfAbsent() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testNewEntry() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package remove(key Object, hash int, value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package replace(key K, hash int, newValue V) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package remove(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type valueReference : ValueReference<Object,Object> to valueReference : WeakValueReference<Object,Object,?> in method public testDrainValueReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testClearValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type newFirst : ReferenceEntry<Object,Object> to newFirst : InternalEntry<Object,Object,?> in method public testRemoveFromChain() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testDrainKeyReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testRemoveEntry() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentReplaceValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testClearValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testSegmentRemove() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package getEntry(key Object, hash int) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package remove(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package reclaimKey(entry E, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package getFirst(hash int) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentRemoveValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package remove(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package put(key K, hash int, value V, onlyIfAbsent boolean) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testExpand() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package put(key K, hash int, value V, onlyIfAbsent boolean) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package reclaimKey(entry E, hash int) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type oldTable : AtomicReferenceArray<ReferenceEntry<K,V>> to oldTable : AtomicReferenceArray<E> in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type valueReference : ValueReference<K,V> to valueReference : WeakValueReference<K,V,E> in method package drainValueReferenceQueue(valueReferenceQueue ReferenceQueue<V>) : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type entry : ReferenceEntry<E,Dummy> to entry : InternalEntry<E,Dummy,?> in method public intern(sample E) : E in class com.google.common.collect.Interners.WeakInterner	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package replace(key K, hash int, newValue V) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testExpand_cleanup() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentPut_expand() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testRemoveFromChain() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSegmentRemoveValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type tail : ReferenceEntry<K,V> to tail : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testDrainKeyReferenceQueueOnWrite() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testSetWeakValues() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type first : ReferenceEntry<K,V> to first : E in method package replace(key K, hash int, oldValue V, newValue V) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testExpand() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testSegmentPutIfAbsent() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package replace(key K, hash int, oldValue V, newValue V) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testExpand() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<Object,Object>> to table : AtomicReferenceArray<? extends InternalEntry<Object,Object,?>> in method public testSegmentReplaceValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to e : E in method package reclaimValue(key K, hash int, valueReference WeakValueReference<K,V,E>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testDrainValueReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type newFirst : ReferenceEntry<K,V> to newFirst : E in method package replace(key K, hash int, newValue V) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testClear() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type e : ReferenceEntry<K,V> to entry : E in method package isCollected(entry E) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type entry : ReferenceEntry<K,V> to entry : E in method package reclaimValue(valueReference WeakValueReference<K,V,E>) : void in class com.google.common.collect.MapMakerInternalMap	From	To
Change Variable Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in method package clear() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type segment : Segment<Object,Object> to segment : Segment<Object,Object,?,?> in method public testSegmentPut_expand() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : InternalEntry<Object,Object,?> in method public testExpand_cleanup() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type dummy : DummyEntry<Object,Object> to dummyEntry : InternalEntry<Object,Object,?> in method public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method private checkInitialCapacity(concurrencyLevel int, initialCapacity int, segmentSize int) : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type entry : ReferenceEntry<Object,Object> to entry : WeakValueEntry<Object,Object,?> in method public testDrainValueReferenceQueueOnRead() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Variable Type head : ReferenceEntry<K,V> to head : E in method package expand() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Variable Type map : MapMakerInternalMap<Object,Object> to map : MapMakerInternalMap<Object,Object,?,?> in method public testClearValue() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Extract Method	4
Extract Method package isCollected(entry E) : boolean extracted from package remove(key Object, hash int, value Object) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract Method package isCollected(entry E) : boolean extracted from package replace(key K, hash int, newValue V) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract Method package isCollected(entry E) : boolean extracted from package remove(key Object, hash int) : V in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract Method package isCollected(entry E) : boolean extracted from package replace(key K, hash int, oldValue V, newValue V) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Method	7
Rename Method package unset() : ValueReference<K,V> renamed to package unsetWeakValueReference() : WeakValueReference<K,V,E> in class com.google.common.collect.MapMakerInternalMap	From	To
Rename Method package isLive(entry ReferenceEntry<K,V>) : boolean renamed to package isLiveForTesting(entry InternalEntry<K,V,?>) : boolean in class com.google.common.collect.MapMakerInternalMap	From	To
Rename Method package drainReferenceQueues() : void renamed to package maybeDrainReferenceQueues() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Method package clearValue(key K, hash int, valueReference ValueReference<K,V>) : boolean renamed to package clearValueForTesting(key K, hash int, valueReference WeakValueReference<K,V,? extends InternalEntry<K,V,?>>) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Method package clearKeyReferenceQueue() : void renamed to package clearReferenceQueue(referenceQueue ReferenceQueue<T>) : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Method package clearReferenceQueues() : void renamed to package maybeClearReferenceQueues() : void in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Method private allKeyValueStrengthMakers() : Iterable<MapMaker> renamed to private allWeakValueStrengthMakers() : Iterable<MapMaker> in class com.google.common.collect.MapMakerInternalMapTest	From	To
Rename Variable	1
Rename Variable dummy : DummyEntry<Object,Object> to dummyEntry : InternalEntry<Object,Object,?> in method public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Return Type	17
Change Return Type ValueReference<K,V> to WeakValueReference<K,V,E> in method package unsetWeakValueReference() : WeakValueReference<K,V,E> in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type ValueReference<K,V> to WeakValueReference<K,V,E> in method public getValueReference() : WeakValueReference<K,V,E> in class com.google.common.collect.MapMakerInternalMap.WeakValueEntry	From	To
Change Return Type MapMakerInternalMap<K,V> to MapMakerInternalMap<K,V,? extends InternalEntry<K,V,?>,? extends Segment<K,V,?,?>> in method private makeMap(maker MapMaker) : MapMakerInternalMap<K,V,? extends InternalEntry<K,V,?>,? extends Segment<K,V,?,?>> in class com.google.common.collect.MapMakerInternalMapTest	From	To
Change Return Type MapMakerInternalMap<K,V> to MapMakerInternalMap<K,V,?,?> in method package makeCustomMap() : MapMakerInternalMap<K,V,?,?> in class com.google.common.collect.MapMaker	From	To
Change Return Type Segment<K,V>[] to Segment<K,V,E,S>[] in method package newSegmentArray(ssize int) : Segment<K,V,E,S>[] in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type Segment<K,V> to Segment<K,V,E,S> in method package createSegment(initialCapacity int, maxSegmentSize int) : Segment<K,V,E,S> in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type ValueReference<K,V> to WeakValueReference<K,V,E> in method public copyFor(queue ReferenceQueue<V>, entry E) : WeakValueReference<K,V,E> in class com.google.common.collect.MapMakerInternalMap.WeakValueReferenceImpl	From	To
Change Return Type AtomicReferenceArray<ReferenceEntry<K,V>> to AtomicReferenceArray<E> in method package newEntryArray(size int) : AtomicReferenceArray<E> in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Return Type ReferenceEntry<K,V> to E in method package getEntry(key Object) : E in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type ReferenceEntry<K,V> to E in method package getFirst(hash int) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Return Type Segment<K,V> to Segment<K,V,E,S> in method package segmentFor(hash int) : Segment<K,V,E,S> in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type E to T in method public abstract next() : T in class com.google.common.collect.MapMakerInternalMap.HashIterator	From	To
Change Return Type ReferenceEntry<K,V> to E in method package getLiveEntry(key Object, hash int) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Return Type ReferenceEntry<K,V> to E in method package getEntry(key Object, hash int) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Return Type ReferenceEntry<K,V> to E in method package copyEntry(original E, newNext E) : E in class com.google.common.collect.MapMakerInternalMap	From	To
Change Return Type ReferenceEntry<K,V> to E in method package removeFromChain(first E, entry E) : E in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Return Type ReferenceEntry<K,V> to E in method public getNext() : E in class com.google.common.collect.MapMakerInternalMap.InternalEntry	From	To
Parameterize Variable	4
Parameterize Variable e : ReferenceEntry<K,V> to entry : E in method package isCollected(entry E) : boolean in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Rename Attribute	1
Rename Attribute UNSET : ValueReference<Object,Object> to UNSET_WEAK_VALUE_REFERENCE : WeakValueReference<Object,Object,DummyInternalEntry> in class com.google.common.collect.MapMakerInternalMap	From	To
Change Attribute Type	9
Change Attribute Type nextEntry : ReferenceEntry<K,V> to nextEntry : E in class com.google.common.collect.MapMakerInternalMap.HashIterator	From	To
Change Attribute Type map : MapMakerInternalMap<E,Dummy> to map : MapMakerInternalMap<E,Dummy,?,?> in class com.google.common.collect.Interners.WeakInterner	From	To
Change Attribute Type currentTable : AtomicReferenceArray<ReferenceEntry<K,V>> to currentTable : AtomicReferenceArray<E> in class com.google.common.collect.MapMakerInternalMap.HashIterator	From	To
Change Attribute Type table : AtomicReferenceArray<ReferenceEntry<K,V>> to table : AtomicReferenceArray<E> in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Attribute Type map : MapMakerInternalMap<K,V> to map : MapMakerInternalMap<K,V,E,S> in class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Change Attribute Type mapReference : WeakReference<MapMakerInternalMap<?,?>> to mapReference : WeakReference<MapMakerInternalMap<?,?,?,?>> in class com.google.common.collect.MapMakerInternalMap.CleanupMapTask	From	To
Change Attribute Type currentSegment : Segment<K,V> to currentSegment : Segment<K,V,E,S> in class com.google.common.collect.MapMakerInternalMap.HashIterator	From	To
Change Attribute Type UNSET : ValueReference<Object,Object> to UNSET_WEAK_VALUE_REFERENCE : WeakValueReference<Object,Object,DummyInternalEntry> in class com.google.common.collect.MapMakerInternalMap	From	To
Change Attribute Type segments : Segment<K,V>[] to segments : Segment<K,V,E,S>[] in class com.google.common.collect.MapMakerInternalMap	From	To
Extract And Move Method	10
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testClear() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testExpand() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testSegmentReplace() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testSegmentGetAndContains() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testExpand_cleanup() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testClearValue() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testSegmentRemove() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testSegmentRemoveValue() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testRemoveEntry() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To
Extract And Move Method package setTableEntryForTesting(i int, entry InternalEntry<K,V,?>) : void extracted from public testSegmentReplaceValue() : void in class com.google.common.collect.MapMakerInternalMapTest & moved to class com.google.common.collect.MapMakerInternalMap.Segment	From	To

5803c43d7e79b969b12fb61ed423dbb07fddfc6c

Files Diff

Link to commit

Third party dependencies:

Refactorings reported: