Show tenants where user is hostedDeveloper

1 files changed, 6 insertions, 12 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 fce2d283da2..e10defb4416 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
@@ -384,18 +384,12 @@ public class UserApiHandler extends ThreadedHttpRequestHandler {
     }
 
     private static Collection<TenantRole> filterTenantRoles(Role role) {
-        if (!(role instanceof TenantRole))
-            return Set.of();
-
-        TenantRole tenantRole = (TenantRole) role;
-        if (tenantRole.definition() == RoleDefinition.administrator
-                || tenantRole.definition() == RoleDefinition.developer
-                || tenantRole.definition() == RoleDefinition.reader)
-            return Set.of(tenantRole);
-
-        if (tenantRole.definition() == RoleDefinition.athenzTenantAdmin)
-            return Roles.tenantRoles(tenantRole.tenant());
-
+        if (role instanceof TenantRole tenantRole) {
+            switch (tenantRole.definition()) {
+                case administrator, developer, reader, hostedDeveloper: return Set.of(tenantRole);
+                case athenzTenantAdmin: return Roles.tenantRoles(tenantRole.tenant());
+            }
+        }
         return Set.of();
     }