Merge "Fix serialization of messages in Control Loop and Participants"

3 files changed, 23 insertions, 22 deletions

diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java
index 476407f66..9180cedb3 100644
--- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java
+++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java
@@ -311,17 +311,20 @@ public class SupervisionHandler {
 
     private void superviseControlLoops(ParticipantStatus participantStatusMessage)
             throws PfModelException, ControlLoopException {
-        for (Map.Entry<ToscaConceptIdentifier, ControlLoopInfo> clEntry :
-                participantStatusMessage.getControlLoopInfoMap().entrySet()) {
-            var dbControlLoop = controlLoopProvider.getControlLoop(new ToscaConceptIdentifier(
-                                clEntry.getKey().getName(), clEntry.getKey().getVersion()));
-            if (dbControlLoop == null) {
-                exceptionOccured(Response.Status.NOT_FOUND,
-                        "PARTICIPANT_STATUS control loop not found in database: " + clEntry.getKey());
+        if (participantStatusMessage.getControlLoopInfoMap() != null) {
+            for (Map.Entry<String, ControlLoopInfo> clEntry : participantStatusMessage.getControlLoopInfoMap()
+                    .entrySet()) {
+                String[] key = clEntry.getKey().split(" ");
+                var dbControlLoop = controlLoopProvider.getControlLoop(
+                        new ToscaConceptIdentifier(key[0], key[1]));
+                if (dbControlLoop == null) {
+                    exceptionOccured(Response.Status.NOT_FOUND,
+                            "PARTICIPANT_STATUS control loop not found in database: " + clEntry.getKey());
+                }
+                dbControlLoop.setState(clEntry.getValue().getState());
+                monitoringProvider.createClElementStatistics(clEntry.getValue().getControlLoopStatistics()
+                        .getClElementStatisticsList().getClElementStatistics());
             }
-            dbControlLoop.setState(clEntry.getValue().getState());
-            monitoringProvider.createClElementStatistics(clEntry.getValue()
-                .getControlLoopStatistics().getClElementStatisticsList().getClElementStatistics());
         }
     }
 
diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java
index 88cf90d02..cfc0e3932 100644
--- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java
+++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java
@@ -71,9 +71,8 @@ public class ParticipantUpdatePublisher extends AbstractParticipantPublisher<Par
         Map<UUID, ControlLoopElementDefinition> controlLoopElementDefinitionMap = new LinkedHashMap<>();
         controlLoopElementDefinitionMap.put(UUID.randomUUID(), clDefinition);
 
-        Map<ToscaConceptIdentifier, Map<UUID, ControlLoopElementDefinition>> participantDefinitionUpdateMap =
-                new LinkedHashMap<>();
-        participantDefinitionUpdateMap.put(participantId, controlLoopElementDefinitionMap);
+        Map<String, Map<UUID, ControlLoopElementDefinition>> participantDefinitionUpdateMap = new LinkedHashMap<>();
+        participantDefinitionUpdateMap.put(participantId.toString(), controlLoopElementDefinitionMap);
         message.setParticipantDefinitionUpdateMap(participantDefinitionUpdateMap);
 
         LOGGER.debug("Participant Update sent {}", message);
diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java
index 5f00706e1..e74af7901 100644
--- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java
+++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java
@@ -79,8 +79,7 @@ class SupervisionMessagesTest extends CommonRestController {
     public static void setupDbProviderParameters() throws PfModelException {
         ClRuntimeParameterGroup controlLoopParameters = CommonTestData.geParameterGroup("instantproviderdb");
 
-        modelsProvider =
-                CommonTestData.getPolicyModelsProvider(controlLoopParameters.getDatabaseProviderParameters());
+        modelsProvider = CommonTestData.getPolicyModelsProvider(controlLoopParameters.getDatabaseProviderParameters());
         clProvider = new ControlLoopProvider(controlLoopParameters.getDatabaseProviderParameters());
         var participantStatisticsProvider =
                 new ParticipantStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters());
@@ -96,8 +95,8 @@ class SupervisionMessagesTest extends CommonRestController {
         var participantDeregisterAckPublisher = Mockito.mock(ParticipantDeregisterAckPublisher.class);
         var participantUpdatePublisher = Mockito.mock(ParticipantUpdatePublisher.class);
         supervisionHandler = new SupervisionHandler(clProvider, participantProvider, monitoringProvider,
-                        controlLoopUpdatePublisher, controlLoopStateChangePublisher,
-                        participantRegisterAckPublisher, participantDeregisterAckPublisher, participantUpdatePublisher);
+                controlLoopUpdatePublisher, controlLoopStateChangePublisher, participantRegisterAckPublisher,
+                participantDeregisterAckPublisher, participantUpdatePublisher);
     }
 
     @AfterAll
@@ -116,8 +115,8 @@ class SupervisionMessagesTest extends CommonRestController {
         synchronized (lockit) {
             ParticipantRegisterListener participantRegisterListener =
                     new ParticipantRegisterListener(supervisionHandler);
-            ToscaServiceTemplate serviceTemplate = yamlTranslator
-                .fromYaml(ResourceUtils.getResourceAsString(TOSCA_SERVICE_TEMPLATE_YAML), ToscaServiceTemplate.class);
+            ToscaServiceTemplate serviceTemplate = yamlTranslator.fromYaml(
+                    ResourceUtils.getResourceAsString(TOSCA_SERVICE_TEMPLATE_YAML), ToscaServiceTemplate.class);
 
             List<ToscaNodeTemplate> listOfTemplates = commissioningProvider.getControlLoopDefinitions(null, null);
             commissioningProvider.createControlLoopDefinitions(serviceTemplate);
@@ -189,10 +188,10 @@ class SupervisionMessagesTest extends CommonRestController {
         clDefinition.setCommonPropertiesMap(commonPropertiesMap);
 
         Map<UUID, ControlLoopElementDefinition> controlLoopElementDefinitionMap =
-            Map.of(UUID.randomUUID(), clDefinition);
+                Map.of(UUID.randomUUID(), clDefinition);
 
-        Map<ToscaConceptIdentifier, Map<UUID, ControlLoopElementDefinition>>
-            participantDefinitionUpdateMap = Map.of(getParticipantId(), controlLoopElementDefinitionMap);
+        Map<String, Map<UUID, ControlLoopElementDefinition>> participantDefinitionUpdateMap =
+                Map.of(getParticipantId().toString(), controlLoopElementDefinitionMap);
         participantUpdateMsg.setParticipantDefinitionUpdateMap(participantDefinitionUpdateMap);
 
         synchronized (lockit) {