Fix issue using stage in ACM intermediary

Issue-ID: POLICY-5091
Change-Id: I4d96e6472d61c3dfa3de5bfe5c94651b753a95f5
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

1 files changed, 8 insertions, 2 deletions

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/CacheProvider.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/CacheProvider.java
index 7aa06badb..65ad627d1 100644
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/CacheProvider.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/CacheProvider.java
@@ -287,10 +287,16 @@ public class CacheProvider {
      */
     public Map<UUID, CompositionElementDto> getCompositionElementDtoMap(AutomationComposition automationComposition,
             UUID compositionId) {
+        var definitions = acElementsDefinitions.get(compositionId);
         Map<UUID, CompositionElementDto> map = new HashMap<>();
         for (var element : automationComposition.getElements().values()) {
-            var compositionInProperties = getCommonProperties(compositionId, element.getDefinition());
-            var compositionElement = createCompositionElementDto(compositionId, element, compositionInProperties);
+            var definition = definitions.get(element.getDefinition());
+            var compositionElement = (definition != null)
+                    ? new CompositionElementDto(compositionId, element.getDefinition(),
+                            definition.getAutomationCompositionElementToscaNodeTemplate().getProperties(),
+                            definition.getOutProperties()) :
+                    new CompositionElementDto(compositionId, element.getDefinition(),
+                            Map.of(), Map.of(), ElementState.NOT_PRESENT);
             map.put(element.getId(), compositionElement);
         }
         return map;