diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java index cdec8e60072..ee7337b524d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockUserManagement.java @@ -43,7 +43,7 @@ public class MockUserManagement implements UserManagement { } @Override - public void addRoles(UserId user, Collection<Role> roles) { + public void addToRoles(UserId user, Collection<Role> roles) { for (Role role : roles) { addUsers(role, Collections.singletonList(user)); } @@ -55,7 +55,7 @@ public class MockUserManagement implements UserManagement { } @Override - public void removeRoles(UserId user, Collection<Role> roles) { + public void removeFromRoles(UserId user, Collection<Role> roles) { for (Role role : roles) { removeUsers(role, Collections.singletonList(user)); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java index ee3c48e85d3..922f0f11244 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserManagement.java @@ -22,13 +22,13 @@ public interface UserManagement { void addUsers(Role role, Collection<UserId> users); /** Ensures the given user exist, and are part of the given roles, or throws if the roles does not exist. */ - void addRoles(UserId user, Collection<Role> roles); + void addToRoles(UserId user, Collection<Role> roles); /** Ensures none of the given users are part of the given role, or throws if the role does not exist. */ void removeUsers(Role role, Collection<UserId> users); /** Ensures the given users are not part of the given role, or throws if the roles does not exist. */ - void removeRoles(UserId user, Collection<Role> roles); + void removeFromRoles(UserId user, Collection<Role> roles); /** Returns all users in the given role, or throws if the role does not exist. */ List<User> listUsers(Role role); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index 15d7556b389..7c686fb12a2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -192,7 +192,7 @@ public class UserApiHandler extends LoggingRequestHandler { .map(roleName -> Roles.toRole(tenant, roleName)) .collect(Collectors.toUnmodifiableList()); - users.addRoles(user, roles); + users.addToRoles(user, roles); return new MessageResponse(user + " is now a member of " + roles.stream().map(Role::toString).collect(Collectors.joining(", "))); } @@ -221,7 +221,7 @@ public class UserApiHandler extends LoggingRequestHandler { enforceLastAdminOfTenant(tenant, user, roles); removeDeveloperKey(tenant, user, roles); - users.removeRoles(user, roles); + users.removeFromRoles(user, roles); return new MessageResponse(user + " is no longer a member of " + roles.stream().map(Role::toString).collect(Collectors.joining(", "))); } @@ -235,7 +235,7 @@ public class UserApiHandler extends LoggingRequestHandler { enforceLastAdminOfTenant(tenant, user, roles); removeDeveloperKey(tenant, user, roles); - users.removeRoles(user, roles); + users.removeFromRoles(user, roles); return new MessageResponse(user + " is no longer a member of " + roles.stream().map(Role::toString).collect(Collectors.joining(", "))); } |