This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11116 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit fe69451dc708f49c9ea8b4acd1744e08bcbbe39a Author: Rishabh Kumar <d...@adobe.com> AuthorDate: Sun Oct 6 09:09:53 2024 +0530 OAK-11116 : Removed usage of Guava Sets.newHashSetWithExpectedSize() --- .../org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java | 4 ++-- .../org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java | 4 ++-- .../org/apache/jackrabbit/oak/plugins/document/RevisionVector.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java index 7bae214b30..b06367470f 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java @@ -18,12 +18,12 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex; -import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSetWithExpectedSize; import java.util.Set; import java.util.UUID; import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.collections.CollectionUtils; class IndexV1 implements Index { @@ -37,7 +37,7 @@ class IndexV1 implements Index { @Override public Set<UUID> getUUIDs() { - Set<UUID> uuids = newHashSetWithExpectedSize(entries.remaining() / IndexEntryV1.SIZE); + Set<UUID> uuids = CollectionUtils.newHashSet(entries.remaining() / IndexEntryV1.SIZE); int position = entries.position(); while (position < entries.limit()) { long msb = entries.getLong(position); diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java index 440fde370e..a6ee6eeab9 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java @@ -18,12 +18,12 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex; -import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSetWithExpectedSize; import java.util.Set; import java.util.UUID; import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.collections.CollectionUtils; class IndexV2 implements Index { @@ -37,7 +37,7 @@ class IndexV2 implements Index { @Override public Set<UUID> getUUIDs() { - Set<UUID> uuids = newHashSetWithExpectedSize(entries.remaining() / IndexEntryV2.SIZE); + Set<UUID> uuids = CollectionUtils.newHashSet(entries.remaining() / IndexEntryV2.SIZE); int position = entries.position(); while (position < entries.limit()) { long msb = entries.getLong(position); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java index 9107736898..f4df7162b7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.collect.PeekingIterator; -import org.apache.jackrabbit.guava.common.collect.Sets; import org.apache.jackrabbit.guava.common.primitives.Ints; import org.apache.jackrabbit.oak.cache.CacheValue; +import org.apache.jackrabbit.oak.commons.collections.CollectionUtils; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -526,7 +526,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi if (revisions.length < 2) { return; } - Set<Integer> known = Sets.newHashSetWithExpectedSize(revisions.length); + Set<Integer> known = CollectionUtils.newHashSet(revisions.length); for (Revision revision : revisions) { if (!known.add(revision.getClusterId())) { throw new IllegalArgumentException(