Get Collaboration list completed.

wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java

@@ -19,12 +19,13 @@
 package com.wisemapping.dao;
 
 import com.wisemapping.model.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
 public interface MindmapManager {
 
-    Collaborator getCollaboratorBy(String email);
+    Collaborator getCollaboratorBy(@NotNull String email);
 
     Collaborator getCollaboratorBy(long id);
     
@@ -48,11 +49,11 @@ public interface MindmapManager {
 
     void updateMindmap(MindMap mindMap, boolean saveHistory);
 
-    void removeCollaborator(Collaborator collaborator);
+    void removeCollaborator(@NotNull Collaborator collaborator);
 
     void removeMindmap(MindMap mindap);
 
-    void removeMindmapUser(Collaboration collaboration);
+    void removeCollaboration(Collaboration collaboration);
 
     public List<MindMap> search(MindMapCriteria criteria);
 

wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java

@@ -122,6 +122,7 @@ public class MindmapManagerImpl
     public List<Collaboration> getMindmapUserByRole(final CollaborationRole collaborationRole) {
         return getHibernateTemplate().find("from com.wisemapping.model.Collaboration mindmapUser where roleId=?", collaborationRole.ordinal());
     }
+
     @Override
     public Collaboration getMindmapUserBy(final int mindmapId, final User user) {
         final Collaboration result;
@@ -138,17 +139,17 @@ public class MindmapManagerImpl
 
     @Override
     public void addCollaborator(Collaborator collaborator) {
-        assert collaborator != null : "ADD MINDMAP COLABORATOR: Collaborator is required!";
+        assert collaborator != null : "ADD MINDMAP COLLABORATOR: Collaborator is required!";
         getHibernateTemplate().save(collaborator);
     }
 
     @Override
-    public void removeMindmapUser(Collaboration collaboration) {
+    public void removeCollaboration(Collaboration collaboration) {
         getHibernateTemplate().delete(collaboration);
     }
 
     @Override
-    public void removeCollaborator(Collaborator collaborator) {
+    public void removeCollaborator(@NotNull Collaborator collaborator) {
         getHibernateTemplate().delete(collaborator);
     }