jackson 2.16 changes some of its default settings so we consolidate our use of the ObjectMapper.

Unless special options are used, use a common instance, or create via factory metod.

1 files changed, 13 insertions, 13 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
index b9454df4cee..b81f28651ce 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java
@@ -59,7 +59,7 @@ class TransportSecurityOptionsJsonSerializer {
         }
         List<AuthorizedPeer> authorizedPeersEntity = entity.authorizedPeers;
         if (authorizedPeersEntity != null) {
-            if (authorizedPeersEntity.size() == 0) {
+            if (authorizedPeersEntity.isEmpty()) {
                 throw new IllegalArgumentException("'authorized-peers' cannot be empty");
             }
             builder.withAuthorizedPeers(new AuthorizedPeers(toPeerPolicies(authorizedPeersEntity)));
@@ -124,12 +124,12 @@ class TransportSecurityOptionsJsonSerializer {
     }
 
     private static RequiredPeerCredential.Field toField(CredentialField field) {
-        switch (field) {
-            case CN: return RequiredPeerCredential.Field.CN;
-            case SAN_DNS: return RequiredPeerCredential.Field.SAN_DNS;
-            case SAN_URI: return RequiredPeerCredential.Field.SAN_URI;
-            default: throw new IllegalArgumentException("Invalid field type: " + field);
-        }
+        return switch (field) {
+            case CN -> RequiredPeerCredential.Field.CN;
+            case SAN_DNS -> RequiredPeerCredential.Field.SAN_DNS;
+            case SAN_URI -> RequiredPeerCredential.Field.SAN_URI;
+            default -> throw new IllegalArgumentException("Invalid field type: " + field);
+        };
     }
 
     private static TransportSecurityOptionsEntity toTransportSecurityOptionsEntity(TransportSecurityOptions options) {
@@ -172,12 +172,12 @@ class TransportSecurityOptionsJsonSerializer {
     }
 
     private static CredentialField toField(RequiredPeerCredential.Field field) {
-        switch (field) {
-            case CN: return CredentialField.CN;
-            case SAN_DNS: return CredentialField.SAN_DNS;
-            case SAN_URI: return CredentialField.SAN_URI;
-            default: throw new IllegalArgumentException("Invalid field type: " + field);
-        }
+        return switch (field) {
+            case CN -> CredentialField.CN;
+            case SAN_DNS -> CredentialField.SAN_DNS;
+            case SAN_URI -> CredentialField.SAN_URI;
+            default -> throw new IllegalArgumentException("Invalid field type: " + field);
+        };
     }
 
     private static IllegalArgumentException missingFieldException(String fieldName) {