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/14 13:00:10 UTC
(jackrabbit-oak) 01/01: OAK-11311: Remove usage of Guava ImmutableList - oak-upgrade
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11311
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 92a3b8bfbbfd26c02b2985fd237f5c5fbfda43aa
Author: Julian Reschke <re...@apache.org>
AuthorDate: Sat Dec 14 13:59:50 2024 +0100
OAK-11311: Remove usage of Guava ImmutableList - oak-upgrade
---
.../org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java | 9 +++++----
.../org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java | 8 +++-----
.../org/apache/jackrabbit/oak/upgrade/PrivilegeUpgradeTest.java | 5 ++---
.../apache/jackrabbit/oak/upgrade/util/VersionCopyTestUtils.java | 3 +--
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
index 2457bc7df8..b9207991b5 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
@@ -34,6 +34,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
@@ -44,6 +45,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import javax.jcr.NamespaceException;
import javax.jcr.Node;
@@ -58,9 +60,7 @@ import javax.jcr.nodetype.PropertyDefinitionTemplate;
import javax.jcr.security.Privilege;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.commons.collections4.bidimap.DualHashBidiMap;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
@@ -774,8 +774,9 @@ public class RepositoryUpgrade {
while (it.hasNext()) {
Privilege aggrPriv = it.next();
- List<String> aggrNames = Lists.transform(ImmutableList.copyOf(aggrPriv.getDeclaredAggregatePrivileges()),
- input -> (input == null) ? null : input.getName());
+ List<String> aggrNames = Arrays.stream(aggrPriv.getDeclaredAggregatePrivileges()).
+ map(input -> (input == null) ? null : input.getName()).collect(Collectors.toList());
+
if (allAggregatesRegistered(pMgr, aggrNames)) {
pMgr.registerPrivilege(aggrPriv.getName(), aggrPriv.isAbstract(), aggrNames.toArray(new String[aggrNames.size()]));
it.remove();
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
index e02443207f..849bab245d 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
@@ -17,13 +17,14 @@
package org.apache.jackrabbit.oak.upgrade.cli;
import java.io.IOException;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.List;
import java.util.ServiceLoader;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.RepositoryContext;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
@@ -35,7 +36,6 @@ import org.apache.jackrabbit.oak.upgrade.cli.parser.DatastoreArguments;
import org.apache.jackrabbit.oak.upgrade.cli.parser.MigrationOptions;
import org.apache.jackrabbit.oak.upgrade.cli.parser.StoreArguments;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.io.Closer;
public class MigrationFactory {
@@ -123,9 +123,7 @@ public class MigrationFactory {
private List<CommitHook> loacCommitHooks() {
ServiceLoader<CommitHook> loader = ServiceLoader.load(CommitHook.class);
- Iterator<CommitHook> iterator = loader.iterator();
- ImmutableList.Builder<CommitHook> builder = ImmutableList.<CommitHook> builder().addAll(iterator);
- return builder.build();
+ return Collections.unmodifiableList(CollectionUtils.toList(loader.iterator()));
}
}
diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/PrivilegeUpgradeTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/PrivilegeUpgradeTest.java
index cc7fd53684..dbe7f4bbb7 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/PrivilegeUpgradeTest.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/PrivilegeUpgradeTest.java
@@ -30,7 +30,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.JackrabbitWorkspace;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
@@ -187,7 +186,7 @@ public class PrivilegeUpgradeTest extends AbstractRepositoryUpgradeTest {
assertNotNull(aggregate);
assertFalse(aggregate.isAbstract());
assertTrue(aggregate.isAggregate());
- List<Privilege> agg = ImmutableList.copyOf(aggregate.getDeclaredAggregatePrivileges());
+ List<Privilege> agg = List.of(aggregate.getDeclaredAggregatePrivileges());
assertEquals(2, agg.size());
assertTrue(agg.contains(privilege));
assertTrue(agg.contains(manager.getPrivilege(JCR_READ)));
@@ -196,7 +195,7 @@ public class PrivilegeUpgradeTest extends AbstractRepositoryUpgradeTest {
assertNotNull(aggregate2);
assertTrue(aggregate2.isAbstract());
assertTrue(aggregate2.isAggregate());
- List<Privilege> agg2 = ImmutableList.copyOf(aggregate2.getDeclaredAggregatePrivileges());
+ List<Privilege> agg2 = List.of(aggregate2.getDeclaredAggregatePrivileges());
assertEquals(2, agg2.size());
assertTrue(agg2.contains(aggregate));
assertTrue(agg2.contains(privilege2));
diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/VersionCopyTestUtils.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/VersionCopyTestUtils.java
index 6b4a6c4b4b..d728fc8fd7 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/VersionCopyTestUtils.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/VersionCopyTestUtils.java
@@ -27,7 +27,6 @@ import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;
import javax.jcr.version.VersionManager;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.migration.version.VersionCopyConfiguration;
@@ -37,7 +36,7 @@ import static org.junit.Assert.assertFalse;
public class VersionCopyTestUtils {
- public static List<String> LABELS = ImmutableList.of("1.0", "1.1", "1.2");
+ public static List<String> LABELS = List.of("1.0", "1.1", "1.2");
public static Node getOrAddNode(Node parent, String relPath) throws RepositoryException {
Node currentParent = parent;