opendev/gerrit
Code Issues Proposed changes

Invoke more plugins through plugin context

Browse Source 
Change-Id: I9986d6372724030ff360c49d578a0a8edb70c881
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-10-17 17:14:42 +02:00
parent 48c55620ef
commit b4de05ee72
17 changed files with 97 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/config/GerritServerConfigReloader.java
View File

@@ -17,9 +17,9 @@ package com.google.gerrit.server.config;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.server.config.ConfigUpdatedEvent.ConfigUpdateEntry;
import com.google.gerrit.server.config.ConfigUpdatedEvent.UpdateResult;
import com.google.gerrit.server.plugincontext.PluginSetContext;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -29,11 +29,12 @@ public class GerritServerConfigReloader {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final GerritServerConfigProvider configProvider;
private final DynamicSet<GerritConfigListener> configListeners;
private final PluginSetContext<GerritConfigListener> configListeners;
@Inject
GerritServerConfigReloader(
GerritServerConfigProvider configProvider, DynamicSet<GerritConfigListener> configListeners) {
GerritServerConfigProvider configProvider,
PluginSetContext<GerritConfigListener> configListeners) {
this.configProvider = configProvider;
this.configListeners = configListeners;
}
@@ -53,9 +54,7 @@ public class GerritServerConfigReloader {
public Multimap<UpdateResult, ConfigUpdateEntry> fireUpdatedConfigEvent(
ConfigUpdatedEvent event) {
Multimap<UpdateResult, ConfigUpdateEntry> updates = ArrayListMultimap.create();
for (GerritConfigListener configListener : configListeners) {
updates.putAll(configListener.configUpdated(event));
}
configListeners.runEach(l -> updates.putAll(l.configUpdated(event)));
return updates;
}
}