From 19052a5ed50de48007aa70c730861e96b782534f Mon Sep 17 00:00:00 2001
From: ItaiGershtansky <itaig.phenotips@gmail.com>
Date: Thu, 24 Nov 2016 14:38:55 -0500
Subject: [PATCH] PT-2640-entities: added
 PrimaryEntityGroupManager.removeAllMembers(group, members).

---
 .../phenotips/entities/PrimaryEntityGroupManager.java | 11 ++++++++++-
 .../internal/AbstractPrimaryEntityGroupManager.java   |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/components/entities/api/src/main/java/org/phenotips/entities/PrimaryEntityGroupManager.java b/components/entities/api/src/main/java/org/phenotips/entities/PrimaryEntityGroupManager.java
index 8dd04b1f76..538cd7d839 100644
--- a/components/entities/api/src/main/java/org/phenotips/entities/PrimaryEntityGroupManager.java
+++ b/components/entities/api/src/main/java/org/phenotips/entities/PrimaryEntityGroupManager.java
@@ -85,10 +85,19 @@ public interface PrimaryEntityGroupManager<G extends PrimaryEntity, E extends Pr
      * Removes all members from a group.
      *
      * @param group to remove members from
-     * @return true if successul
+     * @return true if successful
      */
     boolean removeAllMembers(G group);
 
+    /**
+     * Removes all members in {@code members} from {@code group}.
+     *
+     * @param group to remove members from
+     * @param members a collection of members to remove
+     * @return true if successful
+     */
+    boolean removeAllMembers(G group, Collection<E> members);
+
     /**
      * Removed the member {@code member} from all the groups it is a member of.
      *
diff --git a/components/entities/api/src/main/java/org/phenotips/entities/internal/AbstractPrimaryEntityGroupManager.java b/components/entities/api/src/main/java/org/phenotips/entities/internal/AbstractPrimaryEntityGroupManager.java
index 4e8cb7b8c0..4a22b723c9 100644
--- a/components/entities/api/src/main/java/org/phenotips/entities/internal/AbstractPrimaryEntityGroupManager.java
+++ b/components/entities/api/src/main/java/org/phenotips/entities/internal/AbstractPrimaryEntityGroupManager.java
@@ -167,9 +167,13 @@ public boolean addToAllGroups(E member, Collection<G> groups)
     @Override
     public boolean removeAllMembers(G group)
     {
+        return this.removeAllMembers(group, this.getMembers(group));
+    }
+
+    @Override
+    public boolean removeAllMembers(G group, Collection<E> members) {
         boolean success = true;
-        Collection<E> existingMembers = this.getMembers(group);
-        for (E member : existingMembers) {
+        for (E member : members) {
             if (!this.removeMember(group, member)) {
                 success = false;
             }