opendev/gerrit
Code Issues Proposed changes

Merge "Create plugin attributeFactories at query start"

Browse Source
This commit is contained in:
Martin Fick
2018-11-17 19:49:09 +00:00
committed by Gerrit Code Review
parent 05e73e192f df85a62522
commit 8b0caf34e7
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java
View File

@@ -17,6 +17,8 @@ package com.google.gerrit.server.query.change;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.server.query.change.ChangeQueryBuilder.FIELD_LIMIT; import static com.google.gerrit.server.query.change.ChangeQueryBuilder.FIELD_LIMIT;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.gerrit.extensions.common.PluginDefinedInfo; import com.google.gerrit.extensions.common.PluginDefinedInfo;
import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.index.IndexConfig; import com.google.gerrit.index.IndexConfig;
@@ -68,6 +70,8 @@ public class ChangeQueryProcessor extends QueryProcessor<ChangeData>
private final Provider<CurrentUser> userProvider; private final Provider<CurrentUser> userProvider;
private final ChangeNotes.Factory notesFactory; private final ChangeNotes.Factory notesFactory;
private final DynamicMap<ChangeAttributeFactory> attributeFactories; private final DynamicMap<ChangeAttributeFactory> attributeFactories;
private final Multimap<String, ChangeAttributeFactory> attributeFactoriesByPlugin =
HashMultimap.create();
private final PermissionBackend permissionBackend; private final PermissionBackend permissionBackend;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final Provider<AnonymousUser> anonymousUserProvider; private final Provider<AnonymousUser> anonymousUserProvider;
@@ -109,6 +113,7 @@ public class ChangeQueryProcessor extends QueryProcessor<ChangeData>
this.permissionBackend = permissionBackend; this.permissionBackend = permissionBackend;
this.projectCache = projectCache; this.projectCache = projectCache;
this.anonymousUserProvider = anonymousUserProvider; this.anonymousUserProvider = anonymousUserProvider;
setupAttributeFactories();
} }
@Override @Override
@@ -132,22 +137,29 @@ public class ChangeQueryProcessor extends QueryProcessor<ChangeData>
return dynamicBeans.get(plugin); return dynamicBeans.get(plugin);
} }
@Override public void setupAttributeFactories() {
public List<PluginDefinedInfo> create(ChangeData cd) {
List<PluginDefinedInfo> plugins = new ArrayList<>(attributeFactories.plugins().size());
for (String plugin : attributeFactories.plugins()) { for (String plugin : attributeFactories.plugins()) {
for (Provider<ChangeAttributeFactory> provider : for (Provider<ChangeAttributeFactory> provider :
attributeFactories.byPlugin(plugin).values()) { attributeFactories.byPlugin(plugin).values()) {
PluginDefinedInfo pda = null; attributeFactoriesByPlugin.put(plugin, provider.get());
try { }
pda = provider.get().create(cd, this, plugin); }
} catch (RuntimeException e) { }
/* Eat runtime exceptions so that queries don't fail. */
} @Override
if (pda != null) { public List<PluginDefinedInfo> create(ChangeData cd) {
pda.name = plugin; List<PluginDefinedInfo> plugins = new ArrayList<>(attributeFactories.plugins().size());
plugins.add(pda); for (Map.Entry<String, ChangeAttributeFactory> e : attributeFactoriesByPlugin.entries()) {
} String plugin = e.getKey();
PluginDefinedInfo pda = null;
try {
pda = e.getValue().create(cd, this, plugin);
} catch (RuntimeException ex) {
/* Eat runtime exceptions so that queries don't fail. */
}
if (pda != null) {
pda.name = plugin;
plugins.add(pda);
} }
} }
if (plugins.isEmpty()) { if (plugins.isEmpty()) {