From 25673a3551f2bf15f23afbbfe986947c6a975c91 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Tue, 15 Dec 2020 09:59:13 +0100 Subject: Add individual artifact validation using common cert. Signed-off-by: Bartosz Gardziejewski Change-Id: I2aa4e862f3d343a3f452e1564dc8a97a34960b83 Issue-ID: VNFSDK-714 --- csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java index 05f2070..74b1bac 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; /** * Verify the CSAR package by following the SOL004 specifications and ONAP VNFREQS for TOSCA. @@ -782,11 +783,13 @@ public class CSARArchive implements AutoCloseable { } public Map>> getNonMano() { - return nonMano; + return Map.copyOf(nonMano); } public void setNonMano(Map>> nonMano) { - this.nonMano = nonMano; + this.nonMano = nonMano.entrySet().stream() + .filter(mapEntry -> mapEntry.getKey() != null && mapEntry.getValue() != null) + .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue)); this.isNonManoAvailable = true; } -- cgit 1.2.3-korg