Bugfix: append extension to plugin config
getProjectPluginConfig and getProjectPluginConfigWithInheritance
were not working as documented. Append ".config" to plugin name to
fix those methods.
Change-Id: I9507de65aab6c8c6d6f0bb99229741df60845ab4
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java
index 11a7c90..76f5323 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java
@@ -41,6 +41,7 @@
public class PluginConfigFactory implements ReloadPluginListener {
private static final Logger log =
LoggerFactory.getLogger(PluginConfigFactory.class);
+ private static final String EXTENSION = ".config";
private final SitePaths site;
private final GerritServerConfigProvider cfgProvider;
@@ -301,7 +302,7 @@
*/
public Config getProjectPluginConfig(ProjectState projectState,
String pluginName) {
- return projectState.getConfig(pluginName).get();
+ return projectState.getConfig(pluginName + EXTENSION).get();
}
/**
@@ -359,7 +360,7 @@
*/
public Config getProjectPluginConfigWithInheritance(ProjectState projectState,
String pluginName) {
- return projectState.getConfig(pluginName).getWithInheritance();
+ return projectState.getConfig(pluginName + EXTENSION).getWithInheritance();
}
private ProjectLevelConfig getPluginConfig(Project.NameKey projectName,
@@ -368,7 +369,7 @@
if (projectState == null) {
throw new NoSuchProjectException(projectName);
}
- return projectState.getConfig(pluginName);
+ return projectState.getConfig(pluginName + EXTENSION);
}
@Override
