aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2023-06-23 09:03:15 +0200
committerGitHub <noreply@github.com>2023-06-23 09:03:15 +0200
commitf2e0dabf9d2f86bd304a1658fa50e9db8c4d0b77 (patch)
tree1cebf61ebe060c6fd6523d33b3a407ef2e51af92 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
parentc49ddf4dbc1f299544e2e55015fac3d2e641e68e (diff)
parent20901f7726e50c45e09e53a32b36273f8d9ac51c (diff)
Merge pull request #27527 from vespa-engine/revert-27524-bjorncs/endpoint-auth-typev8.183.1
Revert "Bjorncs/endpoint auth type" MERGEOK
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java10
1 files changed, 4 insertions, 6 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 693275987c5..aa3f78f1395 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,6 +139,7 @@ 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;
@@ -910,17 +911,14 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
}
private HttpResponse listTokens(String tenant, HttpRequest request) {
- var tokens = controller.dataplaneTokenService().listTokens(TenantName.from(tenant))
- .stream().sorted(Comparator.comparing(DataplaneTokenVersions::tokenId)).toList();
+ List<DataplaneTokenVersions> dataplaneTokenVersions = controller.dataplaneTokenService().listTokens(TenantName.from(tenant));
Slime slime = new Slime();
Cursor tokensArray = slime.setObject().setArray("tokens");
- for (DataplaneTokenVersions token : tokens) {
+ for (DataplaneTokenVersions token : dataplaneTokenVersions) {
Cursor tokenObject = tokensArray.addObject();
tokenObject.setString("id", token.tokenId().value());
Cursor fingerprintsArray = tokenObject.setArray("versions");
- var versions = token.tokenVersions().stream()
- .sorted(Comparator.comparing(DataplaneTokenVersions.Version::creationTime)).toList();
- for (var tokenVersion : versions) {
+ for (DataplaneTokenVersions.Version tokenVersion : token.tokenVersions()) {
Cursor fingerprintObject = fingerprintsArray.addObject();
fingerprintObject.setString("fingerprint", tokenVersion.fingerPrint().value());
fingerprintObject.setString("created", tokenVersion.creationTime().toString());