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/16 08:37:44 UTC
(jackrabbit-oak) branch trunk updated: OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs (#1906)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3ff9dd8266 OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs (#1906)
3ff9dd8266 is described below
commit 3ff9dd8266a6c84e8921d3fd0e8c1123452f09a1
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Dec 16 09:37:39 2024 +0100
OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs (#1906)
* OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs
* OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs - oak-securiry-spi
---
.../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 ++--
.../apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java | 6 ++++--
.../jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java | 5 ++---
.../jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java | 3 +--
7 files changed, 13 insertions(+), 17 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;
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
index a0848baa0a..767ca11176 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
@@ -20,7 +20,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
+import java.util.stream.Collectors;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -513,7 +514,8 @@ public final class PrivilegeBits implements PrivilegeConstants {
@NotNull
public PropertyState asPropertyState(@NotNull String name) {
- return PropertyStates.createProperty(name, Longs.asList(d.longValues()), Type.LONGS);
+ return PropertyStates.createProperty(name,
+ Arrays.stream(d.longValues()).boxed().collect(Collectors.toList()), Type.LONGS);
}
/**
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java
index 1c841d62ad..3e3ea7b1b4 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.privilege;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -39,10 +38,10 @@ public class JcrAllUtilTest implements PrivilegeConstants {
private static final Long ALL = Long.MAX_VALUE;
- private static final PropertyState ALL_PROPERTY = PropertyStates.createProperty(REP_BITS, Longs.asList(Long.MAX_VALUE), Type.LONGS);
+ private static final PropertyState ALL_PROPERTY = PropertyStates.createProperty(REP_BITS, List.of(Long.MAX_VALUE), Type.LONGS);
private final PrivilegeBits ALL_BITS = PrivilegeBits.getInstance(ALL_PROPERTY);
- private static final PropertyState DYNAMIC_ALL_PROPERTY = PropertyStates.createProperty("anyName", Longs.asList(DYNAMIC_JCR_ALL_VALUE), Type.LONGS);
+ private static final PropertyState DYNAMIC_ALL_PROPERTY = PropertyStates.createProperty("anyName", List.of(DYNAMIC_JCR_ALL_VALUE), Type.LONGS);
private Tree privTree;
private Tree jcrAllDefTree;
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java
index ad260abce3..8cc8c53c63 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.privilege;
-import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -339,7 +338,7 @@ public class PrivilegeBitsTest implements PrivilegeConstants {
@Test(expected = UnsupportedOperationException.class)
public void testAddModifiableToUnmodifiable() {
- PrivilegeBits pb = PrivilegeBits.getInstance(PropertyStates.createProperty("any", Longs.asList(1, 16, 512), Type.LONGS));
+ PrivilegeBits pb = PrivilegeBits.getInstance(PropertyStates.createProperty("any", List.of(1L, 16L, 512L), Type.LONGS));
pb.unmodifiable().add(READ_NODES_PRIVILEGE_BITS.modifiable());
}