Minor cleanup

1 files changed, 23 insertions, 23 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/UserRoles.java
index 424f5a1d8a5..df68cf807cc 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/UserRoles.java
@@ -49,6 +49,16 @@ public class UserRoles {
         throw new IllegalArgumentException("Malformed or illegal role value '" + value + "'.");
     }
 
+    /** Returns the {@link Role} the given tenant, application and role names correspond to. */
+    public Role toRole(TenantName tenant, String roleName) {
+        switch (roleName) {
+            case "tenantOwner": return roles.tenantOwner(tenant);
+            case "tenantAdmin": return roles.tenantAdmin(tenant);
+            case "tenantOperator": return roles.tenantOperator(tenant);
+            default: throw new IllegalArgumentException("Malformed or illegal role name '" + roleName + "'.");
+        }
+    }
+
     /** Returns the {@link Role} the given tenant and role names correspond to. */
     public Role toRole(TenantName tenant, ApplicationName application, String roleName) {
         switch (roleName) {
@@ -60,16 +70,6 @@ public class UserRoles {
         }
     }
 
-    /** Returns the {@link Role} the given tenant, application and role names correspond to. */
-    public Role toRole(TenantName tenant, String roleName) {
-        switch (roleName) {
-            case "tenantOwner": return roles.tenantOwner(tenant);
-            case "tenantAdmin": return roles.tenantAdmin(tenant);
-            case "tenantOperator": return roles.tenantOperator(tenant);
-            default: throw new IllegalArgumentException("Malformed or illegal role name '" + roleName + "'.");
-        }
-    }
-
     /** Returns a serialised representation the given role. */
     public static String valueOf(Role role) {
         if (role instanceof TenantRole) return valueOf((TenantRole) role);
@@ -85,19 +85,6 @@ public class UserRoles {
         return valueOf(role.tenant()) + "." + valueOf(role.application()) + "." + valueOf(role.definition());
     }
 
-    private static String valueOf(RoleDefinition role) {
-        switch (role) {
-            case tenantOwner:          return "tenantOwner";
-            case tenantAdmin:          return "tenantAdmin";
-            case tenantOperator:       return "tenantOperator";
-            case applicationAdmin:     return "applicationAdmin";
-            case applicationOperator:  return "applicationOperator";
-            case applicationDeveloper: return "applicationDeveloper";
-            case applicationReader:    return "applicationReader";
-            default: throw new IllegalArgumentException("No value defined for role '" + role + "'.");
-        }
-    }
-
     private static String valueOf(TenantName tenant) {
         if (tenant.value().contains("."))
             throw new IllegalArgumentException("Tenant names may not contain '.'.");
@@ -112,4 +99,17 @@ public class UserRoles {
         return application.value();
     }
 
+    private static String valueOf(RoleDefinition role) {
+        switch (role) {
+            case tenantOwner:          return "tenantOwner";
+            case tenantAdmin:          return "tenantAdmin";
+            case tenantOperator:       return "tenantOperator";
+            case applicationAdmin:     return "applicationAdmin";
+            case applicationOperator:  return "applicationOperator";
+            case applicationDeveloper: return "applicationDeveloper";
+            case applicationReader:    return "applicationReader";
+            default: throw new IllegalArgumentException("No value defined for role '" + role + "'.");
+        }
+    }
+
 }