Fix unit tests

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

@@ -1,20 +1,20 @@
 /*
-*    Copyright [2022] [wisemapping]
-*
-*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
-*   It is basically the Apache License, Version 2.0 (the "License") plus the
-*   "powered by wisemapping" text requirement on every single page;
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the license at
-*
-*       http://www.wisemapping.org/license
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ *    Copyright [2022] [wisemapping]
+ *
+ *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ *   It is basically the Apache License, Version 2.0 (the "License") plus the
+ *   "powered by wisemapping" text requirement on every single page;
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the license at
+ *
+ *       http://www.wisemapping.org/license
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
 
 package com.wisemapping.rest.model;
 
@@ -22,6 +22,7 @@ package com.wisemapping.rest.model;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.wisemapping.model.Collaborator;
+import com.wisemapping.model.User;
 import com.wisemapping.service.LockInfo;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -39,48 +40,42 @@ import javax.xml.bind.annotation.XmlRootElement;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RestLockInfo {
 
-    @NotNull
-    final private Collaborator user;
-
-    @Nullable
-    final private LockInfo lockInfo;
+    private long session;
+    private long timestamp;
+    private String email;
 
     // This is required only for compliance with the JAXB serializer.
-    public RestLockInfo(){
+    public RestLockInfo() {
 
-        this.lockInfo = null;
-        //noinspection ConstantConditions
-        this.user = null;
     }
 
-    public RestLockInfo(@Nullable LockInfo lockInfo, @NotNull Collaborator collaborator) {
-
-        this.lockInfo = lockInfo;
-        this.user = collaborator;
-    }
-
-    public boolean isLocked() {
-        return lockInfo != null;
-    }
-
-    public void setLocked(boolean locked) {
-        // Ignore ...
-    }
-
-    public boolean isLockedByMe() {
-        return isLocked() && lockInfo != null && lockInfo.getUser().identityEquality(user);
-    }
-
-    public void setLockedByMe(boolean lockedForMe) {
-        // Ignore ...
+    public RestLockInfo(@Nullable LockInfo lockInfo, @NotNull User user) {
+        this.session = lockInfo.getSession();
+        this.timestamp = lockInfo.getTimestamp();
+        this.email = user.getEmail();
     }
 
     public long getTimestamp() {
-        return lockInfo != null ? lockInfo.getTimestamp() : -1;
+        return this.timestamp;
+    }
+
+    public long getSession() {
+        return this.session;
+    }
+
+    public void setSession(long session) {
+        this.session = session;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
     }
 
     public void setTimestamp(long value) {
-        //
+        this.timestamp = value;
     }
-
 }