From 8d06a00e55c78248113e339e60b4b554a6e8efee Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 17 Jan 2023 18:20:04 +0100
Subject: Unify on Streams.toList

---
 security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java         | 3 +--
 .../src/main/java/com/yahoo/security/SubjectAlternativeName.java       | 3 +--
 .../src/main/java/com/yahoo/security/X509CertificateUtils.java         | 3 +--
 .../src/main/java/com/yahoo/security/tls/PeerAuthorizer.java           | 3 +--
 .../com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'security-utils')

diff --git a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
index 073b7f43902..199b26d51a4 100644
--- a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
+++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
@@ -16,7 +16,6 @@ import java.util.Objects;
 import java.util.Optional;
 
 import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author bjorncs
@@ -57,7 +56,7 @@ public class Pkcs10Csr {
         return getExtensions()
                 .map(extensions -> Arrays.stream(extensions.getExtensionOIDs())
                         .map(ASN1ObjectIdentifier::getId)
-                        .collect(toList()))
+                        .toList())
                 .orElse(emptyList());
 
     }
diff --git a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
index e184d982790..c93dd59ea98 100644
--- a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
+++ b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author bjorncs
@@ -51,7 +50,7 @@ public class SubjectAlternativeName {
     }
 
     static List<SubjectAlternativeName> fromGeneralNames(GeneralNames generalNames) {
-        return Arrays.stream(generalNames.getNames()).map(SubjectAlternativeName::new).collect(toList());
+        return Arrays.stream(generalNames.getNames()).map(SubjectAlternativeName::new).toList();
     }
 
     private String getValue(GeneralName bcGeneralName) {
diff --git a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
index feb3b4df3e0..67b91dfc61a 100644
--- a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
@@ -39,7 +39,6 @@ import java.util.Optional;
 import java.util.Random;
 
 import static com.yahoo.security.Extension.SUBJECT_ALTERNATIVE_NAMES;
-import static java.util.stream.Collectors.toList;
 
 /**
  * @author bjorncs
@@ -138,7 +137,7 @@ public class X509CertificateUtils {
             return new LdapName(distinguishedName.getName()).getRdns().stream()
                     .filter(rdn -> rdn.getType().equalsIgnoreCase(rdnName))
                     .map(rdn -> rdn.getValue().toString())
-                    .collect(toList());
+                    .toList();
         } catch (NamingException e) {
             throw new IllegalArgumentException("Invalid DN: " + distinguishedName.getName(), e);
         }
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java
index 951b5c57c9e..746fce0e290 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java
@@ -13,7 +13,6 @@ import java.util.logging.Logger;
 import static com.yahoo.security.SubjectAlternativeName.Type.DNS;
 import static com.yahoo.security.SubjectAlternativeName.Type.IP;
 import static com.yahoo.security.SubjectAlternativeName.Type.URI;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Uses rules from {@link AuthorizedPeers} to evaluate X509 certificates
@@ -75,6 +74,6 @@ public class PeerAuthorizer {
         return X509CertificateUtils.getSubjectAlternativeNames(peerCertificate).stream()
                 .filter(san -> san.getType() == DNS || san.getType() == IP || san.getType() == URI)
                 .map(SubjectAlternativeName::getValue)
-                .collect(toList());
+                .toList();
     }
 }
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
index 0349d4085db..34626e23e7a 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -111,7 +110,7 @@ class TransportSecurityOptionsJsonSerializer {
     private static List<RequiredPeerCredential> toRequestPeerCredentials(List<RequiredCredential> requiredCredentials) {
         return requiredCredentials.stream()
                 .map(TransportSecurityOptionsJsonSerializer::toRequiredPeerCredential)
-                .collect(toList());
+                .toList();
     }
 
     private static RequiredPeerCredential toRequiredPeerCredential(RequiredCredential requiredCredential) {
-- 
cgit v1.2.3