[T3-commits] [Git][ultreiaio/ird-t3][develop] use correct method (See #252)

10 Apr 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3


Commits:
629aa7ce by Tony CHEMIT at 2017-04-10T13:39:31+02:00
use correct method (See #252)

- - - - -


2 changed files:

- t3-domain/src/main/java/fr/ird/t3/services/UserService.java
- t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java


Changes:

=====================================
t3-domain/src/main/java/fr/ird/t3/services/UserService.java
=====================================

--- a/t3-domain/src/main/java/fr/ird/t3/services/UserService.java
+++ b/t3-domain/src/main/java/fr/ird/t3/services/UserService.java
@@ -56,7 +56,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste
     }
 
     public T3User getUserById(String userId) throws Exception {
-        return userDAO.forTopiaIdEquals(userId).findAnyOrNull();
+        return userDAO.forTopiaIdEquals(userId).findUnique();
     }
 
     public List<T3User> getUsers() throws Exception {
@@ -149,7 +149,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste
         commit();
     }
 
-    public void removeOutputDatabaseConfiguration(String userId, String dbconfigurationId) throws Exception {
+    public void removeOutputDatabase(String userId, String dbconfigurationId) throws Exception {
         T3User user = getUserById(userId);
         Preconditions.checkNotNull(user,
                                    "Could not find user with id : " + userId);


=====================================
t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java
=====================================
--- a/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java
+++ b/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java
@@ -60,7 +60,7 @@ public class UserOutputDatabaseAction extends AbstractUserDatabaseAction<UserOut
 
     @Override
     protected void delete(String userId, UserOutputDatabase database) throws Exception {
-        getUserService().removeUserT3Database(userId, database.getTopiaId());
+        getUserService().removeOutputDatabase(userId, database.getTopiaId());
     }
 
     @Override



View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/629aa7ce61977b6c9c9d7ef73d20b9a9b...

    