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

Commits:

2 changed files:

Changes:

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

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.