summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-06-22 15:17:28 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-06-22 17:44:15 +0200
commit05dd9ad33b5daf9367ebed515c5a727f5f9a5926 (patch)
tree5fe774164be7ac879488f6f9fdbd3794b031c69e
parentad2c94853efd67359bc3061793cc22a65c20a90a (diff)
Order tokens
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index aa3f78f1395..693275987c5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -139,7 +139,6 @@ import com.yahoo.yolean.Exceptions;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UncheckedIOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -911,14 +910,17 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
}
private HttpResponse listTokens(String tenant, HttpRequest request) {
- List<DataplaneTokenVersions> dataplaneTokenVersions = controller.dataplaneTokenService().listTokens(TenantName.from(tenant));
+ var tokens = controller.dataplaneTokenService().listTokens(TenantName.from(tenant))
+ .stream().sorted(Comparator.comparing(DataplaneTokenVersions::tokenId)).toList();
Slime slime = new Slime();
Cursor tokensArray = slime.setObject().setArray("tokens");
- for (DataplaneTokenVersions token : dataplaneTokenVersions) {
+ for (DataplaneTokenVersions token : tokens) {
Cursor tokenObject = tokensArray.addObject();
tokenObject.setString("id", token.tokenId().value());
Cursor fingerprintsArray = tokenObject.setArray("versions");
- for (DataplaneTokenVersions.Version tokenVersion : token.tokenVersions()) {
+ var versions = token.tokenVersions().stream()
+ .sorted(Comparator.comparing(DataplaneTokenVersions.Version::creationTime)).toList();
+ for (var tokenVersion : versions) {
Cursor fingerprintObject = fingerprintsArray.addObject();
fingerprintObject.setString("fingerprint", tokenVersion.fingerPrint().value());
fingerprintObject.setString("created", tokenVersion.creationTime().toString());