opendev/gerrit
Code Issues Proposed changes

Merge VisibleGroups into ListGroups

Browse Source 
ListGroups was the only user of VisibleGroups. Instead of forwarding
calls from ListGroups to VisibleGroups move the code into ListGroups
and get rid of VisibleGroups.

Change-Id: Ie5dd6035487448486036a94f11f1e9237cc19012
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-01-22 16:10:02 +01:00
parent 0026dfe142
commit 0f55837a28
4 changed files with 71 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
gerrit-server/src/main/java/com/google/gerrit/server/account/VisibleGroups.java
View File

@@ -1,116 +0,0 @@
// Copyright (C) 2011 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License
package com.google.gerrit.server.account;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.errors.NoSuchGroupException;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.project.ProjectControl;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
public class VisibleGroups {
public interface Factory {
VisibleGroups create();
}
private final Provider<IdentifiedUser> identifiedUser;
private final GroupCache groupCache;
private final GroupControl.Factory groupControlFactory;
private boolean onlyVisibleToAll;
private AccountGroup.Type groupType;
private String match;
@Inject
VisibleGroups(final Provider<IdentifiedUser> currentUser,
final GroupCache groupCache,
final GroupControl.Factory groupControlFactory) {
this.identifiedUser = currentUser;
this.groupCache = groupCache;
this.groupControlFactory = groupControlFactory;
}
public void setOnlyVisibleToAll(final boolean onlyVisibleToAll) {
this.onlyVisibleToAll = onlyVisibleToAll;
}
public void setGroupType(final AccountGroup.Type groupType) {
this.groupType = groupType;
}
public void setMatch(final String match) {
this.match = match;
}
public List<AccountGroup> get() {
return filterGroups(groupCache.all());
}
public List<AccountGroup> get(final Collection<ProjectControl> projects)
throws NoSuchGroupException {
Map<AccountGroup.UUID, AccountGroup> groups = Maps.newHashMap();
for (final ProjectControl projectControl : projects) {
final Set<GroupReference> groupsRefs = projectControl.getAllGroups();
for (final GroupReference groupRef : groupsRefs) {
final AccountGroup group = groupCache.get(groupRef.getUUID());
if (group == null) {
throw new NoSuchGroupException(groupRef.getUUID());
}
groups.put(group.getGroupUUID(), group);
}
}
return filterGroups(groups.values());
}
private List<AccountGroup> filterGroups(final Iterable<AccountGroup> groups) {
final List<AccountGroup> filteredGroups = Lists.newArrayList();
final boolean isAdmin =
identifiedUser.get().getCapabilities().canAdministrateServer();
for (final AccountGroup group : groups) {
if (!Strings.isNullOrEmpty(match)) {
if (!group.getName().toLowerCase(Locale.US)
.contains(match.toLowerCase(Locale.US))) {
continue;
}
}
if (!isAdmin) {
final GroupControl c = groupControlFactory.controlFor(group);
if (!c.isVisible()) {
continue;
}
}
if ((onlyVisibleToAll && !group.isVisibleToAll())
|| (groupType != null && !groupType.equals(group.getType()))) {
continue;
}
filteredGroups.add(group);
}
Collections.sort(filteredGroups, new GroupComparator());
return filteredGroups;
}
}