ADD::almost completed travel pane of calculator

src/Server/src/main/java/greenify/server/data/model/User.java

@@ -4,15 +4,9 @@ import greenify.common.ApplicationException;
 import greenify.server.InputValidator;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 import javax.persistence.*;
-
 import javax.validation.constraints.NotNull;
+import java.util.*;
 
 @Entity
 @Data
@@ -147,8 +141,7 @@ public class User {
     public void addFriend(User user) {
         if (user.equals(this)) {
             throw new ApplicationException("Cannot add yourself as a friend");
-        }
-        else {
+        } else {
             friends.add(user);
             System.out.print("Friend added!");
         }
@@ -179,7 +172,8 @@ public class User {
         return result + "]";
     }
 
-     /** This method checks whether two users are equal or not.
+    /**
+     * This method checks whether two users are equal or not.
      * @param other an other user
      * @return users are (not) equal
      */

src/Server/src/test/java/greenify/server/service/UserServiceTest.java

@@ -1,9 +1,5 @@
 package greenify.server.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.when;
-
 import greenify.common.ApplicationException;
 import greenify.common.UserDto;
 import greenify.server.data.model.User;
@@ -19,6 +15,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
 @RunWith(SpringRunner.class)
 public class UserServiceTest {
     @TestConfiguration