opendev/gerrit
Code Issues Proposed changes

Merge "Have common class for entries in DynamicMap/DynamicSet/DynamicItem"

Browse Source
This commit is contained in:
Edwin Kempin
2018-09-27 14:13:59 +00:00
committed by Gerrit Code Review
parent a385f3f2b6 abf6404f3b
commit 446969b8b8
23 changed files with 160 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/git/validators/MergeValidators.java
View File

@@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.api.projects.ProjectConfigEntryType;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.registration.DynamicMap.Entry;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.Extension;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Branch;
@@ -207,7 +207,7 @@ public class MergeValidators {
}
}
for (Entry<ProjectConfigEntry> e : pluginConfigEntries) {
for (Extension<ProjectConfigEntry> e : pluginConfigEntries) {
PluginConfig pluginCfg = cfg.getPluginConfig(e.getPluginName());
ProjectConfigEntry configEntry = e.getProvider().get();