summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authortoby <smorgrav@yahoo-inc.com>2019-11-08 10:22:50 +0100
committertoby <smorgrav@yahoo-inc.com>2019-11-08 10:22:50 +0100
commit26a7636873b991f88147a89173a0df84d43fac89 (patch)
treec01225c71f384743d793231c8b663e5a81be228a /controller-server
parentaefd579cf74faf45d4279071daff6f2401597514 (diff)
Rename remove add methods to differentiate it to roles crud operations
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java6
1 files changed, 3 insertions, 3 deletions
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(", ")));
}