Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Remove duplicate verbs

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-07 15:20:54 +02:00
parent c5b20566c1
commit de59f5657f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java
View File

@@ -21,10 +21,9 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import static java.util.Collections.unmodifiableCollection; import static java.util.Collections.unmodifiableCollection;
import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList;
class SystemRepositoryPermissionProvider { class SystemRepositoryPermissionProvider {
@@ -36,8 +35,8 @@ class SystemRepositoryPermissionProvider {
@Inject @Inject
public SystemRepositoryPermissionProvider(PluginLoader pluginLoader) { public SystemRepositoryPermissionProvider(PluginLoader pluginLoader) {
AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader); AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader);
this.availableVerbs = unmodifiableList(new ArrayList<>(availablePermissions.availableVerbs)); this.availableVerbs = removeDuplicates(availablePermissions.availableVerbs);
this.availableRoles = unmodifiableList(new ArrayList<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(Collectors.toList()))); this.availableRoles = removeDuplicates(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(toList()));
} }
public List<String> availableVerbs() { public List<String> availableVerbs() {
@@ -109,6 +108,10 @@ class SystemRepositoryPermissionProvider {
} }
} }
private static <T> List<T> removeDuplicates(Collection<T> items) {
return items.stream().distinct().collect(toList());
}
private static class AvailableRepositoryPermissions { private static class AvailableRepositoryPermissions {
private final Collection<String> availableVerbs; private final Collection<String> availableVerbs;
private final Collection<RoleDescriptor> availableRoles; private final Collection<RoleDescriptor> availableRoles;