From 4dd22add594ad9bb0baf7b3c45c9c160e1d31a82 Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Fri, 8 Mar 2024 15:13:28 +0000
Subject: [PATCH] Upgrade ACM to latest release version

ACM version upgraded to 7.1.1.

Issue-ID: NONRTRIC-990
Change-Id: I0edf78dd01f82430307311935529206e868c099e
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---
 .../dme/handler/AutomationCompositionElementHandler.java   | 14 ++++++++------
 .../src/main/resources/application.yaml                    | 12 ++++++------
 participants/pom.xml                                       |  2 +-
 pom.xml                                                    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

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 71d9aaf..f35cc11 100755
--- 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);
diff --git a/participants/participant-impl-dme/src/main/resources/application.yaml b/participants/participant-impl-dme/src/main/resources/application.yaml
index e1f60e1..cfa06aa 100755
--- a/participants/participant-impl-dme/src/main/resources/application.yaml
+++ b/participants/participant-impl-dme/src/main/resources/application.yaml
@@ -22,16 +22,16 @@ participant:
     participantId: 101c62b3-8918-41b9-a747-d21eb79c6c08
     clampAutomationCompositionTopics:
       topicSources:
-        - topic: POLICY-ACRUNTIME-PARTICIPANT
+        - topic: policy-acruntime-participant
           servers:
-            - ${topicServer:localhost}
-          topicCommInfrastructure: dmaap
+            - ${topicServer:kafka.default.svc.cluster.local:9092}
+          topicCommInfrastructure: NOOP
           fetchTimeout: 15000
       topicSinks:
-        - topic: POLICY-ACRUNTIME-PARTICIPANT
+        - topic: policy-acruntime-participant
           servers:
-            - ${topicServer:localhost}
-          topicCommInfrastructure: dmaap
+            - ${topicServer:kafka.default.svc.cluster.local:9092}
+          topicCommInfrastructure: NOOP
     participantSupportedElementTypes:
       -
         typeName: org.onap.policy.clamp.acm.DMEAutomationCompositionElement
diff --git a/participants/pom.xml b/participants/pom.xml
index 5d3a73a..08bb794 100755
--- a/participants/pom.xml
+++ b/participants/pom.xml
@@ -54,7 +54,7 @@
         <openapi.maven.version>7.3.0</openapi.maven.version>
         <docker-maven-plugin>0.43.4</docker-maven-plugin>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
-        <onap.acm.models.version>7.1.0</onap.acm.models.version>
+        <onap.acm.models.version>7.1.1</onap.acm.models.version>
         <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
     </properties>
     <build>
diff --git a/pom.xml b/pom.xml
index f392133..b6733ad 100755
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <openapi.maven.version>7.3.0</openapi.maven.version>
         <docker-maven-plugin>0.43.4</docker-maven-plugin>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
-        <onap.acm.models.version>7.1.0</onap.acm.models.version>
+        <onap.acm.models.version>7.1.1</onap.acm.models.version>
         <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
         <spring.statemachine.version>4.0.0</spring.statemachine.version>
         <spring.context.version>6.1.3</spring.context.version>
-- 
2.16.6