diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-04-06 10:55:46 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-04-06 10:55:46 +0200 |
| commit | d19ccc730ccc6caf7f69ad05da2aa67352773709 (patch) | |
| tree | 0f42c671bd743617748e46efde068f4e50220ad5 /controller-server | |
| parent | c9211c079703b1ef161ebf17cc94c15ef867bea2 (diff) | |
Avoid persistence layer deciding tenant sort order
Diffstat (limited to 'controller-server')
3 files changed, 9 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java index ac48d9617fa..76778381239 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java @@ -17,6 +17,7 @@ import com.yahoo.vespa.hosted.controller.persistence.CuratorDb; import com.yahoo.vespa.hosted.controller.persistence.PersistenceException; import java.time.Duration; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -53,9 +54,11 @@ public class TenantController { this.athenzClientFactory = athenzClientFactory; } - /** Returns a list of all known tenants */ + /** Returns a list of all known tenants sorted by name */ public List<Tenant> asList() { - return db.listTenants(); + return db.listTenants().stream() + .sorted(Comparator.comparing(Tenant::name)) + .collect(Collectors.toList()); } /** Returns a list of all tenants accessible by the given user */ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json index cea35b764b2..d43957bd317 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json @@ -1,4 +1,4 @@ [ - @include(tenant2.json), - @include(tenant1-recursive.json) + @include(tenant1-recursive.json), + @include(tenant2.json) ] diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json index 8b6b1ff7cf5..d37b4ff63f4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json @@ -1,5 +1,5 @@ [ - @include(tenant2.json), - @include(tenant-with-application.json) + @include(tenant-with-application.json), + @include(tenant2.json) ] |