From a182abd839ed78303fc5f2a7d6a5ba9cd44753d7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 5 Feb 2023 17:58:04 +0100 Subject: [PATCH] Simplify AaaCertProvider.getCipherSuites() The API spec says we are allowed to return empty array, do that in a very straightforward manner, eliminating a @SuppressFBWarnings. Change-Id: Iab3b32df81772611233d77b462ba0ed4a0f30621 Signed-off-by: Robert Varga --- .../aaa/cert/impl/AaaCertProvider.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 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 c532f83c2..ec21ff63e 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 @@ -5,13 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.aaa.cert.impl; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.security.KeyStore; -import java.util.ArrayList; -import java.util.List; import org.opendaylight.aaa.cert.api.IAaaCertProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.CtlKeystore; import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.TrustKeystore; @@ -139,19 +136,11 @@ public class AaaCertProvider implements IAaaCertProvider { } @Override - @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS") public String[] getCipherSuites() { - final List cipherSuites = ctlKeyStore.getCipherSuites(); - if (cipherSuites != null && !cipherSuites.isEmpty()) { - final List suites = new ArrayList<>(); - cipherSuites.stream().forEach(cs -> { - if (!cs.getSuiteName().isEmpty()) { - suites.add(cs.getSuiteName()); - } - }); - return suites.toArray(new String[suites.size()]); - } - return null; + return ctlKeyStore.nonnullCipherSuites().stream() + .map(CipherSuites::getSuiteName) + .filter(name -> !name.isEmpty()) + .toArray(String[]::new); } @Override -- 2.36.6