Get Collaboration list completed.

wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java

@@ -1,6 +1,7 @@
 package com.wisemapping.rest.model;
 
 
+import com.wisemapping.model.Collaboration;
 import com.wisemapping.model.CollaborationRole;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonIgnore;
@@ -10,7 +11,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement(name = "collaborators")
+@XmlRootElement(name = "collaboration")
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @JsonAutoDetect(
         fieldVisibility = JsonAutoDetect.Visibility.NONE,
@@ -18,11 +19,13 @@ import javax.xml.bind.annotation.XmlRootElement;
         isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
 public class RestCollaboration {
 
-    @JsonIgnore
     private String email;
+    private String role;
 
-    @JsonIgnore
-    private CollaborationRole role;
+    public RestCollaboration(@NotNull Collaboration collaboration) {
+        this.email = collaboration.getCollaborator().getEmail();
+        this.role = collaboration.getRole().name();
+    }
 
     public RestCollaboration() {
 
@@ -32,19 +35,21 @@ public class RestCollaboration {
         if (value == null) {
             throw new IllegalStateException("role can not be null");
         }
+        // Only check ...
+        CollaborationRole.valueOf(value.toUpperCase());
+        role = value;
 
-        role = CollaborationRole.valueOf(value.toUpperCase());
     }
 
     public String getRole() {
-        return role.toString().toLowerCase();
+        return role;
     }
 
     public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email) {
+    public void setEmail(@NotNull String email) {
         this.email = email;
     }
 }

wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java

@@ -10,9 +10,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 @XmlRootElement(name = "collaboration")
 @XmlAccessorType(XmlAccessType.PROPERTY)
@@ -25,7 +23,7 @@ public class RestCollaborationList {
     private List<RestCollaboration> collaborations;
 
     public RestCollaborationList() {
-
+        collaborations = new ArrayList<RestCollaboration>();
     }
 
     public int getCount() {
@@ -36,11 +34,15 @@ public class RestCollaborationList {
 
     }
 
-    @XmlElement(name = "collaborate")
+    @XmlElement(name = "collaborations")
     public List<RestCollaboration> getCollaborations() {
         return collaborations;
     }
 
+    public void addCollaboration(@NotNull RestCollaboration collaboration) {
+        collaborations.add(collaboration);
+    }
+
     public void setCollaborations(@NotNull List<RestCollaboration> collaborations) {
         this.collaborations = collaborations;
     }

wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java

@@ -39,11 +39,11 @@ public class RestMindmap {
     }
 
     public RestMindmap() {
-        this(new MindMap(), Utils.getUser());
+        this(new MindMap(), null);
 
     }
 
-    public RestMindmap(@NotNull MindMap mindmap, @NotNull Collaborator collaborator) {
+    public RestMindmap(@NotNull MindMap mindmap, @Nullable Collaborator collaborator) {
         this.mindmap = mindmap;
         this.collaborator = collaborator;
     }
@@ -131,7 +131,8 @@ public class RestMindmap {
     }
 
     public String getOwner() {
-        return mindmap.getOwner().getEmail();
+        final User owner = mindmap.getOwner();
+        return owner != null ? owner.getEmail() : null;
     }
 
     public void setCreator(String creatorUser) {