(jackrabbit-oak) branch trunk updated: OAK-10941: oak-run: avoid use of Guava's ClassToInstanceMap (#1575)

[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 8704b3b9e9 OAK-10941: oak-run: avoid use of Guava's ClassToInstanceMap 
(#1575)
8704b3b9e9 is described below

commit 8704b3b9e9155e336d3c41654dc48f38ee176c7b
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Wed Jul 10 07:33:42 2024 +0200

    OAK-10941: oak-run: avoid use of Guava's ClassToInstanceMap (#1575)
---
 .../src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
index 962f3869ba..cd80f78527 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
@@ -19,9 +19,7 @@
 
 package org.apache.jackrabbit.oak.run.cli;
 
-import org.apache.jackrabbit.guava.common.collect.ClassToInstanceMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.MutableClassToInstanceMap;
 import org.apache.jackrabbit.guava.common.collect.Sets;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -30,6 +28,8 @@ import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 
 import java.io.IOException;
 import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 import static 
org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
@@ -38,7 +38,7 @@ import static java.util.Arrays.asList;
 public class Options {
     private final Set<OptionsBeanFactory> beanFactories = Sets.newHashSet();
     private final EnumSet<OptionBeans> oakRunOptions;
-    private final ClassToInstanceMap<OptionsBean> optionBeans = 
MutableClassToInstanceMap.create();
+    private final Map<Class<? extends OptionsBean>, OptionsBean> optionBeans = 
new HashMap<>();
     private OptionSet optionSet;
     private boolean disableSystemExit;
     private String commandName;