Revert "Revert collect(Collectors.toList())"

5 files changed, 6 insertions, 6 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
index 7d38dfda7fb..2ff59b5746f 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
@@ -52,7 +52,7 @@ public class AthenzAccessToken {
         String domain = Optional.ofNullable(jwt().getClaim(AUDIENCE_CLAIM).asString()).orElse("");
         return Optional.ofNullable(jwt().getClaim(SCOPE_CLAIM).asList(String.class)).orElse(List.of()).stream()
                 .map(role -> new AthenzRole(domain, role))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private DecodedJWT jwt() {
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
index dcc3452a69a..b4431424952 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
@@ -53,7 +53,7 @@ public class AthenzRoleInformation extends AthenzRole {
         var auditLog = roleEntity.auditLog()
                 .stream()
                 .map(entry -> new AuditLogEntry(entry.getAdmin(), entry.getAction(), entry.getAuditRef(), entry.getCreated()))
-                .collect(Collectors.toList());
+                .toList();
         return new AthenzRoleInformation(role.domain(), role.roleName(), isSelfServe, reviewEnabled, pendingRequest, auditLog);
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
index aaf9038208f..7b3388d1027 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
@@ -346,7 +346,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
                 .filter(member -> ! member.pendingApproval())
                 .map(RoleEntity.Member::memberName)
                 .map(AthenzIdentities::from)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -356,7 +356,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
 
         return execute.services.stream()
                 .map(serviceName -> new AthenzService(athenzDomain, serviceName))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
index 7c48e8239d5..b32e2bec7a9 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
@@ -32,7 +32,7 @@ public class AccessTokenResponseEntity {
         this.roles = Stream.of(roles.split(" "))
                 .map(AthenzResourceName::fromString)
                 .map(AthenzRole::fromResourceName)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public AthenzAccessToken accessToken() {
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
index 52ce860bfce..93574339c5a 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
@@ -253,7 +253,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
         try {
             List<AthenzRole> roleList = roles.stream()
                     .map(roleName -> new AthenzRole(domain, roleName))
-                    .collect(Collectors.toList());
+                    .toList();
             return roleSpecificAccessTokenCache.get(roleList).value();
         } catch (Exception e) {
             throw new AthenzIdentityProviderException("Could not retrieve access token: " + e.getMessage(), e);