From 1e437960113a61a93dedd4b2f0c9fa1eeea2db26 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 5 Feb 2023 18:02:13 +0100 Subject: [PATCH] Simplify AaaCertProvider.getTlsProtocols() Supply an empty string to make the conversion logic less convoluted. Change-Id: Ibb22c0a5c5ce37d46c8c6d50f694bcedd038dc4f Signed-off-by: Robert Varga --- .../aaa/cert/impl/AaaCertProvider.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) 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 ec21ff63e..4916d48bc 100644 --- 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 }; } } -- 2.36.6