java events 2.0.1 - fixed KinesisFirehose

asuresh8 · asuresh8 · commit f9519113f715 · 2017-10-09T09:14:05.000-07:00
KinesisFirehose event schema was wrong. approximateArrivalTimestamp is
represented as a millisecond epoch instead of a DateTime object. Other
SDK classes use second epoch and are modeled as java.util.Date objects.
To correctly deserialize the KinesisFirehoseEvent, the timestamp must be
modeled as a Long.
diff --git a/README.md b/README.md
@@ -9,8 +9,7 @@ To get started writing AWS Lambda functions in Java, check out the [official doc
 
 Each of the supplied packages should be used without modification. Removing
 dependencies, adding conflicting dependencies, or selectively including classes
-from the packages can result in unexpected behavior, which the AWS Lambda team
-is not responsible for.
+from the packages can result in unexpected behavior.
 
 # Recent Updates!
 
@@ -31,7 +30,7 @@ ___
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-lambda-java-events</artifactId>
-  <version>2.0</version>
+  <version>2.0.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
@@ -49,7 +48,7 @@ ___
 
 ```groovy
 'com.amazonaws:aws-lambda-java-core:1.1.0'
-'com.amazonaws:aws-lambda-java-events:2.0'
+'com.amazonaws:aws-lambda-java-events:2.0.1'
 'com.amazonaws:aws-lambda-java-log4j:1.0.0'
 'com.amazonaws:aws-lambda-java-log4j2:1.0.0'
 ```
@@ -58,7 +57,7 @@ ___
 
 ```clojure
 [com.amazonaws/aws-lambda-java-core "1.1.0"]
-[com.amazonaws/aws-lambda-java-events "2.0"]
+[com.amazonaws/aws-lambda-java-events "2.0.1"]
 [com.amazonaws/aws-lambda-java-log4j "1.0.0"]
 [com.amazonaws/aws-lambda-java-log4j2 "1.0.0"]
 ```
@@ -67,7 +66,7 @@ ___
 
 ```scala
 "com.amazonaws" % "aws-lambda-java-core" % "1.1.0"
-"com.amazonaws" % "aws-lambda-java-events" % "2.0"
+"com.amazonaws" % "aws-lambda-java-events" % "2.0.1"
 "com.amazonaws" % "aws-lambda-java-log4j" % "1.0.0"
 "com.amazonaws" % "aws-lambda-java-log4j2" % "1.0.0"
 ```
diff --git a/aws-lambda-java-events/README.md b/aws-lambda-java-events/README.md
@@ -44,7 +44,7 @@ so the dependencies section in the pom.xml file would like this
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </dependency>
     ...
 </dependencies>
@@ -65,7 +65,7 @@ For the S3 event the pom would look like this:
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </dependency>
     <dependency>
         <groupId>com.amazonaws</groupId>
@@ -91,7 +91,7 @@ For the Kinesis event
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </dependency>
     <dependency>
         <groupId>com.amazonaws</groupId>
@@ -117,7 +117,7 @@ For the Dynamodb event
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </dependency>
     <dependency>
         <groupId>com.amazonaws</groupId>
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KinesisFirehoseEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/KinesisFirehoseEvent.java
@@ -13,8 +13,6 @@
 
 package com.amazonaws.services.lambda.runtime.events;
 
-import org.joda.time.DateTime;
-
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -53,7 +51,7 @@ public static class Record implements Serializable, Cloneable {
 
         private Long approximateArrivalEpoch;
 
-        private DateTime approximateArrivalTimestamp;
+        private Long approximateArrivalTimestamp;
 
         private Map<String, String> kinesisRecordMetadata;
 
@@ -155,22 +153,22 @@ public Record withApproximateArrivalEpoch(Long approximateArrivalEpoch) {
         /**
          * @return approximate arrival timestamp
          */
-        public DateTime getApproximateArrivalTimestamp() {
+        public Long getApproximateArrivalTimestamp() {
             return this.approximateArrivalTimestamp;
         }
 
         /**
          * @param approximateArrivalTimestamp approximate arrival timestamp
          */
-        public void setApproximateArrivalTimestamp(DateTime approximateArrivalTimestamp) {
+        public void setApproximateArrivalTimestamp(Long approximateArrivalTimestamp) {
             this.approximateArrivalTimestamp = approximateArrivalTimestamp;
         }
 
         /**
          * @param approximateArrivalTimestamp approximate arrival timestamp
          * @return Record
          */
-        public Record withApproximateArrivalTimestamp(DateTime approximateArrivalTimestamp) {
+        public Record withApproximateArrivalTimestamp(Long approximateArrivalTimestamp) {
             setApproximateArrivalTimestamp(approximateArrivalTimestamp);
             return this;
         }
@@ -210,7 +208,7 @@ public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append("{");
             if (getData() != null)
-                sb.append("data: ").append(new String(Base64.getDecoder().decode(getData().array()), StandardCharsets.UTF_8)).append(",");
+                sb.append("data: ").append(getData().toString()).append(",");
             if (getRecordId() != null)
                 sb.append("recordId: ").append(getRecordId()).append(",");
             if (getApproximateArrivalEpoch() != null)
