DATAGO-66413: Rename correlationId -> commandCorrelationId (#137)

SolaceProducts · Dec 7, 2023 · b61cb3a · b61cb3a
1 parent 3d1db1a
commit b61cb3a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/CommandMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/CommandMessage.java
@@ -12,7 +12,7 @@
 @Data
 public class CommandMessage extends MOPMessage {
 
-    private String correlationId;
+    private String commandCorrelationId;
     private String context;
     private String serviceId;
     private List<CommandBundle> commandBundles;
@@ -22,7 +22,7 @@ public CommandMessage() {
     }
 
     public CommandMessage(String serviceId,
-                          String correlationId,
+                          String commandCorrelationId,
                           String context,
                           List<CommandBundle> commandBundles) {
         super();
@@ -31,7 +31,7 @@ public CommandMessage(String serviceId,
                 .withVersion("1")
                 .withUhFlag(MOPUHFlag.ignore);
         this.serviceId = serviceId;
-        this.correlationId = correlationId;
+        this.commandCorrelationId = commandCorrelationId;
         this.context = context;
         this.commandBundles = commandBundles;
     }

diff --git a/...ation/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java b/...ation/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java
@@ -88,7 +88,7 @@ private void sendResponse(CommandMessage request) {
         Map<String, String> topicVars = Map.of(
                 "orgId", request.getOrgId(),
                 "runtimeAgentId", eventPortalProperties.getRuntimeAgentId(),
-                "correlationId", request.getCorrelationId()
+                "correlationId", request.getCommandCorrelationId()
         );
         commandPublisher.sendCommandResponse(request, topicVars);
     }

diff --git a/...st/java/com/solace/maas/ep/event/management/agent/commandManager/CommandManagerTests.java b/...st/java/com/solace/maas/ep/event/management/agent/commandManager/CommandManagerTests.java
@@ -61,7 +61,7 @@ public void testCommandManager() {
         message.setActorId("myActorId");
         message.setOrgId(eventPortalProperties.getOrganizationId());
         message.setTraceId("myTraceId");
-        message.setCorrelationId("myCorrelationId");
+        message.setCommandCorrelationId("myCorrelationId");
         message.setCommandBundles(List.of(
                 CommandBundle.builder()
                         .executionType(ExecutionType.serial)
@@ -101,6 +101,6 @@ public void testCommandManager() {
         Map<String, String> topicVars = topicArgCaptor.getValue();
         assert topicVars.get("orgId").equals(eventPortalProperties.getOrganizationId());
         assert topicVars.get("runtimeAgentId").equals(eventPortalProperties.getRuntimeAgentId());
-        assert topicVars.get("correlationId").equals(message.getCorrelationId());
+        assert topicVars.get("correlationId").equals(message.getCommandCorrelationId());
     }
 }
diff --git a/.../solace/maas/ep/event/management/agent/realTests/NegativeTerraformEVMRConnectedTests.java b/.../solace/maas/ep/event/management/agent/realTests/NegativeTerraformEVMRConnectedTests.java
@@ -446,7 +446,7 @@ private void setMessageParams(String serviceId, String correlationId, String con
         message.setOrgId(eventPortalProperties.getOrganizationId());
         message.setTraceId("myTraceId");
         message.setServiceId(serviceId);
-        message.setCorrelationId(correlationId);
+        message.setCommandCorrelationId(correlationId);
     }