diff options
| author |   liamfallon <liam.fallon@est.tech> | 2020-02-03 14:37:33 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2020-02-04 12:47:09 +0000 |
| commit | 70dbf7a387b0e5d00f50a954751c4d4b4e54d7e2 (patch) | |
| tree | 129e5118d695802d378cd5924b7aa1e5ee043891 /models-base/src/main | |
| parent | 172a67f92943d64d5a1eda2b1dabf6c1c1c77f7e (diff) | |
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 <liam.fallon@est.tech>
Diffstat (limited to 'models-base/src/main')
| -rw-r--r-- | models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java | 5 |
1 files changed, 1 insertions, 4 deletions
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<C extends PfConcept, A extends PfNameVersion> 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); } |