Add merge utility for service templates 53/101053/6
authorliamfallon <liam.fallon@est.tech>
Mon, 3 Feb 2020 14:37:33 +0000 (14:37 +0000)
committerliamfallon <liam.fallon@est.tech>
Tue, 4 Feb 2020 12:47:09 +0000 (12:47 +0000)
commit70dbf7a387b0e5d00f50a954751c4d4b4e54d7e2
tree129e5118d695802d378cd5924b7aa1e5ee043891
parent172a67f92943d64d5a1eda2b1dabf6c1c1c77f7e
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>
models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java
models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaServiceTemplate.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTopologyTemplate.java
models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java [new file with mode: 0644]
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaModelTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtilsTest.java [new file with mode: 0644]