UserRoles -> Roles

4 files changed, 27 insertions, 27 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java
index 239d7216491..5f63ad1f185 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRoles.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java
@@ -14,10 +14,10 @@ import java.util.List;
  *
  * @author jonmv
  */
-public class UserRoles {
+public class Roles {
 
     /** Creates a new UserRoles which can be used for serialisation and listing of bound user roles. */
-    public UserRoles() { }
+    public Roles() { }
 
     /** Returns the list of {@link TenantRole}s a {@link UserId} may be a member of. */
     public List<TenantRole> tenantRoles(TenantName tenant) {
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRolesTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java
index c8e3d1987c9..d43793462ad 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/UserRolesTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/user/RolesTest.java
@@ -12,59 +12,59 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author jonmv
  */
-public class UserRolesTest {
+public class RolesTest {
 
-    private static final UserRoles userRoles = new UserRoles();
+    private static final Roles roles = new Roles();
 
     @Test
     public void testSerialization() {
         TenantName tenant = TenantName.from("my-tenant");
-        for (TenantRole role : userRoles.tenantRoles(tenant))
-            assertEquals(role, userRoles.toRole(UserRoles.valueOf(role)));
+        for (TenantRole role : roles.tenantRoles(tenant))
+            assertEquals(role, roles.toRole(Roles.valueOf(role)));
 
         ApplicationName application = ApplicationName.from("my-application");
-        for (ApplicationRole role : userRoles.applicationRoles(tenant, application))
-            assertEquals(role, userRoles.toRole(UserRoles.valueOf(role)));
+        for (ApplicationRole role : roles.applicationRoles(tenant, application))
+            assertEquals(role, roles.toRole(Roles.valueOf(role)));
 
         assertEquals(Role.tenantOperator(tenant),
-                     userRoles.toRole("my-tenant.tenantOperator"));
+                     roles.toRole("my-tenant.tenantOperator"));
         assertEquals(Role.applicationReader(tenant, application),
-                     userRoles.toRole("my-tenant.my-application.applicationReader"));
+                     roles.toRole("my-tenant.my-application.applicationReader"));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalTenantName() {
-        UserRoles.valueOf(Role.tenantAdmin(TenantName.from("my.tenant")));
+        Roles.valueOf(Role.tenantAdmin(TenantName.from("my.tenant")));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalApplicationName() {
-        UserRoles.valueOf(Role.applicationOperator(TenantName.from("my-tenant"), ApplicationName.from("my.app")));
+        Roles.valueOf(Role.applicationOperator(TenantName.from("my-tenant"), ApplicationName.from("my.app")));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalRole() {
-        UserRoles.valueOf(Role.tenantPipeline(TenantName.from("my-tenant"), ApplicationName.from("my-app")));
+        Roles.valueOf(Role.tenantPipeline(TenantName.from("my-tenant"), ApplicationName.from("my-app")));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalRoleValue() {
-        userRoles.toRole("my-tenant.awesomePerson");
+        roles.toRole("my-tenant.awesomePerson");
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalCombination() {
-        userRoles.toRole("my-tenant.my-application.tenantOwner");
+        roles.toRole("my-tenant.my-application.tenantOwner");
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalValue() {
-        userRoles.toRole("everyone");
+        roles.toRole("everyone");
     }
 
     @Test
     public void allowHostedOperator() {
-        assertEquals(Role.hostedOperator(), userRoles.toRole("hostedOperator"));
+        assertEquals(Role.hostedOperator(), roles.toRole("hostedOperator"));
     }
 
 }
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 c11bdc38c5d..d2979824651 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
@@ -15,7 +15,7 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserId;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement;
-import com.yahoo.vespa.hosted.controller.api.integration.user.UserRoles;
+import com.yahoo.vespa.hosted.controller.api.integration.user.Roles;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.api.role.RoleDefinition;
 import com.yahoo.vespa.hosted.controller.restapi.ErrorResponse;
@@ -45,13 +45,13 @@ public class UserApiHandler extends LoggingRequestHandler {
     private final static Logger log = Logger.getLogger(UserApiHandler.class.getName());
     private static final String optionalPrefix = "/api";
 
-    private final UserRoles roles;
+    private final Roles roles;
     private final UserManagement users;
 
     @Inject
     public UserApiHandler(Context parentCtx, UserManagement users) {
         super(parentCtx);
-        this.roles = new UserRoles();
+        this.roles = new Roles();
         this.users = users;
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
index 7e0bb42c712..4daa2216484 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
@@ -7,7 +7,7 @@ import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.Marketplace;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserId;
 import com.yahoo.vespa.hosted.controller.api.integration.user.UserManagement;
-import com.yahoo.vespa.hosted.controller.api.integration.user.UserRoles;
+import com.yahoo.vespa.hosted.controller.api.integration.user.Roles;
 import com.yahoo.vespa.hosted.controller.api.role.ApplicationRole;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.api.role.TenantRole;
@@ -24,13 +24,13 @@ public class CloudAccessControl implements AccessControl {
 
     private final Marketplace marketplace;
     private final UserManagement userManagement;
-    private final UserRoles userRoles;
+    private final Roles roles;
 
     @Inject
     public CloudAccessControl(Marketplace marketplace, UserManagement userManagement) {
         this.marketplace = marketplace;
         this.userManagement = userManagement;
-        this.userRoles = new UserRoles();
+        this.roles = new Roles();
     }
 
     @Override
@@ -38,7 +38,7 @@ public class CloudAccessControl implements AccessControl {
         CloudTenantSpec spec = (CloudTenantSpec) tenantSpec;
         CloudTenant tenant = new CloudTenant(spec.tenant(), marketplace.resolveCustomer(spec.getRegistrationToken()));
 
-        for (Role role : userRoles.tenantRoles(spec.tenant()))
+        for (Role role : roles.tenantRoles(spec.tenant()))
             userManagement.createRole(role);
         userManagement.addUsers(Role.tenantOwner(spec.tenant()), List.of(new UserId(credentials.user().getName())));
 
@@ -54,20 +54,20 @@ public class CloudAccessControl implements AccessControl {
     public void deleteTenant(TenantName tenant, Credentials credentials) {
         // Probably terminate customer subscription?
 
-        for (TenantRole role : userRoles.tenantRoles(tenant))
+        for (TenantRole role : roles.tenantRoles(tenant))
             userManagement.deleteRole(role);
     }
 
     @Override
     public void createApplication(ApplicationId id, Credentials credentials) {
-        for (Role role : userRoles.applicationRoles(id.tenant(), id.application()))
+        for (Role role : roles.applicationRoles(id.tenant(), id.application()))
             userManagement.createRole(role);
         userManagement.addUsers(Role.applicationAdmin(id.tenant(), id.application()), List.of(new UserId(credentials.user().getName())));
     }
 
     @Override
     public void deleteApplication(ApplicationId id, Credentials credentials) {
-        for (ApplicationRole role : userRoles.applicationRoles(id.tenant(), id.application()))
+        for (ApplicationRole role : roles.applicationRoles(id.tenant(), id.application()))
             userManagement.deleteRole(role);
     }