Misc minor code improvements

- Improve naming of some methods and parameters
- Add missing trailing newline
- Use missingFieldException(String)
- Remove dead code

1 files changed, 4 insertions, 5 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
index 8770c69832e..a55c2de7306 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
@@ -70,13 +70,12 @@ public class TransportSecurityOptions {
         return new String(out.toByteArray(), StandardCharsets.UTF_8);
     }
 
-    public void toJsonFile(Path caCertificatesFile) {
-        try (OutputStream out = Files.newOutputStream(caCertificatesFile)) {
+    public void toJsonFile(Path file) {
+        try (OutputStream out = Files.newOutputStream(file)) {
             new TransportSecurityOptionsJsonSerializer().serialize(out, this);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
     }
 
     public static class Builder {
@@ -87,13 +86,13 @@ public class TransportSecurityOptions {
 
         public Builder() {}
 
-        public Builder withCertificate(Path certificatesFile, Path privateKeyFile) {
+        public Builder withCertificates(Path certificatesFile, Path privateKeyFile) {
             this.certificatesFile = certificatesFile;
             this.privateKeyFile = privateKeyFile;
             return this;
         }
 
-        public Builder withCaCertificate(Path caCertificatesFile) {
+        public Builder withCaCertificates(Path caCertificatesFile) {
             this.caCertificatesFile = caCertificatesFile;
             return this;
         }