This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11886 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e5b85ad5c67bc5123abb4e235046b0d0ee7177eb Author: rishabhdaim <rishabhdaim1...@gmail.com> AuthorDate: Fri Aug 29 22:44:05 2025 +0530 OAK-11886 : replaced Guavs's Futures.immediateFuture with JDK completableFuture --- .../org/apache/jackrabbit/oak/plugins/document/BatchCommit.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java index 34e4f0977f..c79053899f 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java @@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -27,7 +28,6 @@ import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.util.concurrent.Futures; import org.apache.jackrabbit.guava.common.util.concurrent.SettableFuture; import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument; @@ -141,7 +141,7 @@ final class BatchCommit { finished.await(); } catch (InterruptedException e) { String msg = "Interrupted while waiting for batch commit to finish"; - return Futures.immediateFailedFuture(new DocumentStoreException(msg)); + return CompletableFuture.failedFuture(new DocumentStoreException(msg)); } } return results.get(idx); @@ -163,7 +163,7 @@ final class BatchCommit { void populateResults(NodeDocument before) { DocumentStore store = queue.getStore(); for (UpdateOp op : ops) { - results.add(Futures.immediateFuture(before)); + results.add(CompletableFuture.completedFuture(before)); NodeDocument after = new NodeDocument(store); before.deepCopy(after); UpdateUtils.applyChanges(after, op);