From 9befa41e4deec8ee5d5607ce8604208ca3450cb1 Mon Sep 17 00:00:00 2001
From: Mark Sailes <msailes@amazon.co.uk>
Date: Wed, 5 Jan 2022 21:51:27 +0000
Subject: [PATCH 1/2] EventBridge event

---
 .../runtime/events/EventBridgeEvent.java      | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java

diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java
new file mode 100644
index 00000000..e21f35f1
--- /dev/null
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+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.util.List;
+import java.util.Map;
+
+/**
+ * Object representation of an Amazon EventBridge event.
+ *
+ * @see <a href="https://docs.aws.amazon.com/lambda/latest/dg/services-cloudwatchevents.html">Using AWS Lambda with Amazon EventBridge (CloudWatch Events)</a>
+ *
+ * @author msailes <msailes@amazon.co.uk>
+ */
+
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+public class EventBridgeEvent {
+
+    private String version;
+    private String id;
+    private String detailType;
+    private String source;
+    private String account;
+    private DateTime time;
+    private String region;
+    private List<String> resources;
+    private Map<String, Object> detail;
+}

From 8a15d71879f4b1122a309f0f972897b57fed4ac7 Mon Sep 17 00:00:00 2001
From: Mark Sailes <msailes@amazon.co.uk>
Date: Thu, 13 Jan 2022 14:37:20 +0000
Subject: [PATCH 2/2] Adding generics for detail.

---
 .../lambda/runtime/events/EventBridgeEvent.java        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java
index e21f35f1..deb3036d 100644
--- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java
+++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/EventBridgeEvent.java
@@ -16,10 +16,8 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.joda.time.DateTime;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Object representation of an Amazon EventBridge event.
@@ -33,15 +31,17 @@
 @Builder(setterPrefix = "with")
 @NoArgsConstructor
 @AllArgsConstructor
-public class EventBridgeEvent {
+public class EventBridgeEvent<T> {
 
     private String version;
     private String id;
+    // @TODO "detail-type"
     private String detailType;
     private String source;
     private String account;
-    private DateTime time;
+    // @TODO move to a proper type
+    private String time;
     private String region;
     private List<String> resources;
-    private Map<String, Object> detail;
+    private T detail;
 }