From 878fccc643294a4bbd974cda5dd71a61562c4c9f Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Tue, 2 Apr 2024 17:15:27 +0100 Subject: Merge properties in migrate in ACM Issue-ID: POLICY-4954 Change-Id: If11b55e215512b7893ed62fa60d97570d3c4f5fc Signed-off-by: FrancescoFioraEst --- .../instantiation/AutomationCompositionInstantiationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java index ad004427a..220636b9d 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java @@ -201,7 +201,7 @@ public class AutomationCompositionInstantiationProvider { if (dbAcElement == null) { throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, "Element id not present " + elementId); } - dbAcElement.getProperties().putAll(element.getValue().getProperties()); + AcmUtils.recursiveMerge(dbAcElement.getProperties(), element.getValue().getProperties()); var newDefinition = element.getValue().getDefinition(); var compatibility = newDefinition.asConceptKey().getCompatibility(dbAcElement.getDefinition().asConceptKey()); -- cgit 1.2.3-korg