This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new e2f3542017 OAK-11926 : removed usage of Guava's Functions (#2537)
e2f3542017 is described below
commit e2f35420179ff812d8afa275f3acb12468d36d49
Author: Rishabh Kumar <[email protected]>
AuthorDate: Thu Sep 25 17:21:37 2025 +0530
OAK-11926 : removed usage of Guava's Functions (#2537)
* OAK-11926 : removed usage of Guava's Functions
* OAK-11926 : fixed review comments
---
.../org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java | 5 ++---
.../java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java | 6 +-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java
index f54f681ac1..edbd5e694e 100644
---
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java
+++
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/TarRevisionsTest.java
@@ -37,7 +37,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;
-import org.apache.jackrabbit.guava.common.base.Functions;
import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
@@ -208,7 +207,7 @@ public class TarRevisionsTest {
CompletableFuture<Boolean> t1 = CompletableFuture.supplyAsync(()
-> {
try {
latch.await();
- return null !=
revisions.setHead(Functions.<RecordId>identity());
+ return null != revisions.setHead(Function.identity());
} catch (Exception e) {
throw new CompletionException(e);
}
@@ -222,7 +221,7 @@ public class TarRevisionsTest {
CompletableFuture<Boolean> t2 = CompletableFuture.supplyAsync(()
-> {
try {
latch.countDown();
- return null !=
revisions.setHead(Functions.<RecordId>identity());
+ return null != revisions.setHead(Function.identity());
} catch (Exception e) {
throw new CompletionException(e);
}
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
index 8f591a1b33..b928613266 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
@@ -21,8 +21,6 @@ import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.jackrabbit.guava.common.base.Functions;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import
org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
@@ -34,15 +32,13 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Functions.compose;
-import static org.apache.jackrabbit.guava.common.base.Functions.constant;
import static org.junit.Assert.fail;
public class TestUtils {
public static final Predicate<UpdateOp> IS_LAST_REV_UPDATE = input ->input
!= null && isLastRevUpdate(input);
- public static final Function<String, Long> NO_BINARY =
compose(constant(-1L), Functions.<String>identity());
+ public static final Function<String, Long> NO_BINARY = s -> -1L;
/**
* Returns {@code true} if the given {@code update} performs a
