From ea23e0c6526ae0fa649ad5657ac19d27a5aa46d0 Mon Sep 17 00:00:00 2001 From: Michal Chabiera Date: Fri, 18 Mar 2022 13:24:06 +0100 Subject: Fix NullPointerException when k8s resource labels is null Check if labels is not null to avoid NullPointerException. When the lebels is null empty list should be returned. Issue-ID: SO-3908 Signed-off-by: Michal Chabiera Change-Id: I5450d723f189e97aea2f81e739a4f3e3e6547c66 --- .../so/adapters/cnf/service/aai/AaiResponseParser.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java index 0b300c4..114b776 100644 --- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java @@ -89,13 +89,15 @@ public class AaiResponseParser { private List parseLabels(Map labels) { List result = new ArrayList<>(); - labels.entrySet().stream() - .filter(i -> i.getKey().equals(INSTANCE_ID)) - .findFirst() - .ifPresent(i -> addLabelEntry(i, result)); - labels.entrySet().stream() - .filter(i -> !i.getKey().equals(INSTANCE_ID)) - .forEach(i -> addLabelEntry(i, result)); + if (labels != null) { + labels.entrySet().stream() + .filter(i -> i.getKey().equals(INSTANCE_ID)) + .findFirst() + .ifPresent(i -> addLabelEntry(i, result)); + labels.entrySet().stream() + .filter(i -> !i.getKey().equals(INSTANCE_ID)) + .forEach(i -> addLabelEntry(i, result)); + } return result; } -- cgit 1.2.3-korg