commit c2d1a3e19bdc044954ff8fba70adc9cb069320dd
author Hugo Arès <hugo.ares@ericsson.com> Thu Jun 29 07:45:05 2017 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Fri Jul 21 14:06:43 2017 -0400
tree ade3fe7c65b0cdb5be2da8efb493ce82784d2b2e
parent b7b952fe62fa95cd1e0ef946a01fbd55ca555ab9

Support plugin group reference with inheritance

Group reference was not working when inherited from parent project
config. When copying all the values from parent project config, check
all values and resolve the ones that are group reference.

Change-Id: Ie51f2b8356dc3871f4718954360a199bf6c2bc8f

gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
index 674a5c6..fd1a12c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
@@ -57,11 +57,16 @@
       cfg = copyConfig(cfg);
       for (String name : parentPluginConfig.cfg.getNames(PLUGIN, pluginName)) {
         if (!allNames.contains(name)) {
-          cfg.setStringList(
-              PLUGIN,
-              pluginName,
-              name,
-              Arrays.asList(parentPluginConfig.cfg.getStringList(PLUGIN, pluginName, name)));
+          List<String> values =
+              Arrays.asList(parentPluginConfig.cfg.getStringList(PLUGIN, pluginName, name));
+          for (String value : values) {
+            GroupReference groupRef =
+                parentPluginConfig.projectConfig.getGroup(GroupReference.extractGroupName(value));
+            if (groupRef != null) {
+              projectConfig.resolve(groupRef);
+            }
+          }
+          cfg.setStringList(PLUGIN, pluginName, name, values);
         }
       }
     }