File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
main/java/org/apache/jackrabbit/oak/plugins/document
test/java/org/apache/jackrabbit/oak/plugins/document Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 4242import java .util .function .Supplier ;
4343import java .util .stream .StreamSupport ;
4444
45+ import org .apache .commons .collections4 .IterableUtils ;
4546import org .apache .jackrabbit .guava .common .base .Stopwatch ;
4647import org .apache .jackrabbit .guava .common .collect .Iterators ;
4748import org .apache .jackrabbit .oak .commons .sort .StringSort ;
7576import static java .util .stream .Collectors .toMap ;
7677import static java .util .stream .Collectors .toSet ;
7778
78- import static org .apache .jackrabbit .guava .common .collect .Iterables .all ;
7979import static org .apache .jackrabbit .guava .common .collect .Iterators .partition ;
8080import static java .util .concurrent .TimeUnit .MICROSECONDS ;
8181import static org .apache .jackrabbit .oak .plugins .document .Collection .NODES ;
@@ -2304,7 +2304,7 @@ private Iterator<String> previousDocIdsFor(NodeDocument doc) {
23042304 Map <Revision , Range > prevRanges = doc .getPreviousRanges (true );
23052305 if (prevRanges .isEmpty ()) {
23062306 return Collections .emptyIterator ();
2307- } else if (all (prevRanges .values (), FIRST_LEVEL ::test )) {
2307+ } else if (IterableUtils . matchesAll (prevRanges .values (), FIRST_LEVEL ::test )) {
23082308 // all previous document ids can be constructed from the
23092309 // previous ranges map. this works for first level previous
23102310 // documents only.
Original file line number Diff line number Diff line change 1919import java .util .ArrayList ;
2020import java .util .List ;
2121
22+ import org .apache .commons .collections4 .IterableUtils ;
2223import org .apache .jackrabbit .oak .plugins .document .memory .MemoryDocumentStore ;
2324import org .junit .Test ;
2425
25- import static org .apache .jackrabbit .guava .common .collect .Iterables .all ;
2626import static org .apache .jackrabbit .oak .plugins .document .TestUtils .IS_LAST_REV_UPDATE ;
2727import static org .junit .Assert .assertTrue ;
2828
@@ -64,7 +64,7 @@ private static final class TestStore extends MemoryDocumentStore {
6464 @ Override
6565 public <T extends Document > List <T > createOrUpdate (Collection <T > collection ,
6666 List <UpdateOp > updateOps ) {
67- if (all (updateOps , IS_LAST_REV_UPDATE ::test )) {
67+ if (IterableUtils . matchesAll (updateOps , IS_LAST_REV_UPDATE ::test )) {
6868 assertTrue (updateOps .size () <= UnsavedModifications .BACKGROUND_MULTI_UPDATE_LIMIT );
6969 }
7070 return super .createOrUpdate (collection , updateOps );
You can’t perform that action at this time.
0 commit comments