(jackrabbit-oak) branch trunk updated: OAK-11885: Remove usage of Guava collect.ListMultiMap (#2481)

[reschke]

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 0ef8a642dd OAK-11885: Remove usage of Guava collect.ListMultiMap 
(#2481)
0ef8a642dd is described below

commit 0ef8a642dde9f3a7680d331441f08d08114a9bf6
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Fri Aug 29 22:54:40 2025 +0200

    OAK-11885: Remove usage of Guava collect.ListMultiMap (#2481)
---
 .../oak/plugins/blob/MarkSweepGarbageCollector.java           |  4 ----
 .../oak/plugins/index/lucene/IndexAugmentorFactory.java       | 11 +++++------
 .../oak/plugins/index/lucene/hybrid/NRTIndexFactory.java      |  6 ++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git 
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
 
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
index 14d92dc60c..1f95901dc0 100644
--- 
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
+++ 
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
@@ -265,10 +265,6 @@ public class MarkSweepGarbageCollector implements 
BlobGarbageCollector {
                 
references.put(SharedStoreRecordType.REFERENCES.getIdFromName(input.getIdentifier().toString()),
 input);
             }
 
-//            ImmutableListMultimap<String, DataRecord> references =
-//                FluentIterable.from(refFiles).index(
-//                        input -> 
SharedStoreRecordType.REFERENCES.getIdFromName(input.getIdentifier().toString()));
-
             // Get all the markers available
             List<DataRecord> markerFiles =
                 ((SharedDataStore) 
blobStore).getAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType());
diff --git 
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
 
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
index 00d4da1617..fd6ff355ea 100644
--- 
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
+++ 
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
@@ -23,8 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.jackrabbit.guava.common.collect.LinkedListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
+import org.apache.commons.collections4.multimap.ArrayListValuedLinkedHashMap;
 import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -121,8 +120,8 @@ public class IndexAugmentorFactory {
     }
 
     private void refreshIndexFieldProviders() {
-        ListMultimap<String, IndexFieldProvider> providerMultimap =
-                LinkedListMultimap.create();
+        ArrayListValuedLinkedHashMap<String, IndexFieldProvider> 
providerMultimap =
+                new ArrayListValuedLinkedHashMap<>();
         for (IndexFieldProvider provider : indexFieldProviders) {
             Set<String> supportedNodeTypes = provider.getSupportedTypes();
             for (String nodeType : supportedNodeTypes) {
@@ -142,8 +141,8 @@ public class IndexAugmentorFactory {
     }
 
     private void refreshFulltextQueryTermsProviders() {
-        ListMultimap<String, FulltextQueryTermsProvider> providerMultimap =
-                LinkedListMultimap.create();
+        ArrayListValuedLinkedHashMap<String, FulltextQueryTermsProvider> 
providerMultimap =
+                new ArrayListValuedLinkedHashMap<>();
         for (FulltextQueryTermsProvider provider : 
fulltextQueryTermsProviders) {
             Set<String> supportedNodeTypes = provider.getSupportedTypes();
             for (String nodeType : supportedNodeTypes) {
diff --git 
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
 
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
index a94ea0a7c0..c893066ea4 100644
--- 
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
+++ 
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
 
 import java.io.Closeable;
@@ -25,8 +24,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.jackrabbit.guava.common.collect.LinkedListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
+import org.apache.commons.collections4.multimap.ArrayListValuedLinkedHashMap;
 import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
 import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
 import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
@@ -54,7 +52,7 @@ public class NRTIndexFactory implements Closeable{
     private static final int MAX_INDEX_COUNT = 3;
     private static final int REFRESH_DELTA_IN_SECS = 
Integer.getInteger("oak.lucene.refreshDeltaSecs", 1);
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private final ListMultimap<String, NRTIndex> indexes = 
LinkedListMultimap.create();
+    private final ArrayListValuedLinkedHashMap<String, NRTIndex> indexes = new 
ArrayListValuedLinkedHashMap<>();
     private final IndexCopier indexCopier;
     private final Clock clock;
     private final long refreshDeltaInSecs;