Improve code in ACM

Code clean-up on ACM: remove unused imports,
remove updateParticipant method (duplicated method)
and remove public in Unit test classes.

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

7 files changed, 7 insertions, 16 deletions

diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/config/messaging/Publisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/config/messaging/Publisher.java
index a76a09d99..63957c685 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/config/messaging/Publisher.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/config/messaging/Publisher.java
@@ -20,8 +20,6 @@
 
 package org.onap.policy.clamp.acm.runtime.config.messaging;
 
-import java.util.List;
-import org.onap.policy.clamp.acm.runtime.main.parameters.Topics;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 
 /**
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/ParticipantController.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/ParticipantController.java
index 855681e69..1136dcb16 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/ParticipantController.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/main/rest/ParticipantController.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2023 Nordix Foundation.
+ * Copyright (C) 2023-2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,8 +41,7 @@ public class ParticipantController extends AbstractRestController implements Par
 
     @Override
     public ResponseEntity<ParticipantInformation> getParticipant(UUID participantId, UUID requestId) {
-        ParticipantInformation participantInformation = acmParticipantProvider
-            .getParticipantById(participantId);
+        var participantInformation = acmParticipantProvider.getParticipantById(participantId);
         return ResponseEntity.ok().body(participantInformation);
     }
 
@@ -61,7 +60,7 @@ public class ParticipantController extends AbstractRestController implements Par
     @Override
     public ResponseEntity<List<ParticipantInformation>> queryParticipants(String name, String version,
                                                                           UUID requestId) {
-        List<ParticipantInformation> participantInformationList = acmParticipantProvider.getAllParticipants();
+        var participantInformationList = acmParticipantProvider.getAllParticipants();
         return ResponseEntity.ok().body(participantInformationList);
     }
 }
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java
index 13382e0fb..282389a74 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2023 Nordix Foundation.
+ * Copyright (C) 2023-2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ public class AcmParticipantProvider {
         LOGGER.debug("Requesting Participant Status Now ParticipantStatusReq");
         participantStatusReqPublisher.send(participantId);
         participant.setParticipantState(ParticipantState.OFF_LINE);
-        participantProvider.updateParticipant(participant);
+        participantProvider.saveParticipant(participant);
     }
 
     /**
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionPartecipantScanner.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionPartecipantScanner.java
index 4d2a22f26..b7f0be8eb 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionPartecipantScanner.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionPartecipantScanner.java
@@ -76,7 +76,7 @@ public class SupervisionPartecipantScanner {
         if ((now - lastMsg) > maxWaitMs) {
             LOGGER.debug("report Participant OFF_LINE {}", id);
             participant.setParticipantState(ParticipantState.OFF_LINE);
-            participantProvider.updateParticipant(participant);
+            participantProvider.saveParticipant(participant);
         }
     }
 }
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
index d1efb6ac0..609e036be 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
@@ -105,7 +105,7 @@ public class SupervisionParticipantHandler {
         if (participantOpt.isPresent()) {
             var participant = participantOpt.get();
             participant.setParticipantState(ParticipantState.OFF_LINE);
-            participantProvider.updateParticipant(participant);
+            participantProvider.saveParticipant(participant);
         }
 
         participantDeregisterAckPublisher.send(participantDeregisterMsg.getMessageId());
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantAckPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantAckPublisher.java
index 5014f7dc3..1e8ff7072 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantAckPublisher.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantAckPublisher.java
@@ -21,10 +21,7 @@
 package org.onap.policy.clamp.acm.runtime.supervision.comm;
 
 import jakarta.ws.rs.core.Response.Status;
-import java.util.List;
-import java.util.Optional;
 import org.onap.policy.clamp.acm.runtime.config.messaging.Publisher;
-import org.onap.policy.clamp.acm.runtime.main.parameters.Topics;
 import org.onap.policy.clamp.common.acm.exception.AutomationCompositionRuntimeException;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantAckMessage;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantPublisher.java
index 5afb7eba4..0619f05d0 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantPublisher.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AbstractParticipantPublisher.java
@@ -21,10 +21,7 @@
 package org.onap.policy.clamp.acm.runtime.supervision.comm;
 
 import jakarta.ws.rs.core.Response.Status;
-import java.util.List;
-import java.util.Optional;
 import org.onap.policy.clamp.acm.runtime.config.messaging.Publisher;
-import org.onap.policy.clamp.acm.runtime.main.parameters.Topics;
 import org.onap.policy.clamp.common.acm.exception.AutomationCompositionRuntimeException;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantMessage;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;