Add sync messages support in ACM-intermediary

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

8 files changed, 55 insertions, 215 deletions

diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1Test.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1Test.java
index a60e1b8cd..7355b03e9 100755..100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1Test.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV1Test.java
@@ -20,8 +20,8 @@
 
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -51,11 +51,6 @@ class AcElementListenerV1Test {
         var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
         acElementListenerV1.deploy(compositionElement, instanceElement);
         verify(acElementListenerV1).deploy(any(), any(), any());
-
-        clearInvocations(acElementListenerV1);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYING, LockState.NONE);
-        verify(acElementListenerV1).deploy(any(), any(), any());
     }
 
     @Test
@@ -66,11 +61,6 @@ class AcElementListenerV1Test {
         var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
         acElementListenerV1.undeploy(compositionElement, instanceElement);
         verify(acElementListenerV1).undeploy(instanceElement.instanceId(), instanceElement.elementId());
-
-        clearInvocations(acElementListenerV1);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.UNDEPLOYING, LockState.NONE);
-        verify(acElementListenerV1).undeploy(instanceElement.instanceId(), instanceElement.elementId());
     }
 
     @Test
@@ -147,66 +137,17 @@ class AcElementListenerV1Test {
     }
 
     @Test
-    void handleRestartComposition() throws PfModelException {
-        var intermediaryApi = mock(ParticipantIntermediaryApi.class);
-        var acElementListenerV1 = createAcElementListenerV1(intermediaryApi);
-        var compositionId = UUID.randomUUID();
-        var toscaConceptIdentifier = new ToscaConceptIdentifier();
-        var composition = new CompositionDto(compositionId, Map.of(toscaConceptIdentifier, Map.of()), Map.of());
-
-        acElementListenerV1.handleRestartComposition(composition, AcTypeState.PRIMED);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.NO_ERROR, "Restarted");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartComposition(composition, AcTypeState.PRIMING);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.NO_ERROR, "Primed");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartComposition(composition, AcTypeState.DEPRIMING);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.COMMISSIONED, StateChangeResult.NO_ERROR, "Deprimed");
+    void handleRestartComposition() {
+        var acElementListenerV1 = createAcElementListenerV1(mock(ParticipantIntermediaryApi.class));
+        assertThatThrownBy(() -> acElementListenerV1.handleRestartComposition(null, null))
+                .isInstanceOf(PfModelException.class);
     }
 
     @Test
-    void handleRestartInstance() throws PfModelException {
-        var intermediaryApi = mock(ParticipantIntermediaryApi.class);
-        var acElementListenerV1 = createAcElementListenerV1(intermediaryApi);
-        var compositionElement = new CompositionElementDto(UUID.randomUUID(), new ToscaConceptIdentifier(),
-            Map.of(), Map.of());
-        var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
-
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.LOCKED);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DEPLOYED, LockState.LOCKED,
-            StateChangeResult.NO_ERROR, "Restarted");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.LOCKING);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), null, LockState.LOCKED, StateChangeResult.NO_ERROR, "Locked");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.UNLOCKING);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), null, LockState.UNLOCKED, StateChangeResult.NO_ERROR, "Unlocked");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.UPDATING, LockState.LOCKED);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DEPLOYED, null,
-            StateChangeResult.NO_ERROR, "Update not supported");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV1.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DELETING, LockState.NONE);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DELETED, null, StateChangeResult.NO_ERROR, "Deleted");
+    void handleRestartInstance() {
+        var acElementListenerV1 = createAcElementListenerV1(mock(ParticipantIntermediaryApi.class));
+        assertThatThrownBy(() -> acElementListenerV1.handleRestartInstance(null, null,
+                null, null)).isInstanceOf(PfModelException.class);
     }
 
     @Test
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2Test.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2Test.java
index c36e11dbc..c8ab9e222 100755..100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2Test.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/AcElementListenerV2Test.java
@@ -20,14 +20,13 @@
 
 package org.onap.policy.clamp.acm.participant.intermediary.api.impl;
 
-import static org.mockito.Mockito.clearInvocations;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 import java.util.Map;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
@@ -42,28 +41,6 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 class AcElementListenerV2Test {
 
     @Test
-    void deployTest() throws PfModelException {
-        var acElementListenerV2 = mock(AcElementListenerV2.class, Answers.CALLS_REAL_METHODS);
-        var compositionElement = new CompositionElementDto(UUID.randomUUID(), new ToscaConceptIdentifier(),
-            Map.of(), Map.of());
-        var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYING, LockState.NONE);
-        verify(acElementListenerV2).deploy(compositionElement, instanceElement);
-    }
-
-    @Test
-    void undeployTest() throws PfModelException {
-        var acElementListenerV2 = mock(AcElementListenerV2.class, Answers.CALLS_REAL_METHODS);
-        var compositionElement = new CompositionElementDto(UUID.randomUUID(), new ToscaConceptIdentifier(),
-            Map.of(), Map.of());
-        var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.UNDEPLOYING, LockState.NONE);
-        verify(acElementListenerV2).undeploy(compositionElement, instanceElement);
-    }
-
-    @Test
     void lockTest() throws PfModelException {
         var intermediaryApi = mock(ParticipantIntermediaryApi.class);
         var acElementListenerV2 = createAcElementListenerV2(intermediaryApi);
@@ -137,66 +114,17 @@ class AcElementListenerV2Test {
     }
 
     @Test
-    void handleRestartComposition() throws PfModelException {
-        var intermediaryApi = mock(ParticipantIntermediaryApi.class);
-        var acElementListenerV2 = createAcElementListenerV2(intermediaryApi);
-        var compositionId = UUID.randomUUID();
-        var toscaConceptIdentifier = new ToscaConceptIdentifier();
-        var composition = new CompositionDto(compositionId, Map.of(toscaConceptIdentifier, Map.of()), Map.of());
-
-        acElementListenerV2.handleRestartComposition(composition, AcTypeState.PRIMED);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.NO_ERROR, "Restarted");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartComposition(composition, AcTypeState.PRIMING);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.NO_ERROR, "Primed");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartComposition(composition, AcTypeState.DEPRIMING);
-        verify(intermediaryApi)
-            .updateCompositionState(compositionId, AcTypeState.COMMISSIONED, StateChangeResult.NO_ERROR, "Deprimed");
+    void handleRestartComposition() {
+        var acElementListenerV2 = createAcElementListenerV2(mock(ParticipantIntermediaryApi.class));
+        assertThatThrownBy(() -> acElementListenerV2.handleRestartComposition(null, null))
+                .isInstanceOf(PfModelException.class);
     }
 
     @Test
-    void handleRestartInstance() throws PfModelException {
-        var intermediaryApi = mock(ParticipantIntermediaryApi.class);
-        var acElementListenerV2 = createAcElementListenerV2(intermediaryApi);
-        var compositionElement = new CompositionElementDto(UUID.randomUUID(), new ToscaConceptIdentifier(),
-            Map.of(), Map.of());
-        var instanceElement = new InstanceElementDto(UUID.randomUUID(), UUID.randomUUID(), null, Map.of(), Map.of());
-
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.LOCKED);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DEPLOYED, LockState.LOCKED,
-            StateChangeResult.NO_ERROR, "Restarted");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.LOCKING);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), null, LockState.LOCKED, StateChangeResult.NO_ERROR, "Locked");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DEPLOYED, LockState.UNLOCKING);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), null, LockState.UNLOCKED, StateChangeResult.NO_ERROR, "Unlocked");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.UPDATING, LockState.LOCKED);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DEPLOYED, null,
-            StateChangeResult.NO_ERROR, "Update not supported");
-
-        clearInvocations(intermediaryApi);
-        acElementListenerV2.handleRestartInstance(compositionElement, instanceElement,
-            DeployState.DELETING, LockState.NONE);
-        verify(intermediaryApi).updateAutomationCompositionElementState(instanceElement.instanceId(),
-            instanceElement.elementId(), DeployState.DELETED, null, StateChangeResult.NO_ERROR, "Deleted");
+    void handleRestartInstance() {
+        var acElementListenerV2 = createAcElementListenerV2(mock(ParticipantIntermediaryApi.class));
+        assertThatThrownBy(() -> acElementListenerV2.handleRestartInstance(null, null,
+                null, null)).isInstanceOf(PfModelException.class);
     }
 
     @Test
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/comm/ParticipantCommTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/comm/ParticipantCommTest.java
index 33325122e..cfc5c6f30 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/comm/ParticipantCommTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/comm/ParticipantCommTest.java
@@ -77,10 +77,6 @@ class ParticipantCommTest {
         assertEquals(ParticipantMessageType.AUTOMATION_COMPOSITION_STATE_CHANGE.name(),
                 automationCompositionStateChangeListener.getType());
 
-        var participantRestartListener = new ParticipantRestartListener(participantHandler);
-        assertEquals(ParticipantMessageType.PARTICIPANT_RESTART.name(),
-                participantRestartListener.getType());
-
         var participantSyncListener = new ParticipantSyncListener(participantHandler);
         assertEquals(ParticipantMessageType.PARTICIPANT_SYNC_MSG.name(),
                 participantSyncListener.getType());
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AcDefinitionHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AcDefinitionHandlerTest.java
index 0c73e87ed..c6259a28f 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AcDefinitionHandlerTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AcDefinitionHandlerTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.clamp.models.acm.concepts.AcTypeState;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantPrime;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantPrimeAck;
-import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantRestart;
+import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantSync;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 
 class AcDefinitionHandlerTest {
@@ -94,18 +94,36 @@ class AcDefinitionHandlerTest {
     }
 
     @Test
-    void restartedTest() {
-        var participantRestartMsg = new ParticipantRestart();
-        participantRestartMsg.setState(AcTypeState.PRIMED);
-        participantRestartMsg.setCompositionId(UUID.randomUUID());
-        participantRestartMsg.getParticipantDefinitionUpdates().add(createParticipantDefinition());
-        participantRestartMsg.setAutomationcompositionList(List.of(CommonTestData.createParticipantRestartAc()));
+    void syncTest() {
+        var participantSyncMsg = new ParticipantSync();
+        participantSyncMsg.setState(AcTypeState.PRIMED);
+        participantSyncMsg.setCompositionId(UUID.randomUUID());
+        participantSyncMsg.getParticipantDefinitionUpdates().add(createParticipantDefinition());
+        participantSyncMsg.setAutomationcompositionList(List.of(CommonTestData.createParticipantRestartAc()));
 
         var cacheProvider = mock(CacheProvider.class);
         var listener = mock(ThreadHandler.class);
         var ach = new AcDefinitionHandler(cacheProvider, mock(ParticipantMessagePublisher.class), listener);
-        ach.handleParticipantRestart(participantRestartMsg);
+        ach.handleParticipantSync(participantSyncMsg);
         verify(cacheProvider).initializeAutomationComposition(any(UUID.class), any());
         verify(cacheProvider).addElementDefinition(any(), any());
     }
+
+    @Test
+    void syncDeleteTest() {
+        var participantSyncMsg = new ParticipantSync();
+        participantSyncMsg.setState(AcTypeState.COMMISSIONED);
+        participantSyncMsg.setDelete(true);
+        participantSyncMsg.setCompositionId(UUID.randomUUID());
+        participantSyncMsg.getParticipantDefinitionUpdates().add(createParticipantDefinition());
+        var restartAc = CommonTestData.createParticipantRestartAc();
+        participantSyncMsg.setAutomationcompositionList(List.of(restartAc));
+
+        var cacheProvider = mock(CacheProvider.class);
+        var listener = mock(ThreadHandler.class);
+        var ach = new AcDefinitionHandler(cacheProvider, mock(ParticipantMessagePublisher.class), listener);
+        ach.handleParticipantSync(participantSyncMsg);
+        verify(cacheProvider).removeElementDefinition(participantSyncMsg.getCompositionId());
+        verify(cacheProvider).removeAutomationComposition(restartAc.getAutomationCompositionId());
+    }
 }
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java
index 24935c1c9..173ed031b 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java
@@ -24,9 +24,6 @@ import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationComposit
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
-import org.onap.policy.clamp.models.acm.concepts.AcTypeState;
-import org.onap.policy.clamp.models.acm.concepts.DeployState;
-import org.onap.policy.clamp.models.acm.concepts.LockState;
 import org.onap.policy.models.base.PfModelException;
 
 public class DummyAcElementListener implements AutomationCompositionElementListener {
@@ -74,15 +71,6 @@ public class DummyAcElementListener implements AutomationCompositionElementListe
     }
 
     @Override
-    public void handleRestartComposition(CompositionDto composition, AcTypeState state) throws PfModelException {
-    }
-
-    @Override
-    public void handleRestartInstance(CompositionElementDto compositionElement, InstanceElementDto instanceElement,
-        DeployState deployState, LockState lockState) throws PfModelException {
-    }
-
-    @Override
     public void migrate(CompositionElementDto compositionElement, CompositionElementDto compositionElementTarget,
                         InstanceElementDto instanceElement, InstanceElementDto instanceElementMigrate)
         throws PfModelException {
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
index eb1db475b..8c2b2473c 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
@@ -47,9 +47,9 @@ import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantMe
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantPrime;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantRegister;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantRegisterAck;
-import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantRestart;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantStatus;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantStatusReq;
+import org.onap.policy.clamp.models.acm.messages.kafka.participant.ParticipantSync;
 import org.onap.policy.clamp.models.acm.messages.kafka.participant.PropertiesUpdate;
 import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder;
 import org.onap.policy.clamp.models.acm.messages.rest.instantiation.LockOrder;
@@ -203,18 +203,20 @@ class ParticipantHandlerTest {
 
     @Test
     void handleParticipantRestartTest() {
-        var participantRestartMsg = new ParticipantRestart();
-        participantRestartMsg.setState(AcTypeState.PRIMED);
-        participantRestartMsg.setCompositionId(UUID.randomUUID());
+        var participantSyncMsg = new ParticipantSync();
+        participantSyncMsg.setState(AcTypeState.PRIMED);
+        participantSyncMsg.setCompositionId(UUID.randomUUID());
+        participantSyncMsg.setReplicaId(CommonTestData.getReplicaId());
 
         var cacheProvider = mock(CacheProvider.class);
+        when(cacheProvider.getReplicaId()).thenReturn(CommonTestData.getReplicaId());
         var publisher = mock(ParticipantMessagePublisher.class);
         var acHandler = mock(AcDefinitionHandler.class);
         var participantHandler = new ParticipantHandler(mock(AutomationCompositionHandler.class),
                 mock(AcLockHandler.class), acHandler, publisher, cacheProvider);
 
-        participantHandler.handleParticipantRestart(participantRestartMsg);
-        verify(acHandler).handleParticipantRestart(participantRestartMsg);
+        participantHandler.handleParticipantSync(participantSyncMsg);
+        verify(acHandler).handleParticipantSync(participantSyncMsg);
     }
 
     @Test
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ThreadHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ThreadHandlerTest.java
index e4c34845e..f3471e6ee 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ThreadHandlerTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ThreadHandlerTest.java
@@ -20,7 +20,6 @@
 
 package org.onap.policy.clamp.acm.participant.intermediary.handler;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -29,7 +28,6 @@ import static org.mockito.Mockito.verify;
 
 import jakarta.ws.rs.core.Response.Status;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
@@ -39,11 +37,9 @@ import org.onap.policy.clamp.acm.participant.intermediary.api.CompositionElement
 import org.onap.policy.clamp.acm.participant.intermediary.api.InstanceElementDto;
 import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi;
 import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy;
-import org.onap.policy.clamp.models.acm.concepts.AcElementRestart;
 import org.onap.policy.clamp.models.acm.concepts.AcTypeState;
 import org.onap.policy.clamp.models.acm.concepts.DeployState;
 import org.onap.policy.clamp.models.acm.concepts.LockState;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantRestartAc;
 import org.onap.policy.clamp.models.acm.concepts.StateChangeResult;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
@@ -189,30 +185,6 @@ class ThreadHandlerTest {
             threadHandler.deprime(messageId, composition);
             verify(intermediaryApi, timeout(TIMEOUT)).updateCompositionState(compositionId, AcTypeState.PRIMED,
                     StateChangeResult.FAILED, "Composition Defintion deprime failed");
-
-            clearInvocations(listener);
-            doThrow(new PfModelException(Status.INTERNAL_SERVER_ERROR, "Error")).when(listener)
-                    .handleRestartComposition(composition, AcTypeState.PRIMING);
-            threadHandler.restarted(messageId, composition, AcTypeState.PRIMING, List.of());
-            verify(intermediaryApi).updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.FAILED,
-                    "Composition Defintion deprime failed");
-        }
-    }
-
-    @Test
-    void testRestarted() throws IOException, PfModelException {
-        var listener = mock(AutomationCompositionElementListener.class);
-        var intermediaryApi = mock(ParticipantIntermediaryApi.class);
-        var cacheProvider = mock(CacheProvider.class);
-        try (var threadHandler = new ThreadHandler(listener, intermediaryApi, cacheProvider)) {
-            var messageId = UUID.randomUUID();
-            var compositionId = UUID.randomUUID();
-            var participantRestartAc = new ParticipantRestartAc();
-            participantRestartAc.setAutomationCompositionId(UUID.randomUUID());
-            participantRestartAc.getAcElementList().add(new AcElementRestart());
-            var composition = new CompositionDto(compositionId, Map.of(), Map.of());
-            threadHandler.restarted(messageId, composition, AcTypeState.PRIMED, List.of(participantRestartAc));
-            verify(listener, timeout(TIMEOUT)).handleRestartInstance(any(), any(), any(), any());
         }
     }
 }
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/main/parameters/CommonTestData.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/main/parameters/CommonTestData.java
index e8cafa96f..b6b95ba0f 100644
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/main/parameters/CommonTestData.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/main/parameters/CommonTestData.java
@@ -184,10 +184,6 @@ public class CommonTestData {
         return REPLICA_ID;
     }
 
-    public static UUID getRndParticipantId() {
-        return UUID.randomUUID();
-    }
-
     public static ToscaConceptIdentifier getDefinition() {
         return new ToscaConceptIdentifier("org.onap.domain.pmsh.PMSH_DCAEMicroservice", "1.2.3");
     }
@@ -196,8 +192,6 @@ public class CommonTestData {
      * Returns a Map of ToscaConceptIdentifier and AutomationComposition for test cases.
      *
      * @return automationCompositionMap
-     *
-     * @throws CoderException if there is an error with .json file.
      */
     public static Map<UUID, AutomationComposition> getTestAutomationCompositionMap() {
         var automationCompositions = getTestAutomationCompositions();
@@ -211,8 +205,6 @@ public class CommonTestData {
      * Returns List of AutomationComposition for test cases.
      *
      * @return AutomationCompositions
-     *
-     * @throws CoderException if there is an error with .json file.
      */
     public static AutomationCompositions getTestAutomationCompositions() {
         try {
@@ -257,8 +249,11 @@ public class CommonTestData {
     public static ParticipantRestartAc createParticipantRestartAc() {
         var participantRestartAc = new ParticipantRestartAc();
         participantRestartAc.setAutomationCompositionId(AC_ID_0);
+        participantRestartAc.setDeployState(DeployState.DEPLOYED);
+        participantRestartAc.setLockState(LockState.LOCKED);
         var acElementRestart = new AcElementRestart();
         acElementRestart.setDefinition(getDefinition());
+        acElementRestart.setParticipantId(PARTCICIPANT_ID);
         acElementRestart.setDeployState(DeployState.DEPLOYED);
         acElementRestart.setLockState(LockState.LOCKED);
         acElementRestart.setOperationalState("OperationalState");