This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11926 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 4da52d8315e9f84c3e0761299c5e60610a34eca1 Author: rishabhdaim <[email protected]> AuthorDate: Thu Sep 25 11:53:10 2025 +0530 OAK-11926 : removed usage of Guava's Functions --- .../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..eaa1c7a122 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 = Function.<String>identity().andThen(s -> -1L); /** * Returns {@code true} if the given {@code update} performs a
