Integrates custom properties into ActiveMQ event (aws#408)

alexaiss · web-flow · commit 6ad3f7004e14 · 2023-03-03T16:58:36.000Z
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ActiveMQEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ActiveMQEvent.java
@@ -18,6 +18,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import java.util.List;
+import java.util.Map;
 
 /**
 * Represents an Active MQ event sent to Lambda
@@ -52,6 +53,7 @@ public static class ActiveMQMessage {
         private String data;
         private long brokerInTime;
         private long brokerOutTime;
+        private Map<String, String> properties;
     }
 
     @Data
diff --git a/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java b/aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java
@@ -205,6 +205,15 @@ public void testLoadActiveMQEvent() {
         assertThat(event.getMessages().get(1).getMessageID()).isEqualTo("ID:b-8bcfa572-428a-4642-879d-eb284b418fc8-1.mq.us-west-2.amazonaws.com-37557-1234520418293-4:1:1:1:1");
     }
 
+    @Test
+    public void testLoadActiveMQEventWithProperties() {
+        ActiveMQEvent event = EventLoader.loadActiveMQEvent("mq_event.json");
+        assertThat(event).isNotNull();
+        assertThat(event.getMessages()).hasSize(2);
+        assertThat(event.getMessages().get(0).getProperties().get("testKey")).isEqualTo("testValue");
+        assertThat(event.getMessages().get(1).getProperties().get("testKey")).isEqualTo("testValue");
+    }
+
     @Test
     public void testLoadCodeCommitEvent() {
         CodeCommitEvent event = EventLoader.loadCodeCommitEvent("codecommit_event.json");
diff --git a/aws-lambda-java-tests/src/test/resources/mq_event.json b/aws-lambda-java-tests/src/test/resources/mq_event.json
@@ -13,7 +13,10 @@
       },
       "timestamp": 1598827811958,
       "brokerInTime": 1598827811958,
-      "brokerOutTime": 1598827811959
+      "brokerOutTime": 1598827811959,
+      "properties": {
+        "testKey": "testValue"
+      }
     },
     {
       "messageID": "ID:b-8bcfa572-428a-4642-879d-eb284b418fc8-1.mq.us-west-2.amazonaws.com-37557-1234520418293-4:1:1:1:1",
@@ -26,7 +29,10 @@
       },
       "timestamp": 1598827811958,
       "brokerInTime": 1598827811958,
-      "brokerOutTime": 1598827811959
+      "brokerOutTime": 1598827811959,
+      "properties": {
+        "testKey": "testValue"
+      }
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,10 @@`
`13`	`13`	`},`
`14`	`14`	`"timestamp": 1598827811958,`
`15`	`15`	`"brokerInTime": 1598827811958,`
`16`		`- "brokerOutTime": 1598827811959`
	`16`	`+ "brokerOutTime": 1598827811959,`
	`17`	`+ "properties": {`
	`18`	`+ "testKey": "testValue"`
	`19`	`+ }`
`17`	`20`	`},`
`18`	`21`	`{`
`19`	`22`	`"messageID": "ID:b-8bcfa572-428a-4642-879d-eb284b418fc8-1.mq.us-west-2.amazonaws.com-37557-1234520418293-4:1:1:1:1",`
`@@ -26,7 +29,10 @@`
`26`	`29`	`},`
`27`	`30`	`"timestamp": 1598827811958,`
`28`	`31`	`"brokerInTime": 1598827811958,`
`29`		`- "brokerOutTime": 1598827811959`
	`32`	`+ "brokerOutTime": 1598827811959,`
	`33`	`+ "properties": {`
	`34`	`+ "testKey": "testValue"`
	`35`	`+ }`
`30`	`36`	`}`
`31`	`37`	`]`
`32`	`38`	`}`