Fix sample rapp generator to support helm artifact alone rApps

[nonrtric/plt/rappmanager.git] / participants / participant-impl-dme / src / main / java / org / oransc / participant / dme / handler / AutomationCompositionElementHandler.java

diff --git a/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java b/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
index 612295e..f35cc11 100755 (executable)
--- a/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
+++ b/participants/participant-impl-dme/src/main/java/org/oransc/participant/dme/handler/AutomationCompositionElementHandler.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2023 Nordix Foundation.
+ *  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +32,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import org.apache.http.HttpStatus;
-import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
 import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi;
+import org.onap.policy.clamp.acm.participant.intermediary.api.impl.AcElementListenerV1;
 import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy;
 import org.onap.policy.clamp.models.acm.concepts.AcTypeState;
 import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElementDefinition;
@@ -57,21 +57,23 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
-@RequiredArgsConstructor
-public class AutomationCompositionElementHandler implements AutomationCompositionElementListener {
+public class AutomationCompositionElementHandler extends AcElementListenerV1 {
 
     private static final Coder CODER = new StandardCoder();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-    private final ParticipantIntermediaryApi intermediaryApi;
-
     private final AcDmeClient acDmeClient;
 
     // Map of acElement Id and DME services
     @Getter(AccessLevel.PACKAGE)
     private final Map<UUID, ConfigurationEntity> configRequestMap = new ConcurrentHashMap<>();
 
+    public AutomationCompositionElementHandler(ParticipantIntermediaryApi intermediaryApi, AcDmeClient acDmeClient) {
+        super(intermediaryApi);
+        this.acDmeClient = acDmeClient;
+    }
+
     @Override
     public void undeploy(UUID automationCompositionId, UUID automationCompositionElementId) throws DmeException {
         var configurationEntity = configRequestMap.get(automationCompositionElementId);
@@ -103,9 +105,7 @@ public class AutomationCompositionElementHandler implements AutomationCompositio
             var configurationEntity = CODER.convert(properties, ConfigurationEntity.class);
             var violations = Validation.buildDefaultValidatorFactory().getValidator().validate(configurationEntity);
             if (violations.isEmpty()) {
-                if ((configurationEntity.getInfoTypeEntities() != null
-                             || configurationEntity.getDataProducerEntities() != null
-                             || configurationEntity.getDataConsumerEntities() != null) && acDmeClient.isDmeHealthy()) {
+                if (acDmeClient.isDmeHealthy()) {
                     if (configurationEntity.getInfoTypeEntities() != null) {
                         acDmeClient.createInfoType(configurationEntity.getInfoTypeEntities().stream().collect(
                                 Collectors.toMap(InfoTypeEntity::getInfoTypeId, InfoTypeEntity::getPayload)));