Skip to content

Commit 53cf579

Browse files
brianburtonbrianburton
committed
Simplifies new update() method to use one lambda instead of two.
1 parent 56f5772 commit 53cf579

31 files changed

+128
-189
lines changed

‎src/main/java/org/javimmutable/collections/JImmutableMap.java‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -201,41 +201,19 @@ JImmutableMap<K, V> assign(@Nonnull K key,
201201
}
202202

203203
/**
204-
* Update the value at the key. If the key is not currently bound the specified value is stored at the key.
205-
* If the key is bound the current value is passed to the specified function and the result
206-
* of the function is stored in the map at the key.
204+
* Update the value at the key. A Holder containing the value currently stored at the key,
205+
* or an empty Holder if the key is not currently bound, is passed to the generator function.
207206
*
208-
* @param key non-null key
209-
* @param value value to store if key is not currently bound
210-
* @param updater function to call with current value to create value if key is already bound
207+
* @param key non-null key
208+
* @param generator function to call with current value to create value if key is already bound
211209
* @return new map with changes applied
212210
*/
213211
@Nonnull
214212
default JImmutableMap<K, V> update(@Nonnull K key,
215-
V value,
216-
@Nonnull Func1<V, V> updater)
217-
{
218-
return update(key, () -> value, updater);
219-
}
220-
221-
/**
222-
* Update the value at the key. If the key is not currently bound the specified creator function
223-
* is called and the result of the function is stored at the key.
224-
* If the key is bound the current value is passed to the specified updater function and the result
225-
* of the function is stored in the map at the key.
226-
*
227-
* @param key non-null key
228-
* @param creator function to call to create value to store if key is not currently bound
229-
* @param updater function to call with current value to create new value if key is already bound
230-
* @return new map with changes applied
231-
*/
232-
@Nonnull
233-
default JImmutableMap<K, V> update(@Nonnull K key,
234-
@Nonnull Func0<V> creator,
235-
@Nonnull Func1<V, V> updater)
213+
@Nonnull Func1<Holder<V>, V> generator)
236214
{
237215
final Holder<V> current = find(key);
238-
final V newValue = current.isEmpty() ? creator.apply() : updater.apply(current.getValue());
216+
final V newValue = generator.apply(current);
239217
return assign(key, newValue);
240218
}
241219
}

‎src/main/java/org/javimmutable/collections/hash/JImmutableHashMap.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.Holders;
@@ -189,11 +188,10 @@ public JImmutableMap<K, V> assign(@Nonnull K key,
189188
@Nonnull
190189
@Override
191190
public JImmutableMap<K, V> update(@Nonnull K key,
192-
@Nonnull Func0<V> creator,
193-
@Nonnull Func1<V, V> updater)
191+
@Nonnull Func1<Holder<V>, V> generator)
194192
{
195193
MutableDelta sizeDelta = new MutableDelta();
196-
HamtNode<T, K, V> newRoot = root.update(collisionMap, key.hashCode(), key, creator, updater, sizeDelta);
194+
HamtNode<T, K, V> newRoot = root.update(collisionMap, key.hashCode(), key, generator, sizeDelta);
197195
if (newRoot == root) {
198196
return this;
199197
} else {

‎src/main/java/org/javimmutable/collections/hash/collision_map/CollisionMap.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.JImmutableMap;
@@ -72,8 +71,7 @@ T update(@Nullable T leaf,
7271
@Nonnull
7372
T update(@Nullable T leaf,
7473
@Nonnull K key,
75-
@Nonnull Func0<V> creator,
76-
@Nonnull Func1<V, V> updater,
74+
@Nonnull Func1<Holder<V>, V> generator,
7775
@Nonnull MutableDelta delta);
7876

7977
/**

‎src/main/java/org/javimmutable/collections/hash/collision_map/ListCollisionMap.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.Holders;
@@ -71,15 +70,14 @@ public ListNode<K, V> update(ListNode<K, V> leaf,
7170
@Override
7271
public ListNode<K, V> update(@Nullable ListNode<K, V> leaf,
7372
@Nonnull K key,
74-
@Nonnull Func0<V> creator,
75-
@Nonnull Func1<V, V> updater,
73+
@Nonnull Func1<Holder<V>, V> generator,
7674
@Nonnull MutableDelta delta)
7775
{
7876
if (leaf == null) {
7977
delta.add(1);
80-
return SingleValueListNode.of(key, creator.apply());
78+
return SingleValueListNode.of(key, generator.apply(Holders.of()));
8179
} else {
82-
return leaf.setValueForKey(key, creator, updater, delta);
80+
return leaf.setValueForKey(key, generator, delta);
8381
}
8482
}
8583

‎src/main/java/org/javimmutable/collections/hash/collision_map/ListNode.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursorable;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.JImmutableMap;
@@ -59,8 +58,7 @@ ListNode<K, V> setValueForKey(K key,
5958
MutableDelta sizeDelta);
6059

6160
ListNode<K, V> setValueForKey(K key,
62-
Func0<V> creator,
63-
Func1<V, V> updater,
61+
Func1<Holder<V>, V> generator,
6462
MutableDelta sizeDelta);
6563

6664
ListNode<K, V> deleteValueForKey(K key,

‎src/main/java/org/javimmutable/collections/hash/collision_map/MultiValueListNode.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.Holders;
@@ -132,16 +131,15 @@ public MultiValueListNode<K, V> setValueForKey(K key,
132131

133132
@Override
134133
public ListNode<K, V> setValueForKey(K key,
135-
Func0<V> creator,
136-
Func1<V, V> updater,
134+
Func1<Holder<V>, V> generator,
137135
MutableDelta sizeDelta)
138136
{
139137
SingleValueListNode<K, V> entry = getEntryForKeyImpl(key);
140138
if (entry == null) {
141139
sizeDelta.add(1);
142-
return new MultiValueListNode<>(this, SingleValueListNode.of(key, creator.apply()));
140+
return new MultiValueListNode<>(this, SingleValueListNode.of(key, generator.apply(Holders.of())));
143141
} else {
144-
final V value = updater.apply(entry.getValue());
142+
final V value = generator.apply(entry);
145143
if (entry.getValue() == value) {
146144
return this;
147145
} else {

‎src/main/java/org/javimmutable/collections/hash/collision_map/SingleValueListNode.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.Holders;
@@ -105,16 +104,15 @@ public ListNode<K, V> setValueForKey(K key,
105104

106105
@Override
107106
public ListNode<K, V> setValueForKey(K key,
108-
Func0<V> creator,
109-
Func1<V, V> updater,
107+
Func1<Holder<V>, V> generator,
110108
MutableDelta sizeDelta)
111109
{
112110
if (key.equals(this.key)) {
113-
final V value = updater.apply(this.value);
111+
final V value = generator.apply(this);
114112
return (this.value == value) ? this : new SingleValueListNode<>(key, value);
115113
} else {
116114
sizeDelta.add(1);
117-
return MultiValueListNode.of(this, new SingleValueListNode<>(key, creator.apply()));
115+
return MultiValueListNode.of(this, new SingleValueListNode<>(key, generator.apply(Holders.of())));
118116
}
119117
}
120118

‎src/main/java/org/javimmutable/collections/hash/collision_map/TreeCollisionMap.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
package org.javimmutable.collections.hash.collision_map;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
41+
import org.javimmutable.collections.Holders;
4242
import org.javimmutable.collections.JImmutableMap;
4343
import org.javimmutable.collections.SplitableIterator;
4444
import org.javimmutable.collections.common.MutableDelta;
@@ -83,15 +83,14 @@ public Node<K, V> update(Node<K, V> leaf,
8383
@Override
8484
public Node<K, V> update(@Nullable Node<K, V> leaf,
8585
@Nonnull K key,
86-
@Nonnull Func0<V> creator,
87-
@Nonnull Func1<V, V> updater,
86+
@Nonnull Func1<Holder<V>, V> generator,
8887
@Nonnull MutableDelta delta)
8988
{
9089
if (leaf == null) {
9190
delta.add(1);
92-
return new LeafNode<>(key, creator.apply());
91+
return new LeafNode<>(key, generator.apply(Holders.of()));
9392
} else {
94-
return resultForUpdate(leaf, delta, leaf.update(comparator, key, creator, updater));
93+
return resultForUpdate(leaf, delta, leaf.update(comparator, key, generator));
9594
}
9695
}
9796

‎src/main/java/org/javimmutable/collections/hash/hamt/HamtBranchNode.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
import org.javimmutable.collections.Cursor;
3939
import org.javimmutable.collections.Cursorable;
40-
import org.javimmutable.collections.Func0;
4140
import org.javimmutable.collections.Func1;
4241
import org.javimmutable.collections.Holder;
4342
import org.javimmutable.collections.Holders;
@@ -193,15 +192,14 @@ public HamtNode<T, K, V> assign(@Nonnull CollisionMap<T, K, V> collisionMap,
193192
public HamtNode<T, K, V> update(@Nonnull CollisionMap<T, K, V> collisionMap,
194193
int hashCode,
195194
@Nonnull K hashKey,
196-
@Nonnull Func0<V> creator,
197-
@Nonnull Func1<V, V> updater,
195+
@Nonnull Func1<Holder<V>, V> generator,
198196
@Nonnull MutableDelta sizeDelta)
199197
{
200198
final HamtNode<T, K, V>[] children = this.children;
201199
final int bitmask = this.bitmask;
202200
final T thisValue = this.value;
203201
if (hashCode == 0) {
204-
final T newValue = collisionMap.update(thisValue, hashKey, creator, updater, sizeDelta);
202+
final T newValue = collisionMap.update(thisValue, hashKey, generator, sizeDelta);
205203
if (thisValue == newValue) {
206204
return this;
207205
} else {
@@ -213,12 +211,12 @@ public HamtNode<T, K, V> update(@Nonnull CollisionMap<T, K, V> collisionMap,
213211
final int bit = 1 << index;
214212
final int childIndex = realIndex(bitmask, bit);
215213
if ((bitmask & bit) == 0) {
216-
final HamtNode<T, K, V> newChild = new HamtLeafNode<>(remainder, collisionMap.update(null, hashKey, creator, updater, sizeDelta));
214+
final HamtNode<T, K, V> newChild = new HamtLeafNode<>(remainder, collisionMap.update(null, hashKey, generator, sizeDelta));
217215
final HamtNode<T, K, V>[] newChildren = ArrayHelper.insert(this, children, childIndex, newChild);
218216
return new HamtBranchNode<>(bitmask | bit, thisValue, newChildren);
219217
} else {
220218
final HamtNode<T, K, V> child = children[childIndex];
221-
final HamtNode<T, K, V> newChild = child.update(collisionMap, remainder, hashKey, creator, updater, sizeDelta);
219+
final HamtNode<T, K, V> newChild = child.update(collisionMap, remainder, hashKey, generator, sizeDelta);
222220
if (newChild == child) {
223221
return this;
224222
} else {

‎src/main/java/org/javimmutable/collections/hash/hamt/HamtEmptyNode.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
package org.javimmutable.collections.hash.hamt;
3737

3838
import org.javimmutable.collections.Cursor;
39-
import org.javimmutable.collections.Func0;
4039
import org.javimmutable.collections.Func1;
4140
import org.javimmutable.collections.Holder;
4241
import org.javimmutable.collections.Holders;
@@ -95,11 +94,10 @@ public HamtNode<T, K, V> assign(@Nonnull CollisionMap<T, K, V> collisionMap,
9594
public HamtNode<T, K, V> update(@Nonnull CollisionMap<T, K, V> collisionMap,
9695
int hashCode,
9796
@Nonnull K hashKey,
98-
@Nonnull Func0<V> creator,
99-
@Nonnull Func1<V, V> updater,
97+
@Nonnull Func1<Holder<V>, V> generator,
10098
@Nonnull MutableDelta sizeDelta)
10199
{
102-
return new HamtLeafNode<>(hashCode, collisionMap.update(null, hashKey, creator, updater, sizeDelta));
100+
return new HamtLeafNode<>(hashCode, collisionMap.update(null, hashKey, generator, sizeDelta));
103101
}
104102

105103
@Nonnull

0 commit comments

Comments
 (0)