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

improve modification handler events by sending old and new items to eventbus

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-01-11 13:45:23 +01:00
parent 23d2c1f27c
commit c3100f420c
17 changed files with 361 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java
View File

@@ -44,7 +44,7 @@ import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.HandlerEvent;
import sonia.scm.HandlerEventType;
import sonia.scm.SCMContextProvider;
import sonia.scm.TransformFilter;
import sonia.scm.search.SearchRequest;
@@ -179,9 +179,9 @@ public class DefaultUserManager extends AbstractUserManager
AssertUtil.assertIsValid(user);
user.setCreationDate(System.currentTimeMillis());
fireEvent(user, HandlerEvent.BEFORE_CREATE);
fireEvent(HandlerEventType.BEFORE_CREATE, user);
userDAO.add(user);
fireEvent(user, HandlerEvent.CREATE);
fireEvent(HandlerEventType.CREATE, user);
}
/**
@@ -207,9 +207,9 @@ public class DefaultUserManager extends AbstractUserManager
if (userDAO.contains(name))
{
fireEvent(user, HandlerEvent.BEFORE_DELETE);
fireEvent(HandlerEventType.BEFORE_DELETE, user);
userDAO.delete(user);
fireEvent(user, HandlerEvent.DELETE);
fireEvent(HandlerEventType.DELETE, user);
}
else
{
@@ -267,14 +267,16 @@ public class DefaultUserManager extends AbstractUserManager
}
String name = user.getName();
User oldUser = userDAO.get(name);
if (userDAO.contains(name))
if (oldUser != null)
{
AssertUtil.assertIsValid(user);
user.setLastModified(System.currentTimeMillis());
fireEvent(user, HandlerEvent.BEFORE_MODIFY);
fireEvent(HandlerEventType.BEFORE_MODIFY, user, oldUser);
userDAO.modify(user);
fireEvent(user, HandlerEvent.MODIFY);
fireEvent(HandlerEventType.MODIFY, user, oldUser);
}
else
{