Use a switch expression in SecurityHelper

Use a switch expression instead of an if/else cascade.

Change-Id: I0e3df820381b77bd5cebb145bbc8a545e1c6f02e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/impl/SecurityHelper.java b/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/impl/SecurityHelper.java
index 30bef1f873e42ec025b67d57013336416654867d..834b3e95f0060d17aa123ecf4b3afa0ec12e7ae1 100644 (file)
--- a/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/impl/SecurityHelper.java
+++ b/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/impl/SecurityHelper.java
@@ -68,26 +68,24 @@ public final class SecurityHelper {
             throw new IOException("No private key present");
         }
 
+        final PEMKeyPair keyPair;
+
         try (var keyReader = new PEMParser(new StringReader(privateKey.replace("\\n", "\n")))) {
             final var obj = keyReader.readObject();
 
-            final PEMKeyPair keyPair;
-            if (obj instanceof PEMEncryptedKeyPair encrypted) {
-                keyPair = encrypted.decryptKeyPair(new JcePEMDecryptorProviderBuilder()
+            keyPair = switch (obj) {
+                case PEMEncryptedKeyPair encrypted -> encrypted.decryptKeyPair(new JcePEMDecryptorProviderBuilder()
                     .setProvider(bcProv)
                     .build(passphrase.toCharArray()));
-            } else if (obj instanceof PEMKeyPair plain) {
-                keyPair = plain;
-            } else if (obj == null) {
-                throw new IOException("Invalid private key");
-            } else {
-                throw new IOException("Unhandled private key " + obj.getClass());
-            }
-
-            return new JcaPEMKeyConverter().getKeyPair(keyPair);
+                case PEMKeyPair plain -> plain;
+                case null -> throw new IOException("Invalid private key");
+                default -> throw new IOException("Unhandled private key " + obj.getClass());
+            };
         } catch (DecoderException e) {
             throw new IOException("Invalid input.", e);
         }
+
+        return new JcaPEMKeyConverter().getKeyPair(keyPair);
     }
 
     @VisibleForTesting