Merge pull request #268 from SolaceProducts/moodiRealist/DATAGO-103122-refactor

moodiRealist · web-flow · commit 9c41256e895f · 2025-06-25T10:04:46.000-04:00
DATAGO-103122: Refactor EMA message classes
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/CommandLogMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/CommandLogMessage.java
@@ -8,20 +8,26 @@
 
 @Data
 public class CommandLogMessage extends MOPMessage {
-    String orgId;
+    private String orgId;
 
-    String commandCorrelationId;
+    private String commandCorrelationId;
 
-    String eventManagementAgentId;
+    private String eventManagementAgentId;
 
-    String level;
+    private String level;
 
-    String log;
+    private String log;
 
-    Long timestamp;
+    private Long timestamp;
 
-    public CommandLogMessage(String orgId, String commandCorrelationId, String traceId, String actorId,
-                             String level, String log, Long timestamp, String runtimeAgentId) {
+    public CommandLogMessage(String orgId,
+                             String commandCorrelationId,
+                             String traceId,
+                             String actorId,
+                             String level,
+                             String log,
+                             Long timestamp,
+                             String runtimeAgentId) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.epConfigPush)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/HeartbeatMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/HeartbeatMessage.java
@@ -5,20 +5,21 @@
 import com.solace.maas.ep.event.management.agent.plugin.mop.MOPProtocol;
 import com.solace.maas.ep.event.management.agent.plugin.mop.MOPUHFlag;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class HeartbeatMessage extends MOPMessage {
 
     private String orgId;
     private String runtimeAgentId;
     private String timestamp;
     private String runtimeAgentVersion;
 
-    public HeartbeatMessage() {
-        super();
-    }
 
-    public HeartbeatMessage(String runtimeAgentId, String timestamp,  String runtimeAgentVersion) {
+    public HeartbeatMessage(String runtimeAgentId,
+                            String timestamp,
+                            String runtimeAgentVersion) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.EMAHeartbeat)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanCommandMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanCommandMessage.java
@@ -9,10 +9,12 @@
 import com.solace.maas.ep.event.management.agent.plugin.mop.MOPProtocol;
 import com.solace.maas.ep.event.management.agent.plugin.mop.MOPUHFlag;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
+@NoArgsConstructor
 public class ScanCommandMessage extends MOPMessage implements CommandMessageWithResources {
 
     private String messagingServiceId;
@@ -21,9 +23,6 @@ public class ScanCommandMessage extends MOPMessage implements CommandMessageWith
     private List<ScanDestination> destinations;
     private List<EventBrokerResourceConfiguration> resources;
 
-    public ScanCommandMessage() {
-        super();
-    }
 
     public ScanCommandMessage(String messagingServiceId,
                               String scanId,
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataImportMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataImportMessage.java
@@ -6,27 +6,31 @@
 import com.solace.maas.ep.event.management.agent.plugin.mop.MOPUHFlag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
+@NoArgsConstructor
 public class ScanDataImportMessage extends MOPMessage {
-    String orgId;
+    private String orgId;
 
-    String scanId;
+    private String scanId;
 
-    String messagingServiceId;
+    private String messagingServiceId;
 
-    String runtimeAgentId;
+    private String runtimeAgentId;
 
     private List<String> scanTypes;
 
-    public ScanDataImportMessage() {
-        super();
-    }
 
-    public ScanDataImportMessage(String orgId, String scanId, String traceId, String messagingServiceId, String runtimeAgentId, List<String> scanTypes) {
+    public ScanDataImportMessage(String orgId,
+                                 String scanId,
+                                 String traceId,
+                                 String messagingServiceId,
+                                 String runtimeAgentId,
+                                 List<String> scanTypes) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.scanDataControl)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataMessage.java
@@ -8,17 +8,23 @@
 
 @Data
 public class ScanDataMessage extends MOPMessage {
-    String orgId;
+    private String orgId;
 
-    String scanId;
+    private String scanId;
 
-    String scanType;
+    private String scanType;
 
-    String data;
+    private String data;
 
     private String timestamp;
 
-    public ScanDataMessage(String orgId, String scanId, String traceId, String actorId, String scanType, String data, String timestamp) {
+    public ScanDataMessage(String orgId,
+                           String scanId,
+                           String traceId,
+                           String actorId,
+                           String scanType,
+                           String data,
+                           String timestamp) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.scanData)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataStatusMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanDataStatusMessage.java
@@ -12,17 +12,23 @@
 public class ScanDataStatusMessage extends MOPMessage {
     // Status per data collection type.
 
-    String orgId;
+    private String orgId;
 
-    String scanId;
+    private String scanId;
 
-    String status;
+    private String status;
 
-    String description;
+    private String description;
 
-    String scanType;
+    private String scanType;
 
-    public ScanDataStatusMessage(String orgId, String scanId, String traceId, String actorId, String status, String description, String scanType) {
+    public ScanDataStatusMessage(String orgId,
+                                 String scanId,
+                                 String traceId,
+                                 String actorId,
+                                 String status,
+                                 String description,
+                                 String scanType) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.scanDataControl)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanLogMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanLogMessage.java
@@ -8,17 +8,23 @@
 
 @Data
 public class ScanLogMessage extends MOPMessage {
-    String orgId;
+    private String orgId;
 
-    String scanId;
+    private String scanId;
 
-    String level;
+    private String level;
 
-    String log;
+    private String log;
 
-    Long timestamp;
+    private Long timestamp;
 
-    public ScanLogMessage(String orgId, String scanId, String traceId, String actorId, String level, String log, Long timestamp) {
+    public ScanLogMessage(String orgId,
+                          String scanId,
+                          String traceId,
+                          String actorId,
+                          String level,
+                          String log,
+                          Long timestamp) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.scanDataControl)
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanStatusMessage.java b/service/application/src/main/java/com/solace/maas/ep/common/messages/ScanStatusMessage.java
@@ -14,17 +14,23 @@
 public class ScanStatusMessage extends MOPMessage {
     // Status of the overall scan.
 
-    String orgId;
+    private String orgId;
 
-    String scanId;
+    private String scanId;
 
-    String status;
+    private String status;
 
-    String description;
+    private String description;
 
     private List<String> scanTypes;
 
-    public ScanStatusMessage(String orgId, String scanId, String traceId, String actorId, String status, String description, List<String> scanTypes) {
+    public ScanStatusMessage(String orgId,
+                             String scanId,
+                             String traceId,
+                             String actorId,
+                             String status,
+                             String description,
+                             List<String> scanTypes) {
         super();
         withMessageType(MOPMessageType.generic)
                 .withProtocol(MOPProtocol.scanDataControl)
