Fix ConnectEvent::queue field to have the correct fields

Fixes ConnectEvent to use a proper Queue with name and arn fields
according to the implementation of sibling packages and the
relevant aws documentation.

Author: PartiallyUntyped

aws-lambda-java-events-sdk-transformer/pom.xml

@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-events</artifactId>
-      <version>3.11.2</version>
+      <version>3.16.1</version>
       <scope>provided</scope>
     </dependency>
 

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

@@ -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;
     }
 
@@ -80,4 +80,13 @@ public static class SystemEndpoint implements Serializable, Cloneable {
         private String address;
         private String type;
     }
+    @Data
+    @Builder(setterPrefix = "with")
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Queue implements Serializable, Cloneable {
+        private String name;
+        private String ARN;
+    }
+
 }

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

@@ -118,6 +118,7 @@ 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",
@@ -170,6 +171,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(
@@ -214,7 +216,10 @@ public class LambdaEventSerializers {
      */
     private static final Map<String, PropertyNamingStrategy> NAMING_STRATEGY_MAP = Stream.of(
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SNSEvent",
-                    new PropertyNamingStrategy.PascalCaseStrategy()))
+                    new PropertyNamingStrategy.PascalCaseStrategy()),
+            new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ConnectEvent$Queue",
+                    new PropertyNamingStrategy.PascalCaseStrategy())
+            )
             .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
 
     /**

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,9 @@ 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);
+    }
 }

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

@@ -333,6 +333,14 @@ public void testLoadConnectEvent() {
         assertThat(contactData.getSystemEndpoint())
                 .returns("+21234567890",from(ConnectEvent.SystemEndpoint::getAddress))
                 .returns("TELEPHONE_NUMBER",from(ConnectEvent.SystemEndpoint::getType));
+
+        assertThat(contactData.getQueue())
+                .isNotNull()
+                .returns("SampleQueue", from(ConnectEvent.Queue::getName))
+                .returns("arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa", 
+                    from(ConnectEvent.Queue::getARN)
+                );
+
     }
 
     @Test

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

@@ -22,7 +22,10 @@
         }
       },
       "PreviousContactId": "4ca32fbd-8f92-46af-92a5-6b0f970f0efe",
-      "Queue": null,
+      "Queue": {
+        "Name": "SampleQueue",
+        "ARN": "arn:aws:connect:eu-central-1:123456789012:instance/9308c2a1-9bc6-4cea-8290-6c0b4a6d38fa"
+      },
       "SystemEndpoint": {
         "Address": "+21234567890",
         "Type": "TELEPHONE_NUMBER"