From 1cf51a2280fb2f9a0435b8a3f2c64492cb7e6659 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Tue, 16 Jan 2024 09:39:06 +0000 Subject: Recursive updates of the properties Merge properties during update and migrate. Issue-ID: POLICY-4951 Change-Id: I0c9a896a5abb8331937a73d7e39fbce2d87b415f Signed-off-by: FrancescoFioraEst --- .../participant/intermediary/handler/AutomationCompositionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'participant') diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java index fefa637da..3f3d5756a 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java @@ -53,6 +53,7 @@ import org.onap.policy.clamp.models.acm.messages.kafka.participant.PropertiesUpd import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.LockOrder; import org.onap.policy.clamp.models.acm.persistence.provider.AcInstanceStateResolver; +import org.onap.policy.clamp.models.acm.utils.AcmUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -307,7 +308,7 @@ public class AutomationCompositionHandler { var acElementList = cacheProvider.getAutomationComposition(instanceId).getElements(); for (var element : participantDeploy.getAcElementList()) { var acElement = acElementList.get(element.getId()); - acElement.getProperties().putAll(element.getProperties()); + AcmUtils.recursiveMerge(acElement.getProperties(), element.getProperties()); acElement.setDeployState(deployState); acElement.setDefinition(element.getDefinition()); } -- cgit 1.2.3-korg