Updating ConnectEvent to better model the Queue attribute.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ConnectEvent.java

@@ -59,7 +59,7 @@ public static class ContactData implements Serializable, Cloneable {
         private String initiationMethod;
         private String instanceArn;
         private String previousContactId;
-        private String queue;
+        private Queue queue;
         private SystemEndpoint systemEndpoint;
     }
 
@@ -72,6 +72,15 @@ public static class CustomerEndpoint implements Serializable, Cloneable {
         private String type;
     }
 
+    @Data
+    @Builder(setterPrefix = "with")
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Queue implements Serializable, Cloneable {
+        private String arn;
+        private String name;
+    }
+
     @Data
     @Builder(setterPrefix = "with")
     @NoArgsConstructor

aws-lambda-java-serialization/src/main/java/com/amazonaws/services/lambda/runtime/serialization/events/LambdaEventSerializers.java

@@ -114,6 +114,8 @@ public class LambdaEventSerializers {
                     ConnectEventMixin.ContactDataMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$CustomerEndpoint",
                     ConnectEventMixin.CustomerEndpointMixin.class),
+            new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Queue",
+                    ConnectEventMixin.QueueMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$SystemEndpoint",
                     ConnectEventMixin.SystemEndpointMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbEvent",
@@ -161,6 +163,7 @@ public class LambdaEventSerializers {
                     Arrays.asList(
                             new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Details"),
                             new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$ContactData"),
+                            new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Queue"),
                             new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$CustomerEndpoint"),
                             new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$SystemEndpoint"))),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbEvent",

aws-lambda-java-serialization/src/main/java/com/amazonaws/services/lambda/runtime/serialization/events/mixins/ConnectEventMixin.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Map;
+import java.util.Queue;
 
 /**
  * Jackson annotations for ConnectEvent
@@ -65,7 +66,7 @@ public abstract class ContactDataMixin {
         @JsonProperty("PreviousContactId") abstract void setPreviousContactId(String previousContactId);
 
         // needed because Jackson expects "queue" instead of "Queue"
-        @JsonProperty("Queue") abstract String getQueue();
+        @JsonProperty("Queue") abstract Queue getQueue();
         @JsonProperty("Queue") abstract void setQueue(String queue);
 
         // needed because Jackson expects "systemEndpoint" instead of "SystemEndpoint"
@@ -85,6 +86,17 @@ public abstract class CustomerEndpointMixin {
         @JsonProperty("Type") abstract void setType(String type);
     }
 
+    public abstract class QueueMixin {
+
+        // needed because Jackson expects "arn" instead of "ARN"
+        @JsonProperty("ARN") abstract String getArn();
+        @JsonProperty("ARN") abstract void setArn(String arn);
+
+        // needed because Jackson expects "name" instead of "Name"
+        @JsonProperty("Name") abstract String getName();
+        @JsonProperty("Name") abstract void setName(String name);
+    }
+
     public abstract class SystemEndpointMixin {
 
         // needed because Jackson expects "address" instead of "Address"

aws-lambda-java-serialization/src/test/java/com/amazonaws/services/lambda/runtime/serialization/events/LambdaEventSerializersTest.java

@@ -78,6 +78,14 @@ public void testConfigEvent() throws IOException {
         assertJsonEqual(expected, actual);
     }
 
+    @Test
+    public void testConnectEvent() throws IOException {
+        String expected = readEvent("connect_event.json");
+        String actual = deserializeSerializeJsonToString(expected, ConnectEvent.class);
+
+        assertJsonEqual(expected, actual);
+    }
+
     @Test
     public void testDynamodbEvent() throws IOException {
         String expected = readEvent("dynamodb_event.json");

aws-lambda-java-serialization/src/test/resources/event_models/connect_event.json

@@ -0,0 +1,29 @@
+{
+  "Details": {
+    "ContactData": {
+      "Attributes": {},
+      "Channel": "VOICE",
+      "ContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
+      "CustomerEndpoint": {
+        "Address": "+1234567890",
+        "Type": "TELEPHONE_NUMBER"
+      },
+      "InitialContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
+      "InitiationMethod": "INBOUND | OUTBOUND | TRANSFER | CALLBACK",
+      "InstanceARN": "arn:aws:connect:aws-region:1234567890:instance/c8c0e68d-2200-4265-82c0-XXXXXXXXXX",
+      "PreviousContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
+      "Queue": {
+        "ARN": "arn:aws:connect:eu-west-2:111111111111:instance/cccccccc-bbbb-dddd-eeee-ffffffffffff/queue/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
+        "Name": "PasswordReset"
+      },
+      "SystemEndpoint": {
+        "Address": "+1234567890",
+        "Type": "TELEPHONE_NUMBER"
+      }
+    },
+    "Parameters": {
+      "sentAttributeKey": "sentAttributeValue"
+    }
+  },
+  "Name": "ContactFlowEvent"
+}

aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java

@@ -253,18 +253,22 @@ public void testLoadConnectEvent() {
         ConnectEvent.ContactData contactData = event.getDetails().getContactData();
         assertThat(contactData)
                 .returns("VOICE", from(ConnectEvent.ContactData::getChannel))
-                .returns("5ca32fbd-8f92-46af-92a5-6b0f970f0efe", from(ConnectEvent.ContactData::getContactId))
-                .returns("6ca32fbd-8f92-46af-92a5-6b0f970f0efe", from(ConnectEvent.ContactData::getInitialContactId))
-                .returns("API", from(ConnectEvent.ContactData::getInitiationMethod))
-                .returns("arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa", from(ConnectEvent.ContactData::getInstanceArn))
-                .returns("4ca32fbd-8f92-46af-92a5-6b0f970f0efe", from(ConnectEvent.ContactData::getPreviousContactId));
+                .returns("4a573372-1f28-4e26-b97b-XXXXXXXXXXX", from(ConnectEvent.ContactData::getContactId))
+                .returns("4a573372-1f28-4e26-b97b-XXXXXXXXXXX", from(ConnectEvent.ContactData::getInitialContactId))
+                .returns("INBOUND | OUTBOUND | TRANSFER | CALLBACK", from(ConnectEvent.ContactData::getInitiationMethod))
+                .returns("arn:aws:connect:aws-region:1234567890:instance/c8c0e68d-2200-4265-82c0-XXXXXXXXXX", from(ConnectEvent.ContactData::getInstanceArn))
+                .returns("4a573372-1f28-4e26-b97b-XXXXXXXXXXX", from(ConnectEvent.ContactData::getPreviousContactId));
+
+        assertThat(contactData.getQueue())
+                .returns("arn:aws:connect:eu-west-2:111111111111:instance/cccccccc-bbbb-dddd-eeee-ffffffffffff/queue/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", from(ConnectEvent.Queue::getArn))
+                .returns("PasswordReset", from(ConnectEvent.Queue::getName));
 
         assertThat(contactData.getCustomerEndpoint())
-                .returns("+11234567890",from(ConnectEvent.CustomerEndpoint::getAddress))
+                .returns("+1234567890",from(ConnectEvent.CustomerEndpoint::getAddress))
                 .returns("TELEPHONE_NUMBER",from(ConnectEvent.CustomerEndpoint::getType));
 
         assertThat(contactData.getSystemEndpoint())
-                .returns("+21234567890",from(ConnectEvent.SystemEndpoint::getAddress))
+                .returns("+1234567890",from(ConnectEvent.SystemEndpoint::getAddress))
                 .returns("TELEPHONE_NUMBER",from(ConnectEvent.SystemEndpoint::getType));
     }
 

aws-lambda-java-tests/src/test/resources/connect_event.json

@@ -4,30 +4,26 @@
     "ContactData": {
       "Attributes": {},
       "Channel": "VOICE",
-      "ContactId": "5ca32fbd-8f92-46af-92a5-6b0f970f0efe",
+      "ContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
       "CustomerEndpoint": {
-        "Address": "+11234567890",
+        "Address": "+1234567890",
         "Type": "TELEPHONE_NUMBER"
       },
-      "InitialContactId": "6ca32fbd-8f92-46af-92a5-6b0f970f0efe",
-      "InitiationMethod": "API",
-      "InstanceARN": "arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa",
-      "MediaStreams": {
-        "Customer": {
-          "Audio": {
-            "StartFragmentNumber": "91343852333181432392682062622220590765191907586",
-            "StartTimestamp": "1565781909613",
-            "StreamARN": "arn:aws:kinesisvideo:eu-central-1:123456789012:stream/connect-contact-a3d73b84-ce0e-479a-a9dc-5637c9d30ac9/1565272947806"
-          }
-        }
+      "InitialContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
+      "InitiationMethod": "INBOUND | OUTBOUND | TRANSFER | CALLBACK",
+      "InstanceARN": "arn:aws:connect:aws-region:1234567890:instance/c8c0e68d-2200-4265-82c0-XXXXXXXXXX",
+      "PreviousContactId": "4a573372-1f28-4e26-b97b-XXXXXXXXXXX",
+      "Queue": {
+        "ARN": "arn:aws:connect:eu-west-2:111111111111:instance/cccccccc-bbbb-dddd-eeee-ffffffffffff/queue/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
+        "Name": "PasswordReset"
       },
-      "PreviousContactId": "4ca32fbd-8f92-46af-92a5-6b0f970f0efe",
-      "Queue": null,
       "SystemEndpoint": {
-        "Address": "+21234567890",
+        "Address": "+1234567890",
         "Type": "TELEPHONE_NUMBER"
       }
     },
-    "Parameters": {}
+    "Parameters": {
+      "sentAttributeKey": "sentAttributeValue"
+    }
   }
 }