Optimize mindmap list query.

wise-webapp/src/main/java/com/wisemapping/model/Label.java

@@ -1,6 +1,7 @@
 package com.wisemapping.model;
 
 
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -9,6 +10,8 @@ import java.io.Serializable;
 
 @Entity
 @Table(name = "LABEL")
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Label implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -16,7 +19,7 @@ public class Label implements Serializable {
 
     @NotNull private String title;
     @NotNull private String color;
-    @NotNull private String iconName;
+    @Nullable private String iconName;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name="creator_id",nullable = true,unique = true)
@@ -70,7 +73,7 @@ public class Label implements Serializable {
         this.color = color;
     }
 
-    @NotNull
+    @Nullable
     public String getIconName() {
         return iconName;
     }
@@ -94,7 +97,7 @@ public class Label implements Serializable {
     public int hashCode() {
         long result = id;
         result = 31 * result + title.hashCode();
-        result = 31 * result + creator.hashCode();
+        result = 31 * result + (creator!=null?creator.hashCode():0);
         result = 31 * result + (parent != null ? parent.hashCode() : 0);
         return (int) result;
     }

wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java

@@ -47,11 +47,11 @@ public class Mindmap implements Serializable  {
     private Calendar lastModificationTime;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "creator_id", unique = true, nullable = true)
+    @JoinColumn(name = "creator_id", unique = true)
     private User creator;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "last_editor_id", unique = false, nullable = false)
+    @JoinColumn(name = "last_editor_id", nullable = false)
     private User lastEditor;
 
     private String description;
@@ -62,14 +62,13 @@ public class Mindmap implements Serializable  {
     @OneToMany(mappedBy="mindMap",orphanRemoval = true, cascade = {CascadeType.ALL},fetch = FetchType.LAZY)
     private Set<Collaboration> collaborations = new HashSet<>();
 
-    @ManyToMany
+    @ManyToMany(cascade = CascadeType.ALL)
     @JoinTable(
             name = "R_LABEL_MINDMAP",
             joinColumns = @JoinColumn(name = "mindmap_id"),
             inverseJoinColumns = @JoinColumn(name = "label_id"))
     private Set<Label> labels = new LinkedHashSet<>();
 
-    private String tags;
     private String title;
 
     @Column(name = "xml")
@@ -153,16 +152,11 @@ public class Mindmap implements Serializable  {
         this.labels.add(label);
     }
 
-    @Nullable
-    public Collaboration findCollaboration(@NotNull Collaborator collaborator) {
-        Collaboration result = null;
-        for (Collaboration collaboration : collaborations) {
-            if (collaboration.getCollaborator().identityEquality(collaborator)) {
-                result = collaboration;
-                break;
-            }
-        }
-        return result;
+    public Optional<Collaboration> findCollaboration(@NotNull Collaborator collaborator) {
+        return this.collaborations
+                .stream()
+                .filter(c->c.getCollaborator().identityEquality(collaborator))
+                .findAny();
     }
 
     @Nullable
@@ -228,30 +222,20 @@ public class Mindmap implements Serializable  {
     public String getXmlAsJsLiteral()
             throws IOException {
         String xml = this.getXmlStr();
-        if (xml != null) {
-            xml = xml.replace("'", "\\'");
-            xml = xml.replace("\n", "\\n");
-            xml = xml.replace("\r", "");
 
-            xml = xml.replace("\\b", "\\\\b");
-            xml = xml.replace("\\t", "\\\\t");
-            xml = xml.replace("\\r", "\\\\r");
-            xml = xml.replace("\\f", "\\\\f");
+        xml = xml.replace("'", "\\'");
+        xml = xml.replace("\n", "\\n");
+        xml = xml.replace("\r", "");
 
-            xml = xml.trim();
-        }
+        xml = xml.replace("\\b", "\\\\b");
+        xml = xml.replace("\\t", "\\\\t");
+        xml = xml.replace("\\r", "\\\\r");
+        xml = xml.replace("\\f", "\\\\f");
+        xml = xml.trim();
         return xml;
     }
 
 
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
     public String getDescription() {
         return description;
     }
@@ -276,9 +260,10 @@ public class Mindmap implements Serializable  {
         return creator;
     }
 
+    @Nullable
     private CollaborationProperties findUserProperty(@NotNull Collaborator collaborator) {
-        final Collaboration collaboration = this.findCollaboration(collaborator);
-        return collaboration != null ? collaboration.getCollaborationProperties() : null;
+        final Optional<Collaboration> collaboration = this.findCollaboration(collaborator);
+        return collaboration.map(Collaboration::getCollaborationProperties).orElse(null);
     }
 
     public void setStarred(@NotNull Collaborator collaborator, boolean value) throws WiseMappingException {
@@ -297,10 +282,10 @@ public class Mindmap implements Serializable  {
             throw new IllegalStateException("Collaborator can not be null");
         }
 
-        final Collaboration collaboration = this.findCollaboration(collaborator);
+        final Optional<Collaboration> collaboration = this.findCollaboration(collaborator);
         CollaborationProperties result = null;
-        if (collaboration != null) {
-            result = collaboration.getCollaborationProperties();
+        if (collaboration.isPresent()) {
+            result = collaboration.get().getCollaborationProperties();
         } else {
             if (forceCheck)
                 throw new AccessDeniedSecurityException("Collaborator " + collaborator.getEmail() + " could not access " + this.getId());
@@ -328,7 +313,6 @@ public class Mindmap implements Serializable  {
         result.setDescription(this.getDescription());
         result.setTitle(this.getTitle());
         result.setUnzipXml(this.getUnzipXml());
-        result.setTags(this.getTags());
 
         return result;
     }
@@ -336,9 +320,9 @@ public class Mindmap implements Serializable  {
     public boolean hasPermissions(@Nullable Collaborator collaborator, @NotNull CollaborationRole role) {
         boolean result = false;
         if (collaborator != null) {
-            final Collaboration collaboration = this.findCollaboration(collaborator);
-            if (collaboration != null) {
-                result = collaboration.hasPermissions(role);
+            final Optional<Collaboration> collaboration = this.findCollaboration(collaborator);
+            if (collaboration.isPresent()) {
+                result = collaboration.get().hasPermissions(role);
             }
         }
         return result;