Fix ContactFlowEvent to use Queue, update mixins and serializers

Author: PartiallyUntyped

aws-lambda-java-events/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-events</artifactId>
-    <version>3.16.0</version>
+    <version>3.16.1</version>
     <packaging>jar</packaging>
 
     <name>AWS Lambda Java Events Library</name>

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

@@ -78,7 +78,7 @@ public static class CustomerEndpoint implements Serializable, Cloneable {
     @AllArgsConstructor
     public static class Queue implements Serializable, Cloneable {
         private String name;
-        private String arn;
+        private String ARN;
     }
 
     @Data

aws-lambda-java-serialization/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-serialization</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <packaging>jar</packaging>
 
     <name>AWS Lambda Java Runtime Serialization</name>

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

@@ -120,6 +120,8 @@ public class LambdaEventSerializers {
                     ConnectEventMixin.CustomerEndpointMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$SystemEndpoint",
                     ConnectEventMixin.SystemEndpointMixin.class),
+            new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Queue",
+                    ConnectEventMixin.QueueMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbEvent",
                     DynamodbEventMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbEvent$DynamodbStreamRecord",
@@ -170,6 +172,7 @@ public class LambdaEventSerializers {
                             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$CustomerEndpoint"),
+                            new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Queue"),
                             new NestedClass("com.amazonaws.services.lambda.runtime.events.ConnectEvent$SystemEndpoint"))),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.DynamodbEvent",
                     Arrays.asList(

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

@@ -65,8 +65,8 @@ 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 void setQueue(String queue);
+        @JsonProperty("Queue") abstract Map<String, String> getQueue();
+        @JsonProperty("Queue") abstract void setQueue(Map<String, String> queue);
 
         // needed because Jackson expects "systemEndpoint" instead of "SystemEndpoint"
         @JsonProperty("SystemEndpoint") abstract Map<String,String>  getSystemEndpoint();
@@ -95,4 +95,12 @@ public abstract class SystemEndpointMixin {
         @JsonProperty("Type") abstract String getType();
         @JsonProperty("Type") abstract void setType(String type);
     }
+
+    public abstract class QueueMixin {
+        @JsonProperty("Name") abstract String getName();
+        @JsonProperty("Name") abstract void setName(String name);
+        
+        @JsonProperty("ARN") abstract String getARN();
+        @JsonProperty("ARN") abstract void setARN(String arn);
+    }
 }

aws-lambda-java-tests/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.16.0</version>
+            <version>3.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

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

@@ -315,7 +315,8 @@ public void testLoadScheduledEvent() {
     @Test
     public void testLoadConnectEvent() {
         ConnectEvent event = EventLoader.loadConnectEvent("connect_event.json");
-        assertThat(event).isNotNull();
+        assertThat(event).isNotNull()
+            .returns("ContactFlowEvent", from(ConnectEvent::getName));
 
         ConnectEvent.ContactData contactData = event.getDetails().getContactData();
         assertThat(contactData)
@@ -335,7 +336,8 @@ public void testLoadConnectEvent() {
                 .returns("TELEPHONE_NUMBER",from(ConnectEvent.SystemEndpoint::getType));
 
         assertThat(contactData.getQueue())
-                .returns("arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa/queue/941464de-39b7-4cae-82e9-a44f070ef59e", from(ConnectEvent.Queue::getArn))
+                .isNotNull()
+                .returns("arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa/queue/941464de-39b7-4cae-82e9-a44f070ef59e", from(ConnectEvent.Queue::getARN))
                 .returns("ExampleQueue",from(ConnectEvent.Queue::getName));
     }
 

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

@@ -24,7 +24,7 @@
       "PreviousContactId": "4ca32fbd-8f92-46af-92a5-6b0f970f0efe",
       "Queue": {
         "ARN": "arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa/queue/941464de-39b7-4cae-82e9-a44f070ef59e",
-        "Name": "PasswordReset"
+        "Name": "ExampleQueue"
       },
       "SystemEndpoint": {
         "Address": "+21234567890",