opendev/gerrit
Code Issues Proposed changes

Enable multiple bindings during auto registration

Browse Source 
If a plugin registers more than one implementation of an interface,
enable them to all be automatically bound by tracking them inside
of a multimap.

Change-Id: Ib4e68f454da98be95669111713c8cab56bdc6763
This commit is contained in:
Shawn O. Pearce
2012-05-12 17:47:00 -07:00
parent 68a8d414a0
commit ba99c03981
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
View File

@@ -16,7 +16,8 @@ package com.google.gerrit.server.plugins;
import static com.google.gerrit.server.plugins.PluginGuiceEnvironment.is; import static com.google.gerrit.server.plugins.PluginGuiceEnvironment.is;
import com.google.common.collect.Maps; import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gerrit.extensions.annotations.Export; import com.google.gerrit.extensions.annotations.Export;
import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.extensions.annotations.ExtensionPoint;
@@ -58,7 +59,7 @@ class AutoRegisterModules {
private final ModuleGenerator httpGen; private final ModuleGenerator httpGen;
private Set<Class<?>> sysSingletons; private Set<Class<?>> sysSingletons;
private Map<TypeLiteral<?>, Class<?>> sysListen; private Multimap<TypeLiteral<?>, Class<?>> sysListen;
Module sysModule; Module sysModule;
Module sshModule; Module sshModule;
@@ -78,7 +79,7 @@ class AutoRegisterModules {
AutoRegisterModules discover() throws InvalidPluginException { AutoRegisterModules discover() throws InvalidPluginException {
sysSingletons = Sets.newHashSet(); sysSingletons = Sets.newHashSet();
sysListen = Maps.newHashMap(); sysListen = LinkedListMultimap.create();
if (sshGen != null) { if (sshGen != null) {
sshGen.setPluginName(pluginName); sshGen.setPluginName(pluginName);
@@ -108,7 +109,7 @@ class AutoRegisterModules {
for (Class<?> clazz : sysSingletons) { for (Class<?> clazz : sysSingletons) {
bind(clazz).in(Scopes.SINGLETON); bind(clazz).in(Scopes.SINGLETON);
} }
for (Map.Entry<TypeLiteral<?>, Class<?>> e : sysListen.entrySet()) { for (Map.Entry<TypeLiteral<?>, Class<?>> e : sysListen.entries()) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
TypeLiteral<Object> type = (TypeLiteral<Object>) e.getKey(); TypeLiteral<Object> type = (TypeLiteral<Object>) e.getKey();