opendev/gerrit
Code Issues Proposed changes

Merge "Fix provisioning of ReviewDb in InternalGroupBackend"

Browse Source
This commit is contained in:
Paladox none
2017-09-30 15:50:06 +00:00
committed by Gerrit Code Review
parent 03a3ec21bb 40701eae1e
commit af010c19ba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java
View File

@@ -26,8 +26,8 @@ import com.google.gerrit.server.group.Groups;
import com.google.gerrit.server.group.InternalGroupDescription; import com.google.gerrit.server.group.InternalGroupDescription;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.util.Collection; import java.util.Collection;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
@@ -38,7 +38,7 @@ public class InternalGroupBackend implements GroupBackend {
private final GroupControl.Factory groupControlFactory; private final GroupControl.Factory groupControlFactory;
private final GroupCache groupCache; private final GroupCache groupCache;
private final Groups groups; private final Groups groups;
private final Provider<ReviewDb> db; private final SchemaFactory<ReviewDb> schema;
private final IncludingGroupMembership.Factory groupMembershipFactory; private final IncludingGroupMembership.Factory groupMembershipFactory;
@Inject @Inject
@@ -46,12 +46,12 @@ public class InternalGroupBackend implements GroupBackend {
GroupControl.Factory groupControlFactory, GroupControl.Factory groupControlFactory,
GroupCache groupCache, GroupCache groupCache,
Groups groups, Groups groups,
Provider<ReviewDb> db, SchemaFactory<ReviewDb> schema,
IncludingGroupMembership.Factory groupMembershipFactory) { IncludingGroupMembership.Factory groupMembershipFactory) {
this.groupControlFactory = groupControlFactory; this.groupControlFactory = groupControlFactory;
this.groupCache = groupCache; this.groupCache = groupCache;
this.groups = groups; this.groups = groups;
this.db = db; this.schema = schema;
this.groupMembershipFactory = groupMembershipFactory; this.groupMembershipFactory = groupMembershipFactory;
} }
@@ -72,9 +72,9 @@ public class InternalGroupBackend implements GroupBackend {
@Override @Override
public Collection<GroupReference> suggest(String name, ProjectState project) { public Collection<GroupReference> suggest(String name, ProjectState project) {
try { try (ReviewDb db = schema.open()) {
return groups return groups
.getAll(db.get()) .getAll(db)
.filter(group -> startsWithIgnoreCase(group, name)) .filter(group -> startsWithIgnoreCase(group, name))
.filter(this::isVisible) .filter(this::isVisible)
.map(GroupReference::forGroup) .map(GroupReference::forGroup)