Base group index on new class InternalGroup
To be able to add the members and sub-groups of a group to the group
index, we need a class which contains those additional details. For
this reason, we introduce a new class InternalGroup and base the
group index on it (instead of AccountGroup).
Change-Id: I88b1a0bf1bd06804069a2a3165e7664db7900903
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index 38c4e23..cb8e6a4 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -27,6 +27,7 @@
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
+import com.google.gerrit.server.group.InternalGroup;
import com.google.gerrit.server.index.IndexUtils;
import com.google.gerrit.server.index.group.GroupField;
import com.google.gerrit.server.index.group.GroupIndex;
@@ -48,6 +49,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import org.eclipse.jgit.lib.Config;
import org.elasticsearch.index.query.QueryBuilder;
@@ -55,12 +57,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, AccountGroup>
+public class ElasticGroupIndex extends AbstractElasticIndex<AccountGroup.UUID, InternalGroup>
implements GroupIndex {
static class GroupMapping {
MappingProperties groups;
- GroupMapping(Schema<AccountGroup> schema) {
+ GroupMapping(Schema<InternalGroup> schema) {
this.groups = ElasticMapping.createMapping(schema);
}
}
@@ -79,14 +81,14 @@
SitePaths sitePaths,
Provider<GroupCache> groupCache,
JestClientBuilder clientBuilder,
- @Assisted Schema<AccountGroup> schema) {
+ @Assisted Schema<InternalGroup> schema) {
super(cfg, sitePaths, schema, clientBuilder, GROUPS_PREFIX);
this.groupCache = groupCache;
this.mapping = new GroupMapping(schema);
}
@Override
- public void replace(AccountGroup group) throws IOException {
+ public void replace(InternalGroup group) throws IOException {
Bulk bulk =
new Bulk.Builder()
.defaultIndex(indexName)
@@ -104,7 +106,7 @@
}
@Override
- public DataSource<AccountGroup> getSource(Predicate<AccountGroup> p, QueryOptions opts)
+ public DataSource<InternalGroup> getSource(Predicate<InternalGroup> p, QueryOptions opts)
throws QueryParseException {
return new QuerySource(p, opts);
}
@@ -121,15 +123,15 @@
}
@Override
- protected String getId(AccountGroup group) {
+ protected String getId(InternalGroup group) {
return group.getGroupUUID().get();
}
- private class QuerySource implements DataSource<AccountGroup> {
+ private class QuerySource implements DataSource<InternalGroup> {
private final Search search;
private final Set<String> fields;
- QuerySource(Predicate<AccountGroup> p, QueryOptions opts) throws QueryParseException {
+ QuerySource(Predicate<InternalGroup> p, QueryOptions opts) throws QueryParseException {
QueryBuilder qb = queryBuilder.toQueryBuilder(p);
fields = IndexUtils.groupFields(opts);
SearchSourceBuilder searchSource =
@@ -156,9 +158,9 @@
}
@Override
- public ResultSet<AccountGroup> read() throws OrmException {
+ public ResultSet<InternalGroup> read() throws OrmException {
try {
- List<AccountGroup> results = Collections.emptyList();
+ List<InternalGroup> results = Collections.emptyList();
JestResult result = client.execute(search);
if (result.isSucceeded()) {
JsonObject obj = result.getJsonObject().getAsJsonObject("hits");
@@ -166,21 +168,22 @@
JsonArray json = obj.getAsJsonArray("hits");
results = Lists.newArrayListWithCapacity(json.size());
for (int i = 0; i < json.size(); i++) {
- results.add(toAccountGroup(json.get(i)));
+ Optional<InternalGroup> internalGroup = toInternalGroup(json.get(i));
+ internalGroup.ifPresent(results::add);
}
}
} else {
log.error(result.getErrorMessage());
}
- final List<AccountGroup> r = Collections.unmodifiableList(results);
- return new ResultSet<AccountGroup>() {
+ final List<InternalGroup> r = Collections.unmodifiableList(results);
+ return new ResultSet<InternalGroup>() {
@Override
- public Iterator<AccountGroup> iterator() {
+ public Iterator<InternalGroup> iterator() {
return r.iterator();
}
@Override
- public List<AccountGroup> toList() {
+ public List<InternalGroup> toList() {
return r;
}
@@ -199,7 +202,7 @@
return search.toString();
}
- private AccountGroup toAccountGroup(JsonElement json) {
+ private Optional<InternalGroup> toInternalGroup(JsonElement json) {
JsonElement source = json.getAsJsonObject().get("_source");
if (source == null) {
source = json.getAsJsonObject().get("fields");
@@ -210,7 +213,7 @@
source.getAsJsonObject().get(GroupField.UUID.getName()).getAsString());
// Use the GroupCache rather than depending on any stored fields in the
// document (of which there shouldn't be any).
- return groupCache.get().get(uuid);
+ return groupCache.get().getInternalGroup(uuid);
}
}
}
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java
index 694348f..fac10eb 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java
@@ -27,8 +27,8 @@
import com.google.gerrit.elasticsearch.ElasticChangeIndex.ChangeMapping;
import com.google.gerrit.elasticsearch.ElasticGroupIndex.GroupMapping;
import com.google.gerrit.index.Schema;
-import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.AccountState;
+import com.google.gerrit.server.group.InternalGroup;
import com.google.gerrit.server.index.IndexModule.IndexType;
import com.google.gerrit.server.index.account.AccountSchemaDefinitions;
import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
@@ -146,7 +146,7 @@
.execute()
.actionGet();
- Schema<AccountGroup> groupSchema = GroupSchemaDefinitions.INSTANCE.getLatest();
+ Schema<InternalGroup> groupSchema = GroupSchemaDefinitions.INSTANCE.getLatest();
GroupMapping groupMapping = new GroupMapping(groupSchema);
nodeInfo
.node
