opendev/gerrit
Code Issues Proposed changes

Merge "PluginConfigFactory: Don't inject GerritServerConfigProvider"

Browse Source
This commit is contained in:
Dave Borowitz
2016-06-29 21:48:02 +00:00
committed by Gerrit Code Review
parent 6ee2b0aac5 d4b8c7e040
commit adfeb643a2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java
View File

@@ -22,6 +22,7 @@ import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -45,7 +46,7 @@ public class PluginConfigFactory implements ReloadPluginListener {
private static final String EXTENSION = ".config"; private static final String EXTENSION = ".config";
private final SitePaths site; private final SitePaths site;
private final GerritServerConfigProvider cfgProvider; private final Provider<Config> cfgProvider;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final ProjectState.Factory projectStateFactory; private final ProjectState.Factory projectStateFactory;
private final Map<String, Config> pluginConfigs; private final Map<String, Config> pluginConfigs;
@@ -54,8 +55,11 @@ public class PluginConfigFactory implements ReloadPluginListener {
private volatile Config cfg; private volatile Config cfg;
@Inject @Inject
PluginConfigFactory(SitePaths site, GerritServerConfigProvider cfgProvider, PluginConfigFactory(
ProjectCache projectCache, ProjectState.Factory projectStateFactory) { SitePaths site,
@GerritServerConfig Provider<Config> cfgProvider,
ProjectCache projectCache,
ProjectState.Factory projectStateFactory) {
this.site = site; this.site = site;
this.cfgProvider = cfgProvider; this.cfgProvider = cfgProvider;
this.projectCache = projectCache; this.projectCache = projectCache;