From: Michal Chabiera <michal.chabiera@orange.com>
Date: Fri, 18 Mar 2022 12:24:06 +0000 (+0100)
Subject: Fix NullPointerException when k8s resource labels is null
X-Git-Tag: 1.10.0~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F127889%2F1;p=so%2Fadapters%2Fso-cnf-adapter.git

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 <michal.chabiera@orange.com>
Change-Id: I5450d723f189e97aea2f81e739a4f3e3e6547c66
---

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<String> parseLabels(Map<String, String> labels) {
         List<String> 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;
     }