- Fix unit tests ...

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

@@ -18,7 +18,7 @@
 
 package com.wisemapping.model;
 
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.Serializable;
 import java.util.*;
@@ -141,11 +141,12 @@ public class User
         this.username = username;
     }
 
+    @Nullable
     public String getLocale() {
         return locale;
     }
 
-    public void setLocale(@NotNull String locale) {
+    public void setLocale(@Nullable String locale) {
         this.locale = locale;
     }
 }

wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java

@@ -122,7 +122,7 @@ public class AdminController extends BaseController {
         userService.changePassword(user);
     }
 
-    @RequestMapping(method = RequestMethod.DELETE)
+    @RequestMapping(method = RequestMethod.DELETE,value = "admin/users/{id}")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void getUserByEmail(@PathVariable long id) throws IOException, WiseMappingException {
         final User user = userService.getUserBy(id);

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

@@ -78,7 +78,7 @@ public class RestUser {
         return user.getId();
     }
 
-    public void setId(int id) {
+    public void setId(long id) {
         user.setId(id);
     }