Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

avoid duplicate members in groups

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-09-13 16:19:06 +02:00
parent 69715bf7d3
commit ab72b82e7b
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java
View File

@@ -35,6 +35,8 @@ package sonia.scm.group;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -87,7 +89,7 @@ public class DefaultGroupManager extends AbstractGroupManager
*/
@Inject
public DefaultGroupManager(GroupDAO groupDAO,
Provider<Set<GroupListener>> groupListenerProvider)
Provider<Set<GroupListener>> groupListenerProvider)
{
this.groupDAO = groupDAO;
this.groupListenerProvider = groupListenerProvider;
@@ -130,7 +132,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (logger.isInfoEnabled())
{
logger.info("create group {} of type {}", group.getName(),
group.getType());
group.getType());
}
SecurityUtil.assertIsAdmin();
@@ -140,6 +142,7 @@ public class DefaultGroupManager extends AbstractGroupManager
throw new GroupAllreadyExistExeption();
}
removeDuplicateMembers(group);
group.setCreationDate(System.currentTimeMillis());
fireEvent(group, HandlerEvent.BEFORE_CREATE);
groupDAO.add(group);
@@ -161,7 +164,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (logger.isInfoEnabled())
{
logger.info("delete group {} of type {}", group.getName(),
group.getType());
group.getType());
}
SecurityUtil.assertIsAdmin();
@@ -212,7 +215,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (logger.isInfoEnabled())
{
logger.info("modify group {} of type {}", group.getName(),
group.getType());
group.getType());
}
SecurityUtil.assertIsAdmin();
@@ -221,6 +224,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (groupDAO.contains(name))
{
removeDuplicateMembers(group);
group.setLastModified(System.currentTimeMillis());
fireEvent(group, HandlerEvent.BEFORE_MODIFY);
groupDAO.modify(group);
@@ -247,7 +251,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (logger.isInfoEnabled())
{
logger.info("refresh group {} of type {}", group.getName(),
group.getType());
group.getType());
}
SecurityUtil.assertIsAdmin();
@@ -279,7 +283,7 @@ public class DefaultGroupManager extends AbstractGroupManager
}
return SearchUtil.search(searchRequest, groupDAO.getAll(),
new TransformFilter<Group>()
new TransformFilter<Group>()
{
@Override
public Group accept(Group group)
@@ -287,7 +291,7 @@ public class DefaultGroupManager extends AbstractGroupManager
Group result = null;
if (SearchUtil.matchesOne(searchRequest, group.getName(),
group.getDescription()))
group.getDescription()))
{
result = group.clone();
}
@@ -373,12 +377,12 @@ public class DefaultGroupManager extends AbstractGroupManager
*/
@Override
public Collection<Group> getAll(Comparator<Group> comparator, int start,
int limit)
int limit)
{
SecurityUtil.assertIsAdmin();
return Util.createSubCollection(groupDAO.getAll(), comparator,
new CollectionAppender<Group>()
new CollectionAppender<Group>()
{
@Override
public void append(Collection<Group> collection, Group item)
@@ -439,6 +443,23 @@ public class DefaultGroupManager extends AbstractGroupManager
return groupDAO.getLastModified();
}
//~--- methods --------------------------------------------------------------
/**
* Remove duplicate members from group.
* Have a look at issue #439
*
*
* @param group group
*/
private void removeDuplicateMembers(Group group)
{
List<String> members =
Lists.newArrayList(ImmutableSet.copyOf(group.getMembers()));
group.setMembers(members);
}
//~--- fields ---------------------------------------------------------------
/** Field description */