This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1a71e4cb066071d09995f456d4a4525ffff5b9f9 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Fri May 1 10:11:04 2020 +0100 Some optimisations for TrustedAuthorityValidator --- .../apache/cxf/xkms/x509/validator/DirectTrustValidator.java | 2 +- .../cxf/xkms/x509/validator/TrustedAuthorityValidator.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DirectTrustValidator.java b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DirectTrustValidator.java index 913f17a..fa0de1b 100644 --- a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DirectTrustValidator.java +++ b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DirectTrustValidator.java @@ -36,7 +36,7 @@ public class DirectTrustValidator implements Validator { private static final Logger LOG = LogUtils.getL7dLogger(DirectTrustValidator.class); - private CertificateRepo certRepo; + private final CertificateRepo certRepo; public DirectTrustValidator(CertificateRepo certRepo) { this.certRepo = certRepo; diff --git a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java index 76a4314..9b31102 100644 --- a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java +++ b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java @@ -34,11 +34,11 @@ import java.security.cert.TrustAnchor; import java.security.cert.X509CRL; import java.security.cert.X509CertSelector; import java.security.cert.X509Certificate; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.xkms.handlers.Validator; @@ -52,7 +52,7 @@ public class TrustedAuthorityValidator implements Validator { private static final Logger LOG = LogUtils.getL7dLogger(TrustedAuthorityValidator.class); - CertificateRepo certRepo; + final CertificateRepo certRepo; boolean enableRevocation = true; public TrustedAuthorityValidator(CertificateRepo certRepo) { @@ -116,11 +116,9 @@ public class TrustedAuthorityValidator implements Validator { } private Set<TrustAnchor> asTrustAnchors(List<X509Certificate> trustedAuthorityCerts) { - Set<TrustAnchor> trustAnchors = new HashSet<>(); - for (X509Certificate trustedAuthorityCert : trustedAuthorityCerts) { - trustAnchors.add(new TrustAnchor(trustedAuthorityCert, null)); - } - return trustAnchors; + return trustedAuthorityCerts.stream() + .map(cert -> new TrustAnchor(cert, null)) + .collect(Collectors.toSet()); } @Override
