Merge pull request #1651 from tulinkry/groups-dedup

deduplicating code in RuntimeEnvironment and ProjectHelper

Author: tarzanek

src/org/opensolaris/opengrok/configuration/Group.java

@@ -284,4 +284,18 @@ public static Group getByName(String name) {
         }
         return ret;
     }
+
+    /**
+     * Reduce the group set to only those which match the given project based on
+     * the project's description.
+     *
+     * @param project the project
+     * @param groups set of groups
+     * @return set of groups matching the project
+     */
+    public static Set<Group> matching(Project project, Set<Group> groups) {
+        Set<Group> copy = new TreeSet<>(groups);
+        copy.removeIf((g) -> !g.match(project));
+        return copy;
+    }
 }

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -1234,13 +1234,7 @@ private void populateGroups(Set<Group> groups, Set<Project> projects) {
         }
         for (Project project : projects) {
             // filterProjects only groups which match project's description
-            Set<Group> copy = new TreeSet<>(groups);
-            copy.removeIf(new Predicate<Group>() {
-                @Override
-                public boolean test(Group g) {
-                    return !g.match(project);
-                }
-            });
+            Set<Group> copy = Group.matching(project, groups);
 
             // add project to the groups
             for (Group group : copy) {

src/org/opensolaris/opengrok/web/ProjectHelper.java

@@ -128,13 +128,7 @@ private void populateGroups() {
         groups.addAll(cfg.getEnv().getGroups());
         for (Project project : cfg.getEnv().getProjectList()) {
             // filterProjects only groups which match project's description
-            Set<Group> copy = new TreeSet<>(groups);
-            copy.removeIf(new Predicate<Group>() {
-                @Override
-                public boolean test(Group g) {
-                    return !g.match(project);
-                }
-            });
+            Set<Group> copy = Group.matching(project, groups);
 
             // if no group matches the project, add it to not-grouped projects
             if (copy.isEmpty()) {