Unify on Streams.toList()

5 files changed, 8 insertions, 13 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/ZToken.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/ZToken.java
index c3c2756b226..7e28b44f20f 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/ZToken.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/ZToken.java
@@ -8,7 +8,6 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
 
-import static java.util.stream.Collectors.toList;
 
 /**
  * Represents an Athenz ZToken (role token)
@@ -39,7 +38,7 @@ public class ZToken {
         String domain = token.getDomain();
         return token.getRoles().stream()
                 .map(roleName -> new AthenzRole(domain, roleName))
-                .collect(toList());}
+                .toList();}
 
     public Instant getExpiryTime () {
         return Instant.ofEpochSecond(token.getExpiryTime());
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 7b3388d1027..68a71b9663f 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
@@ -50,7 +50,6 @@ import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author bjorncs
@@ -200,7 +199,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
                 .build();
         return execute(request, response -> {
             DomainListResponseEntity result = readEntity(response, DomainListResponseEntity.class);
-            return result.domains.stream().map(AthenzDomain::new).collect(toList());
+            return result.domains.stream().map(AthenzDomain::new).toList();
         });
     }
 
@@ -212,7 +211,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
                 .build();
         return execute(request, response -> {
             DomainListResponseEntity result = readEntity(response, DomainListResponseEntity.class);
-            return result.domains.stream().map(AthenzDomain::new).collect(toList());
+            return result.domains.stream().map(AthenzDomain::new).toList();
         });
     }
 
@@ -300,7 +299,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
                         .id(a.getId())
                         .effect(AthenzAssertion.Effect.valueOrNull(a.getEffect()))
                         .build())
-                .collect(toList());
+                .toList();
         return Optional.of(new AthenzPolicy(entity.getName(), assertions));
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/ResourceGroupRolesEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/ResourceGroupRolesEntity.java
index 31773f85229..ffc01c97229 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/ResourceGroupRolesEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/ResourceGroupRolesEntity.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.athenz.client.zms.RoleAction;
 import java.util.List;
 import java.util.Set;
 
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author bjorncs
@@ -51,7 +50,7 @@ public class ResourceGroupRolesEntity {
         this.domain = providerService.getDomainName();
         this.service = providerService.getName();
         this.tenant = tenantDomain.getName();
-        this.roles = rolesActions.stream().map(roleAction -> new TenantRoleAction(roleAction.getRoleName(), roleAction.getAction())).collect(toList());
+        this.roles = rolesActions.stream().map(roleAction -> new TenantRoleAction(roleAction.getRoleName(), roleAction.getAction())).toList();
         this.resourceGroup = resourceGroup;
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index 262df8611f5..cf46cad57b1 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -42,7 +42,6 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
 
 /**
  * Default implementation of {@link ZtsClient}
@@ -149,7 +148,7 @@ public class DefaultZtsClient extends ClientBase implements ZtsClient {
     public AthenzAccessToken getAccessToken(List<AthenzRole> athenzRole) {
         List<AthenzResourceName> athenzResourceNames = athenzRole.stream()
                 .map(AthenzRole::toResourceName)
-                .collect(toList());
+                .toList();
         return this.getAccessTokenImpl(athenzResourceNames, List.of());
     }
 
@@ -201,7 +200,7 @@ public class DefaultZtsClient extends ClientBase implements ZtsClient {
                 .build();
         return execute(request, response -> {
             TenantDomainsResponseEntity entity = readEntity(response, TenantDomainsResponseEntity.class);
-            return entity.tenantDomainNames.stream().map(AthenzDomain::new).collect(toList());
+            return entity.tenantDomainNames.stream().map(AthenzDomain::new).toList();
         });
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/SiaUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/SiaUtils.java
index 596bc45d127..848a3026843 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/SiaUtils.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/SiaUtils.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.StreamSupport;
 
-import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -128,7 +127,7 @@ public class SiaUtils {
         String keyFileSuffix = ".key.pem";
         Path keysDirectory = root.resolve("keys");
         if ( ! Files.exists(keysDirectory))
-            return emptyList();
+            return List.of();
 
         try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(keysDirectory)) {
             return StreamSupport.stream(directoryStream.spliterator(), false)