From 2f28c3c279c68c76320781146a881ad77f12b608 Mon Sep 17 00:00:00 2001 From: Ilya Isaev Date: Wed, 3 Jun 2020 22:05:35 +0300 Subject: [PATCH] Remove Joda-Time dependency --- aws-lambda-java-events/pom.xml | 6 ----- .../runtime/events/CodeCommitEvent.java | 11 ++++---- .../lambda/runtime/events/SNSEvent.java | 11 ++++---- .../lambda/runtime/events/ScheduledEvent.java | 27 +++++++++---------- .../events/models/s3/S3EventNotification.java | 9 +++---- 5 files changed, 27 insertions(+), 37 deletions(-) diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml index 92c42242..2e804800 100644 --- a/aws-lambda-java-events/pom.xml +++ b/aws-lambda-java-events/pom.xml @@ -44,12 +44,6 @@ - - joda-time - joda-time - 2.6 - - org.junit.jupiter junit-jupiter-engine diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CodeCommitEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CodeCommitEvent.java index d76cba29..a7476af2 100644 --- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CodeCommitEvent.java +++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CodeCommitEvent.java @@ -1,8 +1,7 @@ package com.amazonaws.services.lambda.runtime.events; -import org.joda.time.DateTime; - import java.io.Serializable; +import java.time.ZonedDateTime; import java.util.List; /** @@ -270,7 +269,7 @@ public static class Record implements Serializable, Cloneable { private String eventVersion; - private DateTime eventTime; + private ZonedDateTime eventTime; private String eventTriggerName; @@ -348,14 +347,14 @@ public Record withEventVersion(String eventVersion) { /** * @return event timestamp */ - public DateTime getEventTime() { + public ZonedDateTime getEventTime() { return this.eventTime; } /** * @param eventTime event timestamp */ - public void setEventTime(DateTime eventTime) { + public void setEventTime(ZonedDateTime eventTime) { this.eventTime = eventTime; } @@ -363,7 +362,7 @@ public void setEventTime(DateTime eventTime) { * @param eventTime event timestamp * @return Record */ - public Record withEventTime(DateTime eventTime) { + public Record withEventTime(ZonedDateTime eventTime) { setEventTime(eventTime); return this; } diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SNSEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SNSEvent.java index 0649581c..dc909a4a 100644 --- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SNSEvent.java +++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/SNSEvent.java @@ -12,9 +12,8 @@ */ package com.amazonaws.services.lambda.runtime.events; -import org.joda.time.DateTime; - import java.io.Serializable; +import java.time.ZonedDateTime; import java.util.List; import java.util.Map; @@ -181,7 +180,7 @@ public static class SNS implements Serializable, Cloneable { private String signature; - private DateTime timestamp; + private ZonedDateTime timestamp; private String topicArn; @@ -421,7 +420,7 @@ public SNS withSignature(String signature) { * Gets the message time stamp * @return timestamp of sns message */ - public DateTime getTimestamp() { + public ZonedDateTime getTimestamp() { return timestamp; } @@ -429,7 +428,7 @@ public DateTime getTimestamp() { * Sets the message time stamp * @param timestamp A Date object representing the message time stamp */ - public void setTimestamp(DateTime timestamp) { + public void setTimestamp(ZonedDateTime timestamp) { this.timestamp = timestamp; } @@ -437,7 +436,7 @@ public void setTimestamp(DateTime timestamp) { * @param timestamp timestamp * @return SNS */ - public SNS withTimestamp(DateTime timestamp) { + public SNS withTimestamp(ZonedDateTime timestamp) { setTimestamp(timestamp); return this; } diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ScheduledEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ScheduledEvent.java index 5908c39c..e96665a6 100644 --- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ScheduledEvent.java +++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/ScheduledEvent.java @@ -13,9 +13,8 @@ package com.amazonaws.services.lambda.runtime.events; -import org.joda.time.DateTime; - import java.io.Serializable; +import java.time.ZonedDateTime; import java.util.List; import java.util.Map; @@ -38,7 +37,7 @@ public class ScheduledEvent implements Serializable, Cloneable { private String id; - private DateTime time; + private ZonedDateTime time; private List resources; @@ -69,7 +68,7 @@ public ScheduledEvent withAccount(String account) { setAccount(account); return this; } - + /** * @return the aws region */ @@ -92,7 +91,7 @@ public ScheduledEvent withRegion(String region) { setRegion(region); return this; } - + /** * @return The details of the events (usually left blank) */ @@ -115,7 +114,7 @@ public ScheduledEvent withDetail(Map detail) { setDetail(detail); return this; } - + /** * @return The details type - see cloud watch events for more info */ @@ -138,7 +137,7 @@ public ScheduledEvent withDetailType(String detailType) { setDetailType(detailType); return this; } - + /** * @return the soruce of the event */ @@ -161,18 +160,18 @@ public ScheduledEvent withSource(String source) { setSource(source); return this; } - + /** * @return the timestamp for when the event is scheduled */ - public DateTime getTime() { + public ZonedDateTime getTime() { return this.time; } /** * @param time the timestamp for when the event is scheduled */ - public void setTime(DateTime time) { + public void setTime(ZonedDateTime time) { this.time = time; } @@ -180,11 +179,11 @@ public void setTime(DateTime time) { * @param time the timestamp for when the event is scheduled * @return ScheduledEvent */ - public ScheduledEvent withTime(DateTime time) { + public ScheduledEvent withTime(ZonedDateTime time) { setTime(time); return this; } - + /** * @return the id of the event */ @@ -207,7 +206,7 @@ public ScheduledEvent withId(String id) { setId(id); return this; } - + /** * @return the resources used by event */ @@ -331,5 +330,5 @@ public ScheduledEvent clone() { throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone()", e); } } - + } diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/models/s3/S3EventNotification.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/models/s3/S3EventNotification.java index 5df14ea2..0b6f5e15 100644 --- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/models/s3/S3EventNotification.java +++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/models/s3/S3EventNotification.java @@ -12,10 +12,9 @@ */ package com.amazonaws.services.lambda.runtime.events.models.s3; -import org.joda.time.DateTime; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.time.ZonedDateTime; import java.util.List; /** @@ -244,7 +243,7 @@ public static class S3EventNotificationRecord { private final String awsRegion; private final String eventName; private final String eventSource; - private DateTime eventTime; + private ZonedDateTime eventTime; private final String eventVersion; private final RequestParametersEntity requestParameters; private final ResponseElementsEntity responseElements; @@ -261,7 +260,7 @@ public S3EventNotificationRecord(String awsRegion, String eventName, String even if (eventTime != null) { - this.eventTime = DateTime.parse(eventTime); + this.eventTime = ZonedDateTime.parse(eventTime); } this.eventVersion = eventVersion; @@ -283,7 +282,7 @@ public String getEventSource() { return eventSource; } - public DateTime getEventTime() { + public ZonedDateTime getEventTime() { return eventTime; }