diff --git a/console/module/user/src/main/java/org/eclipse/kapua/app/console/module/user/server/GwtUserServiceImpl.java b/console/module/user/src/main/java/org/eclipse/kapua/app/console/module/user/server/GwtUserServiceImpl.java index d2ddedec834..5a84a202375 100644 --- a/console/module/user/src/main/java/org/eclipse/kapua/app/console/module/user/server/GwtUserServiceImpl.java +++ b/console/module/user/src/main/java/org/eclipse/kapua/app/console/module/user/server/GwtUserServiceImpl.java @@ -202,11 +202,7 @@ public void delete(GwtXSRFToken xsrfToken, String gwtScopeId, String gwtUserId) KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtScopeId); KapuaId userId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtUserId); - User user = USER_SERVICE.find(scopeId, userId); - - if (user != null) { - USER_SERVICE.delete(user); - } + USER_SERVICE.delete(scopeId, userId); } catch (Throwable t) { KapuaExceptionHandler.handle(t); } diff --git a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserService.java b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserService.java index 8b3c0c85395..62c9fc50a16 100644 --- a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserService.java +++ b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserService.java @@ -21,11 +21,12 @@ import org.eclipse.kapua.service.config.KapuaConfigurableService; /** - * UserService exposes APIs to manage User object under an Account.
+ * UserService exposes APIs to manage User object under an Account. + *

* It includes APIs to create, update, find, list and delete Users.
* Instances of the UserService can be acquired through the ServiceLocator. * - * @since 1.0 + * @since 1.0.0 */ public interface UserService extends KapuaEntityService, KapuaUpdatableEntityService, @@ -57,11 +58,13 @@ public interface UserService extends KapuaEntityService, User update(User user) throws KapuaException; /** - * Delete the supplied User. + * Deletes the given {@link User}. * - * @param user + * @param user The {@link User} to delete * @throws KapuaException + * @deprecated Since 2.0.0. Please make use of {@link #delete(KapuaId, KapuaId)} */ + @Deprecated void delete(User user) throws KapuaException; /** diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java index 1c2ea7826f9..877e6f4f79a 100644 --- a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java +++ b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java @@ -183,6 +183,17 @@ public User update(User user) throws KapuaException { })); } + @Override + public void delete(User user) throws KapuaException { + // + // Argument Validation + ArgumentValidator.notNull(user, "user"); + + // + // Do delete + delete(user.getScopeId(), user.getId()); + } + @Override //@RaiseServiceEvent public void delete(KapuaId scopeId, KapuaId userId) throws KapuaException { @@ -216,12 +227,6 @@ public void delete(KapuaId scopeId, KapuaId userId) throws KapuaException { .onAfterHandler((emptyParam) -> entityCache.remove(scopeId, userId))); } - @Override - public void delete(User user) throws KapuaException { - ArgumentValidator.notNull(user, "user"); - delete(user.getScopeId(), user.getId()); - } - @Override public User find(KapuaId scopeId, KapuaId userId) throws KapuaException { diff --git a/service/user/test-steps/src/main/java/org/eclipse/kapua/service/user/steps/UserServiceSteps.java b/service/user/test-steps/src/main/java/org/eclipse/kapua/service/user/steps/UserServiceSteps.java index 5a73d918592..77dfe03cafa 100644 --- a/service/user/test-steps/src/main/java/org/eclipse/kapua/service/user/steps/UserServiceSteps.java +++ b/service/user/test-steps/src/main/java/org/eclipse/kapua/service/user/steps/UserServiceSteps.java @@ -276,7 +276,7 @@ public void deleteUser() throws Exception { try { primeException(); User user = (User) stepData.get("User"); - userService.delete(user); + userService.delete(user.getScopeId(), user.getId()); } catch (KapuaException ke) { verifyException(ke); } @@ -460,7 +460,7 @@ public void deleteNonexistenUser() throws Exception { User user = (User) stepData.get("User"); try { primeException(); - userService.delete(user); + userService.delete(user.getScopeId(), user.getId()); } catch (KapuaException ke) { verifyException(ke); } @@ -684,7 +684,7 @@ public void thenDeleteUser(String userName) throws Exception { try { User userToDelete = userService.findByName(userName); if (userToDelete != null) { - userService.delete(userToDelete); + userService.delete(userToDelete.getScopeId(), userToDelete.getId()); } } catch (KapuaException e) { verifyException(e);