(jackrabbit-oak) branch OAK-10961 updated: OAK-10961: Remove usage of Guava Predicate interface (oak-store-composite)

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-10961
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-10961 by this push:
     new 611f0f8c5f OAK-10961: Remove usage of Guava Predicate interface 
(oak-store-composite)
611f0f8c5f is described below

commit 611f0f8c5f01b719c71030cf6a9e383f6393e32d
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Mon Jul 22 08:28:18 2024 +0100

    OAK-10961: Remove usage of Guava Predicate interface (oak-store-composite)
---
 .../jackrabbit/oak/composite/CompositeNodeStore.java    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
index e9ab3977ce..4a3505218f 100644
--- 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
+++ 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.composite;
 
-import org.apache.jackrabbit.guava.common.base.Predicate;
 import org.apache.jackrabbit.guava.common.base.Predicates;
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
@@ -209,12 +208,8 @@ public class CompositeNodeStore implements NodeStore, 
PrefetchNodeStore, Observa
 
     public Iterable<String> checkpoints() {
         final NodeStore globalNodeStore = ctx.getGlobalStore().getNodeStore();
-        return filter(globalNodeStore.checkpoints(), new Predicate<String>() {
-            @Override
-            public boolean apply(String checkpoint) {
-                return isCompositeCheckpoint(checkpoint);
-            }
-        });
+        return filter(globalNodeStore.checkpoints(),
+                checkpoint -> isCompositeCheckpoint(checkpoint));
     }
 
     private boolean isCompositeCheckpoint(String checkpoint) {
@@ -248,12 +243,8 @@ public class CompositeNodeStore implements NodeStore, 
PrefetchNodeStore, Observa
             LOG.debug("Checkpoint {} doesn't exist. Debug info:\n{}", 
checkpoint, checkpointDebugInfo(), new Exception("call stack"));
             return Collections.emptyMap();
         }
-        return 
copyOf(filterKeys(ctx.getGlobalStore().getNodeStore().checkpointInfo(checkpoint),
 new Predicate<String>() {
-            @Override
-            public boolean apply(String input) {
-                return !input.startsWith(CHECKPOINT_METADATA);
-            }
-        }));
+        return 
copyOf(filterKeys(ctx.getGlobalStore().getNodeStore().checkpointInfo(checkpoint),
+                input -> !input.startsWith(CHECKPOINT_METADATA)));
     }
 
     Map<String, String> allCheckpointInfo(String checkpoint) {