Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-02 04:39:14 +01:00
Code Issues Packages Projects Releases Activity

Introduce filter parameter in Manager

Browse Source
This commit is contained in:
René Pfeuffer
2019-04-09 13:09:16 +02:00
parent f5933cb6d5
commit fbd6f4f3c7
8 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
View File

@@ -62,6 +62,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.function.Predicate;
/**
*
@@ -280,7 +281,7 @@ public class DefaultUserManager extends AbstractUserManager
@Override
public Collection<User> getAll()
{
return getAll(null);
return getAll(user -> true, null);
}
/**
@@ -292,13 +293,13 @@ public class DefaultUserManager extends AbstractUserManager
* @return
*/
@Override
public Collection<User> getAll(Comparator<User> comparator)
public Collection<User> getAll(Predicate<User> filter, Comparator<User> comparator)
{
List<User> users = new ArrayList<>();
PermissionActionCheck<User> check = UserPermissions.read();
for (User user : userDAO.getAll()) {
if (check.isPermitted(user)) {
if (filter.test(user) && check.isPermitted(user)) {
users.add(user.clone());
}
}