diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-11 15:09:55 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-11 21:04:22 +0200 |
commit | 2d6bbe0b8bff09d105b77161c1d26a00ce43bf0c (patch) | |
tree | f9948a9904d837960887e81a956b29f92d918002 /security-utils/src/main | |
parent | 6923743ed320ce339727ad57f6fc2da5f82f5e3f (diff) |
Unify on List.of
Diffstat (limited to 'security-utils/src/main')
5 files changed, 7 insertions, 15 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java index c4c01ca130c..0901ea5931f 100644 --- a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java @@ -15,8 +15,6 @@ import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; -import static java.util.Collections.singletonList; - /** * @author bjorncs */ @@ -53,7 +51,7 @@ public class KeyStoreBuilder { } public KeyStoreBuilder withKeyEntry(String alias, PrivateKey privateKey, char[] password, X509Certificate certificate) { - return withKeyEntry(alias, privateKey, password, singletonList(certificate)); + return withKeyEntry(alias, privateKey, password, List.of(certificate)); } public KeyStoreBuilder withKeyEntry(String alias, PrivateKey privateKey, X509Certificate certificate) { 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 78a00246d38..d1c9ae582b7 100644 --- a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java +++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java @@ -15,8 +15,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import static java.util.Collections.emptyList; - /** * @author bjorncs */ @@ -40,7 +38,7 @@ public class Pkcs10Csr { return getExtensions() .map(extensions -> GeneralNames.fromExtensions(extensions, Extension.subjectAlternativeName)) .map(SubjectAlternativeName::fromGeneralNames) - .orElse(emptyList()); + .orElse(List.of()); } /** @@ -57,7 +55,7 @@ public class Pkcs10Csr { .map(extensions -> Arrays.stream(extensions.getExtensionOIDs()) .map(ASN1ObjectIdentifier::getId) .toList()) - .orElse(emptyList()); + .orElse(List.of()); } diff --git a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java index cedad3afc9b..8fecbb72a43 100644 --- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java +++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java @@ -18,8 +18,6 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.List; -import static java.util.Collections.singletonList; - /** * A builder for {@link SSLContext}. * @@ -48,7 +46,7 @@ public class SslContextBuilder { } public SslContextBuilder withTrustStore(X509Certificate caCertificate) { - return withTrustStore(singletonList(caCertificate)); + return withTrustStore(List.of(caCertificate)); } public SslContextBuilder withTrustStore(List<X509Certificate> caCertificates) { @@ -66,7 +64,7 @@ public class SslContextBuilder { } public SslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate certificate) { - return withKeyStore(privateKey, singletonList(certificate)); + return withKeyStore(privateKey, List.of(certificate)); } public SslContextBuilder withKeyStore(PrivateKey privateKey, List<X509Certificate> certificates) { 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 171a8e890d0..f615ff2e832 100644 --- a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java @@ -34,7 +34,6 @@ import java.security.cert.X509Certificate; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Random; @@ -150,7 +149,7 @@ public class X509CertificateUtils { public static List<SubjectAlternativeName> getSubjectAlternativeNames(X509Certificate certificate) { try { byte[] extensionValue = certificate.getExtensionValue(SUBJECT_ALTERNATIVE_NAMES.getOId()); - if (extensionValue == null) return Collections.emptyList(); + if (extensionValue == null) return List.of(); ASN1Encodable asn1Encodable = ASN1Primitive.fromByteArray(extensionValue); if (asn1Encodable instanceof ASN1OctetString) { asn1Encodable = ASN1Primitive.fromByteArray(((ASN1OctetString) asn1Encodable).getOctets()); diff --git a/security-utils/src/main/java/com/yahoo/security/X509CertificateWithKey.java b/security-utils/src/main/java/com/yahoo/security/X509CertificateWithKey.java index e80d3840bce..afd5fa315a6 100644 --- a/security-utils/src/main/java/com/yahoo/security/X509CertificateWithKey.java +++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateWithKey.java @@ -3,7 +3,6 @@ package com.yahoo.security; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.util.Collections; import java.util.List; /** @@ -18,7 +17,7 @@ public class X509CertificateWithKey { private final PrivateKey privateKey; public X509CertificateWithKey(X509Certificate certificate, PrivateKey privateKey) { - this(Collections.singletonList(certificate), privateKey); + this(List.of(certificate), privateKey); } public X509CertificateWithKey(List<X509Certificate> certificate, PrivateKey privateKey) { |