New ScheduledV2Event implementation

aws-lambda-java-events/README.md

@@ -49,6 +49,7 @@
 * `S3BatchResponse`
 * `S3Event`
 * `ScheduledEvent`
+* `ScheduledV2Event`
 * `SecretsManagerRotationEvent`
 * `SimpleIAMPolicyResponse`
 * `SNSEvent`

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

@@ -0,0 +1,154 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.amazonaws.services.lambda.runtime.events;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Represents a Scheduled V2 event sent to Lambda
+ * <a href="https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-function-schedulev2.html">ScheduleV2</a>
+ */
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+public class ScheduledV2Event implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -463442139623175611L;
+
+    private String version;
+
+    private String account;
+
+    private String region;
+
+    private String detail;
+
+    private String detailType;
+
+    private String source;
+
+    private String id;
+
+    private DateTime time;
+
+    private List<String> resources;
+
+    /**
+     * Returns a string representation of this object; useful for testing and debugging.
+     *
+     * @return A string representation of this object.
+     * @see Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getVersion() != null)
+            sb.append("version: ").append(getVersion()).append(",");
+        if (getAccount() != null)
+            sb.append("account: ").append(getAccount()).append(",");
+        if (getRegion() != null)
+            sb.append("region: ").append(getRegion()).append(",");
+        if (getDetail() != null)
+            sb.append("detail: ").append(getDetail()).append(",");
+        if (getDetailType() != null)
+            sb.append("detailType: ").append(getDetailType()).append(",");
+        if (getSource() != null)
+            sb.append("source: ").append(getSource()).append(",");
+        if (getId() != null)
+            sb.append("id: ").append(getId()).append(",");
+        if (getTime() != null)
+            sb.append("time: ").append(getTime().toString()).append(",");
+        if (getResources() != null)
+            sb.append("resources: ").append(getResources());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (!(obj instanceof ScheduledV2Event))
+            return false;
+        ScheduledV2Event other = (ScheduledV2Event) obj;
+        if (other.getVersion() == null ^ this.getVersion() == null)
+            return false;
+        if (other.getVersion() != null && other.getVersion().equals(this.getVersion()) == false)
+            return false;
+        if (other.getAccount() == null ^ this.getAccount() == null)
+            return false;
+        if (other.getAccount() != null && other.getAccount().equals(this.getAccount()) == false)
+            return false;
+        if (other.getRegion() == null ^ this.getRegion() == null)
+            return false;
+        if (other.getRegion() != null && other.getRegion().equals(this.getRegion()) == false)
+            return false;
+        if (other.getDetail() == null ^ this.getDetail() == null)
+            return false;
+        if (other.getDetail() != null && other.getDetail().equals(this.getDetail()) == false)
+            return false;
+        if (other.getDetailType() == null ^ this.getDetailType() == null)
+            return false;
+        if (other.getDetailType() != null && other.getDetailType().equals(this.getDetailType()) == false)
+            return false;
+        if (other.getSource() == null ^ this.getSource() == null)
+            return false;
+        if (other.getSource() != null && other.getSource().equals(this.getSource()) == false)
+            return false;
+        if (other.getId() == null ^ this.getId() == null)
+            return false;
+        if (other.getId() != null && other.getId().equals(this.getId()) == false)
+            return false;
+        if (other.getTime() == null ^ this.getTime() == null)
+            return false;
+        if (other.getTime() != null && other.getTime().equals(this.getTime()) == false)
+            return false;
+        if (other.getResources() == null ^ this.getResources() == null)
+            return false;
+        if (other.getResources() != null && other.getResources().equals(this.getResources()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getVersion() == null) ? 0 : getVersion().hashCode());
+        hashCode = prime * hashCode + ((getAccount() == null) ? 0 : getAccount().hashCode());
+        hashCode = prime * hashCode + ((getRegion() == null) ? 0 : getRegion().hashCode());
+        hashCode = prime * hashCode + ((getDetail() == null) ? 0 : getDetail().hashCode());
+        hashCode = prime * hashCode + ((getDetailType() == null) ? 0 : getDetailType().hashCode());
+        hashCode = prime * hashCode + ((getSource() == null) ? 0 : getSource().hashCode());
+        hashCode = prime * hashCode + ((getId() == null) ? 0 : getId().hashCode());
+        hashCode = prime * hashCode + ((getTime() == null) ? 0 : getTime().hashCode());
+        hashCode = prime * hashCode + ((getResources() == null) ? 0 : getResources().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ScheduledV2Event clone() {
+        try {
+            return (ScheduledV2Event) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone()", e);
+        }
+    }
+
+}

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

@@ -1,8 +1,10 @@
 package com.amazonaws.services.lambda.runtime.events;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
+import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -12,6 +14,11 @@ public class APIGatewayV2CustomAuthorizerEventTest {
     private static final long TIME_EPOCH = 1601306426515L;
     private static final String TIME = "28/Sep/2020:15:14:43 +0000";
 
+    @BeforeAll
+    static void beforeAll() {
+        Locale.setDefault(new Locale("en", "US"));
+    }
+
     @Test
     public void testEpochLongAsAnInstant() {
         APIGatewayV2CustomAuthorizerEvent customAuthorizerEvent = APIGatewayV2CustomAuthorizerEvent.builder()

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

@@ -142,6 +142,8 @@ public class LambdaEventSerializers {
                 KinesisTimeWindowEventMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ScheduledEvent",
                     ScheduledEventMixin.class),
+            new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.ScheduledV2Event",
+                    ScheduledEventMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SecretsManagerRotationEvent",
                     SecretsManagerRotationEventMixin.class),
             new SimpleEntry<>("com.amazonaws.services.lambda.runtime.events.SNSEvent",

aws-lambda-java-tests/src/main/java/com/amazonaws/services/lambda/runtime/tests/EventLoader.java

@@ -1,12 +1,14 @@
 /* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
 package com.amazonaws.services.lambda.runtime.tests;
 
+import com.amazonaws.services.lambda.runtime.events.*;
 import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import com.amazonaws.services.lambda.runtime.serialization.events.LambdaEventSerializers;
 
-import java.io.*;
-
-import com.amazonaws.services.lambda.runtime.events.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Load events from json files and serialize them in Events
@@ -101,6 +103,10 @@ public static ScheduledEvent loadScheduledEvent(String filename) {
         return loadEvent(filename, ScheduledEvent.class);
     }
 
+    public static ScheduledV2Event loadScheduledV2Event(String filename) {
+        return loadEvent(filename, ScheduledV2Event.class);
+    }
+
     public static SNSEvent loadSNSEvent(String filename) {
         return loadEvent(filename, SNSEvent.class);
     }
@@ -131,7 +137,7 @@ public static <T> T loadEvent(String filename, Class<T> targetClass) {
         }
         if (stream == null) {
             try {
-                stream = new FileInputStream(new File(filename));
+                stream = new FileInputStream(filename);
             } catch (FileNotFoundException e) {
                 throw new EventLoadingException("Cannot load " + filename, e);
             }

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

@@ -1,20 +1,18 @@
 /* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
 package com.amazonaws.services.lambda.runtime.tests;
 
+import com.amazonaws.services.lambda.runtime.events.*;
 import com.amazonaws.services.lambda.runtime.events.models.dynamodb.AttributeValue;
 import com.amazonaws.services.lambda.runtime.events.models.dynamodb.Record;
 import com.amazonaws.services.lambda.runtime.events.models.dynamodb.StreamRecord;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static java.time.Instant.ofEpochSecond;
 import static org.assertj.core.api.Assertions.*;
-
 import com.amazonaws.services.lambda.runtime.events.*;
 
 public class EventLoaderTest {
@@ -363,6 +361,23 @@ public void testLoadRabbitMQEvent() {
         assertThat((Integer) headers.get("numberInHeader")).isEqualTo(10);
     }
 
+    @Test
+    public void testLoadScheduledV2Event() {
+        ScheduledV2Event event = EventLoader.loadScheduledV2Event("scheduler_event.json");
+
+        assertThat(event).isNotNull();
+        assertThat(event.getVersion()).isEqualTo("0");
+        assertThat(event.getId()).isEqualTo("4e6638b7-b892-4482-9762-8c58d4e71ecc");
+        assertThat(event.getDetailType()).isEqualTo("Scheduled Event");
+        assertThat(event.getSource()).isEqualTo("aws.scheduler");
+        assertThat(event.getAccount()).isEqualTo("123456789012");
+        assertThat(event.getTime()).isEqualTo(DateTime.parse("2024-05-07T15:58:34Z"));
+        assertThat(event.getRegion()).isEqualTo("eu-central-1");
+        assertThat(event.getResources()).isNotEmpty();
+        assertThat(event.getResources()).isEqualTo(Collections.singletonList("arn:aws:scheduler:eu-central-1:123456789012:schedule/default/demoschedule"));
+        assertThat(event.getDetail()).isEqualTo("{}");
+    }
+
     @Test
     public void testLoadCognitoUserPoolPreTokenGenerationEventV2() {
         CognitoUserPoolPreTokenGenerationEventV2 event = EventLoader.loadCognitoUserPoolPreTokenGenerationEventV2("cognito_user_pool_pre_token_generation_event_v2.json");

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

@@ -0,0 +1,13 @@
+{
+  "version": "0",
+  "id": "4e6638b7-b892-4482-9762-8c58d4e71ecc",
+  "detail-type": "Scheduled Event",
+  "source": "aws.scheduler",
+  "account": "123456789012",
+  "time": "2024-05-07T15:58:34Z",
+  "region": "eu-central-1",
+  "resources": [
+    "arn:aws:scheduler:eu-central-1:123456789012:schedule/default/demoschedule"
+  ],
+  "detail": "{}"
+}