Fix major update integrating with external wisemapping frond end

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

@@ -111,9 +111,7 @@ public class Collaboration {
         if (id != that.id) return false;
         if (collaborator != null ? !collaborator.equals(that.collaborator) : that.collaborator != null) return false;
         if (mindMap != null ? !mindMap.equals(that.mindMap) : that.mindMap != null) return false;
-        if (role != that.role) return false;
-
-        return true;
+        return role == that.role;
     }
 
     @Override

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

@@ -84,9 +84,7 @@ public class Collaborator implements Serializable {
         Collaborator that = (Collaborator) o;
 
         if (id != that.getId()) return false;
-        if (email != null ? !email.equals(that.getEmail()) : that.getEmail() != null) return false;
-
-        return true;
+        return email != null ? email.equals(that.getEmail()) : that.getEmail() == null;
     }
 
     @Override
@@ -105,9 +103,7 @@ public class Collaborator implements Serializable {
         if (that == null) return false;
 
         if (id != that.getId()) return false;
-        if (email != null ? !email.equals(that.getEmail()) : that.getEmail() != null) return false;
-
-        return true;
+        return email != null ? email.equals(that.getEmail()) : that.getEmail() == null;
 
     }
 

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

@@ -27,7 +27,7 @@ public enum Font {
     TAHOMA("Tahoma"),
     ARIAL("Arial");
 
-    private String fontName;
+    private final String fontName;
 
     Font (String name)
     {

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

@@ -18,8 +18,8 @@
 
 package com.wisemapping.model;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class MindMapCriteria {
     private String title;

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

@@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -69,11 +70,7 @@ public class Mindmap {
     }
 
     public void setXmlStr(@NotNull String xml) {
-        try {
-            this.setUnzipXml(xml.getBytes(UTF_8));
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        this.setUnzipXml(xml.getBytes(StandardCharsets.UTF_8));
     }
 
     @NotNull
@@ -92,7 +89,7 @@ public class Mindmap {
 
     @NotNull
     public String getXmlStr() throws UnsupportedEncodingException {
-        return new String(this.getUnzipXml(), UTF_8);
+        return new String(this.getUnzipXml(), StandardCharsets.UTF_8);
     }
 
     @NotNull
@@ -170,7 +167,6 @@ public class Mindmap {
         this.isPublic = isPublic;
     }
 
-    @NotNull
     public Calendar getLastModificationTime() {
         return lastModificationTime;
     }

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

@@ -19,8 +19,8 @@
 package com.wisemapping.model;
 
 public class MindmapIcon implements Comparable{
-    private String name;
-    private IconFamily family;
+    private final String name;
+    private final IconFamily family;
 
     MindmapIcon(IconFamily family, String name) {
         this.name = name;

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

@@ -20,9 +20,11 @@ package com.wisemapping.model;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.IllegalStateException;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 @SuppressWarnings({"UnusedDeclaration"})
 public class MindmapIcons {

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

@@ -26,7 +26,7 @@ public enum ShapeStyle
     ELLIPSE("elipse"),
     IMAGE("image");
 
-    private String style;
+    private final String style;
 
     ShapeStyle(String style)
     {

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

@@ -77,7 +77,6 @@ public class User
     public String getPassword() {
         return password;
     }
-
     public void setPassword(String password) {
         this.password = password;
     }