Skip to content

Commit 038c4c9

Browse files
committed
INTERNAL: improve refineTrimmedKeys method using Java 8 removeIf
1 parent 4cd8789 commit 038c4c9

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/main/java/net/spy/memcached/internal/result/SMGetResultImpl.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package net.spy.memcached.internal.result;
22

33
import java.util.ArrayList;
4-
import java.util.Iterator;
54
import java.util.List;
6-
import java.util.Map;
75

8-
import net.spy.memcached.collection.BKeyObject;
96
import net.spy.memcached.collection.CollectionResponse;
107
import net.spy.memcached.collection.SMGetElement;
118
import net.spy.memcached.ops.CollectionOperationStatus;
@@ -172,15 +169,10 @@ private void refineTrimmedKeys() {
172169
if (!trimmedKeyMap.isEmpty() && count <= mergedResult.size()) {
173170
SMGetElement<T> lastElement = mergedResult.get(mergedResult.size() - 1);
174171

175-
// FIXME: use removeIf with entrySet() when upgrading java version 8
176-
Iterator<Map.Entry<String, BKeyObject>> iterator = trimmedKeyMap.entrySet().iterator();
177-
while (iterator.hasNext()) {
178-
Map.Entry<String, BKeyObject> entry = iterator.next();
172+
trimmedKeyMap.entrySet().removeIf(entry -> {
179173
int comp = entry.getValue().compareTo(lastElement.getBkeyObject());
180-
if ((reverse) ? (comp <= 0) : (comp >= 0)) {
181-
iterator.remove();
182-
}
183-
}
174+
return (reverse) ? (comp <= 0) : (comp >= 0);
175+
});
184176
}
185177
}
186178
}

0 commit comments

Comments
 (0)