From a6130bd49cf86df4a81aacaa068583d41723956a Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 27 May 2021 15:35:26 +0200 Subject: Simplify using new methods on client builder --- .../src/main/java/ai/vespa/feed/client/CliClient.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'vespa-feed-client-cli') diff --git a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java index 553ae660888..d20a9bed286 100644 --- a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java +++ b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.nio.file.Files; -import java.nio.file.Path; import java.util.Properties; /** @@ -65,18 +64,8 @@ public class CliClient { if (cliArgs.sslHostnameVerificationDisabled()) { builder.setHostnameVerifier(AcceptAllHostnameVerifier.INSTANCE); } - CliArguments.CertificateAndKey certificateAndKey = cliArgs.certificateAndKey().orElse(null); - Path caCertificates = cliArgs.caCertificates().orElse(null); - if (certificateAndKey != null || caCertificates != null) { - SslContextBuilder sslContextBuilder = new SslContextBuilder(); - if (certificateAndKey != null) { - sslContextBuilder.withCertificateAndKey(certificateAndKey.certificateFile, certificateAndKey.privateKeyFile); - } - if (caCertificates != null) { - sslContextBuilder.withCaCertificates(caCertificates); - } - builder.setSslContext(sslContextBuilder.build()); - } + cliArgs.certificateAndKey().ifPresent(c -> builder.setCertificate(c.certificateFile, c.privateKeyFile)); + cliArgs.caCertificates().ifPresent(builder::setCaCertificates); cliArgs.headers().forEach(builder::addRequestHeader); return builder.build(); } -- cgit v1.2.3