summaryrefslogtreecommitdiffstats
path: root/participant
diff options
context:
space:
mode:
authorFrancescoFioraEst <francesco.fiora@est.tech>2024-01-16 09:39:06 +0000
committerFrancescoFioraEst <francesco.fiora@est.tech>2024-03-26 17:00:53 +0000
commit1cf51a2280fb2f9a0435b8a3f2c64492cb7e6659 (patch)
tree345e7748d5efedd14aa3570655f2c1681fc6f56c /participant
parentb7291f81e63c5d4e30351ed0429167937934bc71 (diff)
Recursive updates of the properties
Merge properties during update and migrate. Issue-ID: POLICY-4951 Change-Id: I0c9a896a5abb8331937a73d7e39fbce2d87b415f Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'participant')
-rw-r--r--participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java3
1 files changed, 2 insertions, 1 deletions
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());
}