From a5e71e426f1d11b381dff8ddda0adfcc9f6f7571 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Tue, 31 Aug 2021 09:33:32 +0100 Subject: Add check for null for policies and policy types Add check when reading policies and policy types from db Issue-ID: POLICY-3606 Change-Id: I7a1d96e4be1841243619e89c31dabc3e761dd17a Signed-off-by: saul.gill --- .../models/tosca/authorative/concepts/ToscaEntity.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java index 98efd1991..919d187de 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java @@ -104,13 +104,16 @@ public class ToscaEntity implements PfNameVersion { // Declare the return map Map entityMap = new LinkedHashMap<>(); + if (listOfMapsOfEntities == null) { + return entityMap; + } + for (Map mapOfEntities : listOfMapsOfEntities) { for (T entityEntry : mapOfEntities.values()) { if (entityMap.containsKey(entityEntry.getKey())) { throw new PfModelRuntimeException(Response.Status.INTERNAL_SERVER_ERROR, - "list of map of entities contains more than one entity with key " + entityEntry.getKey()); + "list of map of entities contains more than one entity with key " + entityEntry.getKey()); } - entityMap.put(entityEntry.getKey(), entityEntry); } } @@ -129,10 +132,14 @@ public class ToscaEntity implements PfNameVersion { // Declare the return map Map entityMap = new LinkedHashMap<>(); + if (mapOfEntities == null) { + return entityMap; + } + for (T entityEntry : mapOfEntities.values()) { if (entityMap.containsKey(entityEntry.getKey())) { throw new PfModelRuntimeException(Response.Status.INTERNAL_SERVER_ERROR, - "list of map of entities contains more than one entity with key " + entityEntry.getKey()); + "list of map of entities contains more than one entity with key " + entityEntry.getKey()); } entityMap.put(entityEntry.getKey(), entityEntry); -- cgit 1.2.3-korg