Skip to content

Commit 691a326

Browse files
rishabhdaimRishabh Kumar
andauthored
OAK-11578 : removed usage of Guava's Iterables.getLast() with oak-commons (#2172)
Co-authored-by: Rishabh Kumar <diam@adobe.com>
1 parent 42a12a4 commit 691a326

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.jackrabbit.oak.api.Tree;
2929
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
3030
import org.apache.jackrabbit.oak.commons.PathUtils;
31+
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
3132
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
3233
import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
3334
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -504,7 +505,7 @@ public BlobDeletionCallback getBlobDeletionCallback() {
504505
blobDeletionCallback = new BlobDeletionCallback() {
505506
@Override
506507
public void deleted(String blobId, Iterable<String> ids) {
507-
deletedFiles.add(Iterables.getLast(ids));
508+
deletedFiles.add(IterableUtils.getLast(ids));
508509
deletionCallback.deleted(blobId, ids);
509510
}
510511

oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectoryTestBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.apache.jackrabbit.oak.api.Blob;
5858
import org.apache.jackrabbit.oak.api.PropertyState;
5959
import org.apache.jackrabbit.oak.api.Type;
60+
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
6061
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
6162
import org.apache.jackrabbit.oak.plugins.blob.BlobStoreBlob;
6263
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
@@ -552,7 +553,7 @@ public void dontMarkInlinedBlobsFromDataStoreAsDeleted() throws Exception {
552553
new ActiveDeletedBlobCollectorFactory.BlobDeletionCallback() {
553554
@Override
554555
public void deleted(String blobId, Iterable<String> ids) {
555-
deletedFiles.add(Iterables.getLast(ids));
556+
deletedFiles.add(IterableUtils.getLast(ids));
556557
}
557558

558559
@Override
@@ -596,7 +597,7 @@ public void markAllBlobsFromBlobStoreAsDeleted() throws Exception {
596597
new ActiveDeletedBlobCollectorFactory.BlobDeletionCallback() {
597598
@Override
598599
public void deleted(String blobId, Iterable<String> ids) {
599-
deletedFiles.add(Iterables.getLast(ids));
600+
deletedFiles.add(IterableUtils.getLast(ids));
600601
}
601602

602603
@Override

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ public <T extends Document> T find(Collection<T> collection,
544544
// simulate a change revision within the range of
545545
// the most recent previous document
546546
Iterable<Revision> changes = prev.getAllChanges();
547-
Revision baseRev = Iterables.getLast(changes);
547+
Revision baseRev = IterableUtils.getLast(changes);
548548
Revision changeRev = new Revision(baseRev.getTimestamp(), 1000, ns.getClusterId());
549549
// reset calls to previous documents
550550
prevDocCalls.clear();
@@ -941,7 +941,7 @@ public <T extends Document> T find(Collection<T> collection,
941941
NodeDocument doc = getRootDocument(store);
942942
Map<Revision, String> valueMap = doc.getValueMap("p");
943943
assertEquals(200, valueMap.size());
944-
Revision oldest = Iterables.getLast(valueMap.keySet());
944+
Revision oldest = IterableUtils.getLast(valueMap.keySet());
945945

946946
prevDocCalls.clear();
947947
DocumentNodeState state = doc.getNodeAtRevision(ns,

0 commit comments

Comments
 (0)