opendev/gerrit
Code Issues Proposed changes

Bugfix: append extension to plugin config

Browse Source 
getProjectPluginConfig and getProjectPluginConfigWithInheritance
were not working as documented. Append ".config" to plugin name to
fix those methods.

Change-Id: I9507de65aab6c8c6d6f0bb99229741df60845ab4
This commit is contained in:
Simon Lei
2014-06-30 07:51:11 -04:00
parent 68c3f79f23
commit f7cba4d970
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import java.util.Map;
public class PluginConfigFactory implements ReloadPluginListener { public class PluginConfigFactory implements ReloadPluginListener {
private static final Logger log = private static final Logger log =
LoggerFactory.getLogger(PluginConfigFactory.class); LoggerFactory.getLogger(PluginConfigFactory.class);
private static final String EXTENSION = ".config";
private final SitePaths site; private final SitePaths site;
private final GerritServerConfigProvider cfgProvider; private final GerritServerConfigProvider cfgProvider;
@@ -301,7 +302,7 @@ public class PluginConfigFactory implements ReloadPluginListener {
*/ */
public Config getProjectPluginConfig(ProjectState projectState, public Config getProjectPluginConfig(ProjectState projectState,
String pluginName) { String pluginName) {
return projectState.getConfig(pluginName).get(); return projectState.getConfig(pluginName + EXTENSION).get();
} }
/** /**
@@ -359,7 +360,7 @@ public class PluginConfigFactory implements ReloadPluginListener {
*/ */
public Config getProjectPluginConfigWithInheritance(ProjectState projectState, public Config getProjectPluginConfigWithInheritance(ProjectState projectState,
String pluginName) { String pluginName) {
return projectState.getConfig(pluginName).getWithInheritance(); return projectState.getConfig(pluginName + EXTENSION).getWithInheritance();
} }
private ProjectLevelConfig getPluginConfig(Project.NameKey projectName, private ProjectLevelConfig getPluginConfig(Project.NameKey projectName,
@@ -368,7 +369,7 @@ public class PluginConfigFactory implements ReloadPluginListener {
if (projectState == null) { if (projectState == null) {
throw new NoSuchProjectException(projectName); throw new NoSuchProjectException(projectName);
} }
return projectState.getConfig(pluginName); return projectState.getConfig(pluginName + EXTENSION);
} }
@Override @Override