move event to correct package, serializable, toString, equals and hashCode

scm-core/src/main/java/sonia/scm/security/AssignedPermission.java

@@ -31,8 +31,14 @@
 
 package sonia.scm.security;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.base.Objects;
+
 //~--- JDK imports ------------------------------------------------------------
 
+import java.io.Serializable;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -45,9 +51,14 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "assigned-permission")
-public class AssignedPermission implements PermissionObject
+public class AssignedPermission implements PermissionObject, Serializable
 {
 
+  /** Field description */
+  private static final long serialVersionUID = -7411338422110323879L;
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructor is only visible for JAXB.
    *
@@ -96,6 +107,66 @@ public class AssignedPermission implements PermissionObject
     this.permission = permission;
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param obj
+   *
+   * @return
+   */
+  @Override
+  public boolean equals(Object obj)
+  {
+    if (obj == null)
+    {
+      return false;
+    }
+
+    if (getClass() != obj.getClass())
+    {
+      return false;
+    }
+
+    final AssignedPermission other = (AssignedPermission) obj;
+
+    return Objects.equal(name, other.name)
+      && Objects.equal(groupPermission, other.groupPermission)
+      && Objects.equal(permission, other.permission);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public int hashCode()
+  {
+    return Objects.hashCode(name, groupPermission, permission);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public String toString()
+  {
+    //J-
+    return Objects.toStringHelper(this)
+                  .add("name", name)
+                  .add("groupPermisison", groupPermission)
+                  .add("permission", permission)
+                  .toString();
+    //J+
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**

scm-core/src/main/java/sonia/scm/security/StoredAssignedPermission.java

@@ -47,6 +47,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class StoredAssignedPermission extends AssignedPermission
 {
 
+  /** Field description */
+  private static final long serialVersionUID = -4593919877023168090L;
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructor is only visible for JAXB.
    *

scm-core/src/main/java/sonia/scm/security/StoredAssignedPermissionEvent.java

@@ -29,20 +29,31 @@
 
 
 
-package sonia.scm.store;
+package sonia.scm.security;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.base.Objects;
+
 import sonia.scm.HandlerEvent;
-import sonia.scm.security.StoredAssignedPermission;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.Serializable;
 
 /**
  *
  * @author Sebastian Sdorra
+ * @since 1.31
  */
-public class StoredAssignedPermissionEvent
+public final class StoredAssignedPermissionEvent implements Serializable
 {
 
+  /** Field description */
+  private static final long serialVersionUID = 706824497813169009L;
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructs ...
    *
@@ -57,6 +68,65 @@ public class StoredAssignedPermissionEvent
     this.permission = permission;
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param obj
+   *
+   * @return
+   */
+  @Override
+  public boolean equals(Object obj)
+  {
+    if (obj == null)
+    {
+      return false;
+    }
+
+    if (getClass() != obj.getClass())
+    {
+      return false;
+    }
+
+    final StoredAssignedPermissionEvent other =
+      (StoredAssignedPermissionEvent) obj;
+
+    return Objects.equal(type, other.type)
+      && Objects.equal(permission, other.permission);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public int hashCode()
+  {
+    return Objects.hashCode(type, permission);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public String toString()
+  {
+    //J-
+    return Objects.toStringHelper(this)
+                  .add("type", type)
+                  .add("permission", permission)
+                  .toString();
+    //J+
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**

scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java

@@ -52,7 +52,6 @@ import sonia.scm.event.Subscriber;
 import sonia.scm.group.GroupEvent;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
-import sonia.scm.store.StoredAssignedPermissionEvent;
 import sonia.scm.user.UserEvent;
 
 //~--- JDK imports ------------------------------------------------------------

scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java

@@ -76,7 +76,6 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryDAO;
 import sonia.scm.repository.RepositoryEvent;
 import sonia.scm.repository.RepositoryManager;
-import sonia.scm.store.StoredAssignedPermissionEvent;
 import sonia.scm.user.User;
 import sonia.scm.user.UserDAO;
 import sonia.scm.user.UserEvent;