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 re...@apache.org on 2024/12/13 18:16:42 UTC
(jackrabbit-oak) 01/01: OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11308
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 902cab1bb556942ddac14c40d0216e37d892bb5c
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Dec 13 19:16:23 2024 +0100
OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs
---
.../test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java | 5 ++---
.../oak/jcr/observation/ConsolidatedListenerMBeanImpl.java | 4 +---
.../jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java | 3 +--
.../jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java | 4 ++--
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
index b37e34c91f..275602a01d 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
@@ -62,7 +62,6 @@ import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.guava.common.base.Splitter;
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.commons.sort.EscapeUtils;
import org.jetbrains.annotations.Nullable;
@@ -191,8 +190,8 @@ public class FileIOUtilsTest {
entries[i] = r.nextLong();
}
- Iterator<Long> boxedEntries = Longs.asList(entries).iterator();
- Iterator<String> hexEntries = Iterators.transform(boxedEntries, input -> Long.toHexString(input));
+ Iterator<String> hexEntries = Arrays.stream(entries).
+ mapToObj(input -> Long.toHexString(input)).iterator();
File f = assertWrite(hexEntries, false, numEntries);
Comparator<String> prefixComparator = new Comparator<String>() {
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
index 5f274164cd..508886855f 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
@@ -41,8 +41,6 @@ import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Component;
@@ -614,7 +612,7 @@ public class ConsolidatedListenerMBeanImpl implements ConsolidatedListenerMBean
Collections.sort(leaderBoard, new Comparator<LeaderBoardData>() {
@Override
public int compare(LeaderBoardData o1, LeaderBoardData o2) {
- return Longs.compare(o1.getProcessingTime(), o2.getProcessingTime());
+ return Long.compare(o1.getProcessingTime(), o2.getProcessingTime());
}
});
// assign new index value according to sort order
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
index ea4436a605..b52c853ba5 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
@@ -39,7 +39,6 @@ import org.bson.conversions.Bson;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
import com.mongodb.BasicDBObject;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCollection;
@@ -232,7 +231,7 @@ public class DocumentNodeStoreHelper {
@Override
public int compare(BlobReferences o1, BlobReferences o2) {
- int c = Longs.compare(o1.garbageSize, o2.garbageSize);
+ int c = Long.compare(o1.garbageSize, o2.garbageSize);
if (c != 0) {
return c;
}
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java
index 8dc1ccc6d3..bb6b476acc 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java
@@ -26,10 +26,10 @@ import java.util.function.Function;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.io.Closer;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
+import org.apache.jackrabbit.oak.commons.LongUtils;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.jetbrains.annotations.Nullable;
@@ -92,7 +92,7 @@ class CSVFileBinaryResourceProvider implements BinaryResourceProvider, Closeable
String encoding = input.get(JCR_ENCODING);
String blobId = input.get(BLOB_ID);
String length = input.get(LENGTH);
- Long len = length != null ? Longs.tryParse(length) : null;
+ Long len = length != null ? LongUtils.tryParse(length) : null;
if (path == null || blobId == null || mimeType == null) {
log.warn("Ignoring invalid record {}. Either of mimeType, blobId or path is null", input);
return null;