You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2025/03/11 10:06:15 UTC
(jackrabbit-oak) branch OAK-11578 created (now 1b1ae74a37)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-11578
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 1b1ae74a37 OAK-11578 : removed usage of Guava's Iterables.getLast() with oak-commons
This branch includes the following new commits:
new 1b1ae74a37 OAK-11578 : removed usage of Guava's Iterables.getLast() with oak-commons
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11578 : removed usage of Guava's Iterables.getLast() with oak-commons
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11578
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1b1ae74a37dbef2ab1d7cc03e8d01d7a12a666a5
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Tue Mar 11 15:36:03 2025 +0530
OAK-11578 : removed usage of Guava's Iterables.getLast() with oak-commons
---
.../index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java | 3 ++-
.../oak/plugins/index/lucene/directory/OakDirectoryTestBase.java | 5 +++--
.../org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java
index 3cdc975a76..8f2af3933d 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -504,7 +505,7 @@ public class ActiveDeletedBlobCollectorMBeanImplTest {
blobDeletionCallback = new BlobDeletionCallback() {
@Override
public void deleted(String blobId, Iterable<String> ids) {
- deletedFiles.add(Iterables.getLast(ids));
+ deletedFiles.add(IterableUtils.getLast(ids));
deletionCallback.deleted(blobId, ids);
}
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java
index 8bf6207c15..ff9aac9ddb 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java
@@ -57,6 +57,7 @@ import org.apache.jackrabbit.core.data.FileDataStore;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
import org.apache.jackrabbit.oak.plugins.blob.BlobStoreBlob;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
@@ -552,7 +553,7 @@ abstract public class OakDirectoryTestBase {
new ActiveDeletedBlobCollectorFactory.BlobDeletionCallback() {
@Override
public void deleted(String blobId, Iterable<String> ids) {
- deletedFiles.add(Iterables.getLast(ids));
+ deletedFiles.add(IterableUtils.getLast(ids));
}
@Override
@@ -596,7 +597,7 @@ abstract public class OakDirectoryTestBase {
new ActiveDeletedBlobCollectorFactory.BlobDeletionCallback() {
@Override
public void deleted(String blobId, Iterable<String> ids) {
- deletedFiles.add(Iterables.getLast(ids));
+ deletedFiles.add(IterableUtils.getLast(ids));
}
@Override
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
index f1e78c6904..fb18583bee 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
@@ -544,7 +544,7 @@ public class NodeDocumentTest {
// simulate a change revision within the range of
// the most recent previous document
Iterable<Revision> changes = prev.getAllChanges();
- Revision baseRev = Iterables.getLast(changes);
+ Revision baseRev = IterableUtils.getLast(changes);
Revision changeRev = new Revision(baseRev.getTimestamp(), 1000, ns.getClusterId());
// reset calls to previous documents
prevDocCalls.clear();
@@ -941,7 +941,7 @@ public class NodeDocumentTest {
NodeDocument doc = getRootDocument(store);
Map<Revision, String> valueMap = doc.getValueMap("p");
assertEquals(200, valueMap.size());
- Revision oldest = Iterables.getLast(valueMap.keySet());
+ Revision oldest = IterableUtils.getLast(valueMap.keySet());
prevDocCalls.clear();
DocumentNodeState state = doc.getNodeAtRevision(ns,