This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11059 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 05168a0b1d9f3d26e9e647c1a49ac3df10b03761 Author: Julian Reschke <[email protected]> AuthorDate: Thu Aug 22 15:44:05 2024 +0100 OAK-11059: Remove usage of Guava BiMap --- .../jackrabbit/oak/plugins/document/BlobThroughPutTest.java | 12 ++++++------ .../org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobThroughPutTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobThroughPutTest.java index 609109d348..cac59c145c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobThroughPutTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobThroughPutTest.java @@ -19,15 +19,15 @@ package org.apache.jackrabbit.oak.plugins.document; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.jackrabbit.guava.common.collect.BiMap; -import org.apache.jackrabbit.guava.common.collect.HashBiMap; -import org.apache.jackrabbit.guava.common.collect.Maps; +import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.apache.jackrabbit.guava.common.io.ByteStreams; import com.mongodb.BasicDBObject; import com.mongodb.MongoClient; @@ -56,10 +56,10 @@ public class BlobThroughPutTest { private final List<Result> results = new ArrayList<Result>(); - private static final BiMap<WriteConcern,String> namedConcerns; + private static final Map<WriteConcern,String> namedConcerns; static { - BiMap<WriteConcern,String> bimap = HashBiMap.create(); + Map<WriteConcern,String> bimap = new DualHashBidiMap<WriteConcern,String>(); bimap.put(WriteConcern.FSYNC_SAFE,"FSYNC_SAFE"); bimap.put(WriteConcern.JOURNAL_SAFE,"JOURNAL_SAFE"); // bimap.put(WriteConcern.MAJORITY,"MAJORITY"); @@ -67,7 +67,7 @@ public class BlobThroughPutTest { bimap.put(WriteConcern.NORMAL,"NORMAL"); // bimap.put(WriteConcern.REPLICAS_SAFE,"REPLICAS_SAFE"); bimap.put(WriteConcern.SAFE,"SAFE"); - namedConcerns = Maps.unmodifiableBiMap(bimap); + namedConcerns = Collections.unmodifiableMap(bimap); } private final String localServer = "localhost:27017/test"; 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 aeaea299db..e91ea9ab34 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 @@ -61,10 +61,10 @@ 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.HashBiMap; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.ImmutableMap; 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; import org.apache.jackrabbit.core.RepositoryContext; @@ -439,7 +439,7 @@ public class RepositoryUpgrade { } } - HashBiMap<String, String> uriToPrefix = HashBiMap.create(); + Map<String, String> uriToPrefix = new DualHashBidiMap<>(); logger.info("Copying registered namespaces"); copyNamespaces(targetBuilder, uriToPrefix); logger.debug("Namespace registration completed.");
