Misc minor code improvements

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

4 files changed, 13 insertions, 14 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;
         }
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
index 76019a9df4e..47814546135 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
@@ -52,12 +52,12 @@ public class TransportSecurityOptionsJsonSerializer {
         Files files = entity.files;
         if (files != null) {
             if (files.certificatesFile != null && files.privateKeyFile != null) {
-                builder.withCertificate(Paths.get(files.certificatesFile), Paths.get(files.privateKeyFile));
+                builder.withCertificates(Paths.get(files.certificatesFile), Paths.get(files.privateKeyFile));
             } else if (files.certificatesFile != null || files.privateKeyFile != null) {
                 throw new IllegalArgumentException("Both 'private-key' and 'certificates' must be configured together");
             }
             if (files.caCertificatesFile != null) {
-                builder.withCaCertificate(Paths.get(files.caCertificatesFile));
+                builder.withCaCertificates(Paths.get(files.caCertificatesFile));
             }
         }
         List<AuthorizedPeer> authorizedPeersEntity = entity.authorizedPeers;
@@ -91,10 +91,10 @@ public class TransportSecurityOptionsJsonSerializer {
 
     private static RequiredPeerCredential toRequiredPeerCredential(RequiredCredential requiredCredential) {
         if (requiredCredential.field == null) {
-            throw new IllegalArgumentException("field");
+            throw missingFieldException("field");
         }
         if (requiredCredential.matchExpression == null) {
-            throw new IllegalArgumentException("must-match");
+            throw missingFieldException("must-match");
         }
         return new RequiredPeerCredential(toField(requiredCredential.field), new HostGlobPattern(requiredCredential.matchExpression));
     }
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
index d1299a3b777..aa5509a23b2 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
@@ -18,8 +18,8 @@ public class TransportSecurityOptionsTest {
 
     private static final Path TEST_CONFIG_FILE = Paths.get("src/test/resources/transport-security-options.json");
     private static final TransportSecurityOptions OPTIONS = new TransportSecurityOptions.Builder()
-            .withCertificate(Paths.get("certs.pem"), Paths.get("myhost.key"))
-            .withCaCertificate(Paths.get("my_cas.pem"))
+            .withCertificates(Paths.get("certs.pem"), Paths.get("myhost.key"))
+            .withCaCertificates(Paths.get("my_cas.pem"))
             .build();
 
     @Test
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializerTest.java b/security-utils/src/test/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializerTest.java
index a3e5bef115b..a6e1de66c68 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializerTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializerTest.java
@@ -25,8 +25,8 @@ public class TransportSecurityOptionsJsonSerializerTest {
     @Test
     public void can_serialize_and_deserialize_transport_security_options() {
         TransportSecurityOptions options = new TransportSecurityOptions.Builder()
-                .withCaCertificate(Paths.get("/path/to/ca-certs.pem"))
-                .withCertificate(Paths.get("/path/to/cert.pem"), Paths.get("/path/to/key.pem"))
+                .withCaCertificates(Paths.get("/path/to/ca-certs.pem"))
+                .withCertificates(Paths.get("/path/to/cert.pem"), Paths.get("/path/to/key.pem"))
                 .withAuthorizedPeers(
                         new AuthorizedPeers(
                                 new HashSet<>(Arrays.asList(
@@ -43,4 +43,4 @@ public class TransportSecurityOptionsJsonSerializerTest {
         assertEquals(options, deserializedOptions);
     }
 
-}
\ No newline at end of file
+}