summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-12 16:06:37 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-04-12 16:06:37 +0200
commit88c146b7027dc5064fe44941669930b459c33bd1 (patch)
treef44143f7440f693e777c1043bbf57d6fb8696734
parent7a28b60d0a1e58d29dbd6b27e30d2f00b6629324 (diff)
Order most important role members first
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java3
1 files changed, 2 insertions, 1 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 dd9f6c42df6..b8c904a80f6 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
@@ -28,6 +28,7 @@ import com.yahoo.yolean.Exceptions;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -132,7 +133,7 @@ public class UserApiHandler extends LoggingRequestHandler {
for (Role role : roles)
rolesArray.addString(valueOf(role));
- Map<UserId, List<Role>> memberships = new HashMap<>();
+ Map<UserId, List<Role>> memberships = new LinkedHashMap<>();
List<Role> allRoles = new ArrayList<>(superRoles); // Membership in a super role may imply membership in a role.
allRoles.addAll(roles);
for (Role role : allRoles)