opendev/gerrit
Code Issues Proposed changes

Bind PluginUser.Factory in PluginModule

Browse Source 
This factory is required by some plugin classes, and only used when
plugins are loaded. It makes more sense to bundle it in PluginModule,
where the other Plugin-related classes are bound

Change-Id: If7f8c086356e403ea06c9a218140be6fa3b60df8
This commit is contained in:
Maxime Guerreiro
2018-05-15 16:02:13 +00:00
parent 304e5db452
commit 0f3a9e2649
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/config/GerritGlobalModule.java
View File

@@ -76,7 +76,6 @@ import com.google.gerrit.server.ChangeFinder;
import com.google.gerrit.server.CmdLineParserModule;
import com.google.gerrit.server.CreateGroupPermissionSyncer;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PluginUser;
import com.google.gerrit.server.Sequences;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.AccountControl;
@@ -262,7 +261,6 @@ public class GerritGlobalModule extends FactoryModule {
factory(MergedSender.Factory.class);
factory(MergeUtil.Factory.class);
factory(PatchScriptFactory.Factory.class);
factory(PluginUser.Factory.class);
factory(ProjectState.Factory.class);
factory(RegisterNewEmailSender.Factory.class);
factory(ReplacePatchSetSender.Factory.class);

2
java/com/google/gerrit/server/plugins/PluginModule.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server.plugins;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.systemstatus.ServerInformation;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.PluginUser;
import com.google.gerrit.server.config.GerritRuntime;
public class PluginModule extends LifecycleModule {
@@ -24,6 +25,7 @@ public class PluginModule extends LifecycleModule {
protected void configure() {
requireBinding(GerritRuntime.class);
factory(PluginUser.Factory.class);
bind(ServerInformationImpl.class);
bind(ServerInformation.class).to(ServerInformationImpl.class);

3
java/com/google/gerrit/server/plugins/PluginRestApiModule.java
View File

@@ -18,10 +18,13 @@ import static com.google.gerrit.server.plugins.PluginResource.PLUGIN_KIND;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.gerrit.server.PluginUser;
import com.google.inject.Key;
public class PluginRestApiModule extends RestApiModule {
@Override
protected void configure() {
requireBinding(Key.get(PluginUser.Factory.class));
bind(PluginsCollection.class);
DynamicMap.mapOf(binder(), PLUGIN_KIND);
put(PLUGIN_KIND).to(InstallPlugin.Overwrite.class);

2
java/com/google/gerrit/testing/InMemoryModule.java
View File

@@ -32,6 +32,7 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.FanOutExecutor;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.GerritPersonIdentProvider;
import com.google.gerrit.server.PluginUser;
import com.google.gerrit.server.api.GerritApiModule;
import com.google.gerrit.server.api.PluginApiModule;
import com.google.gerrit.server.cache.h2.H2CacheModule;
@@ -173,6 +174,7 @@ public class InMemoryModule extends FactoryModule {
bind(MetricMaker.class).to(DisabledMetricMaker.class);
install(cfgInjector.getInstance(GerritGlobalModule.class));
install(new GerritApiModule());
factory(PluginUser.Factory.class);
install(new PluginApiModule());
install(new DefaultPermissionBackendModule());
install(new SearchingChangeCacheImpl.Module());