Simplify AaaCertProvider.getTlsProtocols()

Supply an empty string to make the conversion logic less convoluted.

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

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertProvider.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertProvider.java
index ec21ff63e474d7dd637ffd30cec773608daded67..4916d48bc1e6134e30528794e804f8579a67ca25 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertProvider.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertProvider.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.aaa.cert.impl;
 
+import static java.util.Objects.requireNonNullElse;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.security.KeyStore;
 import org.opendaylight.aaa.cert.api.IAaaCertProvider;
@@ -24,7 +26,6 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class AaaCertProvider implements IAaaCertProvider {
-
     private static final Logger LOG = LoggerFactory.getLogger(AaaCertProvider.class);
 
     private final CtlKeystore ctlKeyStore;
@@ -146,16 +147,12 @@ public class AaaCertProvider implements IAaaCertProvider {
     @Override
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
     public String[] getTlsProtocols() {
-        String tlsProtocols = ctlKeyStore.getTlsProtocols();
-        if (tlsProtocols != null && !tlsProtocols.isEmpty()) {
-            // remove white spaces in tlsProtocols string
-            tlsProtocols = tlsProtocols.replace(" ", "");
-            if (tlsProtocols.contains(",")) {
-                return tlsProtocols.split(",");
-            } else {
-                return new String[] { tlsProtocols };
-            }
+        // remove white spaces in tlsProtocols string
+        final var tlsProtocols = requireNonNullElse(ctlKeyStore.getTlsProtocols(), "").replace(" ", "");
+        if (tlsProtocols.isEmpty()) {
+            return null;
         }
-        return null;
+
+        return tlsProtocols.contains(",") ? tlsProtocols.split(",") : new String[] { tlsProtocols };
     }
 }