This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10941 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 37c4513f320f269a283bfaa63cc609756d194d35 Author: Julian Reschke <[email protected]> AuthorDate: Tue Jul 9 17:21:50 2024 +0100 OAK-10941: oak-run: avoid use of Guava's ClassToInstanceMap --- .../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;
