From de59f5657ff68540968db7f147db01a16da438c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 7 May 2019 15:20:54 +0200
Subject: [PATCH] Remove duplicate verbs

---
 .../security/SystemRepositoryPermissionProvider.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java b/scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java
index 63fdeec702..0350698352 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/SystemRepositoryPermissionProvider.java
@@ -21,10 +21,9 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static java.util.Collections.unmodifiableCollection;
-import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.toList;
 
 class SystemRepositoryPermissionProvider {
 
@@ -36,8 +35,8 @@ class SystemRepositoryPermissionProvider {
   @Inject
   public SystemRepositoryPermissionProvider(PluginLoader pluginLoader) {
     AvailableRepositoryPermissions availablePermissions = readAvailablePermissions(pluginLoader);
-    this.availableVerbs = unmodifiableList(new ArrayList<>(availablePermissions.availableVerbs));
-    this.availableRoles = unmodifiableList(new ArrayList<>(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(Collectors.toList())));
+    this.availableVerbs = removeDuplicates(availablePermissions.availableVerbs);
+    this.availableRoles = removeDuplicates(availablePermissions.availableRoles.stream().map(r -> new RepositoryRole(r.name, r.verbs.verbs, "system")).collect(toList()));
   }
 
   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 final Collection<String> availableVerbs;
     private final Collection<RoleDescriptor> availableRoles;