From fe89de706a37743995a358216b5360374e54f093 Mon Sep 17 00:00:00 2001 From: Alexander Issa Date: Thu, 2 Mar 2023 17:19:27 -0800 Subject: [PATCH] Integrates custom properties into ActiveMQ event --- .../services/lambda/runtime/events/ActiveMQEvent.java | 2 ++ .../services/lambda/runtime/tests/EventLoaderTest.java | 9 +++++++++ aws-lambda-java-tests/src/test/resources/mq_event.json | 10 ++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) 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 index 46791980..e896a223 100644 --- 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 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 index 8f8fe50a..e36016a1 100644 --- 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 index a9a79854..6505a22d 100644 --- 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" + } } ] } \ No newline at end of file