zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Run automatic Java 8 conversion over codebase

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171174380
This commit is contained in:
mcilwain 2017-10-05 10:48:38 -07:00 • committed by Ben McIlwain
parent 44df5da771
commit 5edb7935ed
190 changed files with 2312 additions and 3096 deletions
Download patch file Download diff file Expand all files Collapse all files

21
java/google/registry/util/X509Utils.java
View file

@ -17,12 +17,11 @@ package google.registry.util;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static com.google.common.io.BaseEncoding.base64;
import static java.nio.charset.StandardCharsets.US_ASCII;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@ -72,9 +71,12 @@ public final class X509Utils {
public static X509Certificate loadCertificate(InputStream input)
throws CertificateParsingException {
try {
return Iterables.getOnlyElement(FluentIterable
.from(CertificateFactory.getInstance("X.509").generateCertificates(input))
.filter(X509Certificate.class));
return CertificateFactory.getInstance("X.509")
.generateCertificates(input)
.stream()
.filter(X509Certificate.class::isInstance)
.map(X509Certificate.class::cast)
.collect(onlyElement());
} catch (CertificateException e) { // CertificateParsingException by specification.
throwIfInstanceOf(e, CertificateParsingException.class);
throw new CertificateParsingException(e);
@ -114,9 +116,12 @@ public final class X509Utils {
public static X509CRL loadCrl(String asciiCrl) throws GeneralSecurityException {
ByteArrayInputStream input = new ByteArrayInputStream(asciiCrl.getBytes(US_ASCII));
try {
return Iterables.getOnlyElement(FluentIterable
.from(CertificateFactory.getInstance("X.509").generateCRLs(input))
.filter(X509CRL.class));
return CertificateFactory.getInstance("X.509")
.generateCRLs(input)
.stream()
.filter(X509CRL.class::isInstance)
.map(X509CRL.class::cast)
.collect(onlyElement());
} catch (NoSuchElementException e) {
throw new CRLException("No X509CRL found.");
} catch (IllegalArgumentException e) {