From 70dbf7a387b0e5d00f50a954751c4d4b4e54d7e2 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 3 Feb 2020 14:37:33 +0000 Subject: Add merge utility for service templates This utility function allows a TOSCA service template fragment to be merged with an exsiting service template and will be tbe backbone of "create" methods on the API from now on. Issue-ID: POLICY-1402 Change-Id: I3381cb2a1bd30621a639dedc213c546eeb2bf9aa Signed-off-by: liamfallon --- .../main/java/org/onap/policy/models/base/PfConceptContainer.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'models-base/src/main/java') diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java index 2ecf8c1c6..949cb96dc 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java @@ -234,10 +234,7 @@ public class PfConceptContainer ex result = key.validate(result); - if (conceptMap.isEmpty()) { - result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID, - "conceptMap may not be empty")); - } else { + if (!conceptMap.isEmpty()) { result = validateConceptMap(result); } -- cgit 1.2.3-korg