Update branch

src/Server/src/main/java/greenify/server/rest/UserController.java

@@ -1,11 +1,11 @@
 package greenify.server.rest;
 
 import greenify.common.UserDto;
+import greenify.server.data.model.User;
+import greenify.server.data.repository.UserRepository;
 import greenify.server.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class UserController {

src/Server/src/test/java/ApplicationTest.java

@@ -10,3 +10,4 @@ public class ApplicationTest {
     @Test
     public void contextLoads() throws Exception{ }
 }
+

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

@@ -11,7 +11,6 @@ import greenify.server.data.repository.UserRepository;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;