Removed JodaTime dependency - migrated to java.time (resolves zapr-os…

…s#130).
Jonarzz · Feb 29, 2020 · 4afde73 · 4afde73
1 parent c60b2b8
commit 4afde73
Show file tree

Hide file tree

Showing 17 changed files with 284 additions and 270 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jackson.databind.version>2.9.10.1</jackson.databind.version>
         <jackson.datatype.version>2.9.9</jackson.datatype.version>
-        <jodatime.version>2.9.7</jodatime.version>
         <lombok.version>1.18.10</lombok.version>
         <testng.version>6.11</testng.version>
         <logback.version>1.2.1</logback.version>
@@ -30,24 +29,12 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.databind.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson.datatype.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/src/main/java/in/zapr/druid/druidry/granularity/DurationGranularity.java b/src/main/java/in/zapr/druid/druidry/granularity/DurationGranularity.java
@@ -18,35 +18,37 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.joda.time.DateTime;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.Temporal;
+
 @Getter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
 public class DurationGranularity extends Granularity {
 
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'");
+
     private static final String DURATION_GRANULARITY_TYPE = "duration";
 
     private final String type;
     @JsonProperty("duration")
     private long durationInMilliSeconds;
-    private DateTime origin;
+    private Temporal origin;
 
     public DurationGranularity(long durationInMilliSeconds) {
         this(durationInMilliSeconds, null);
     }
 
-    public DurationGranularity(long durationInMilliSeconds, DateTime origin) {
+    public DurationGranularity(long durationInMilliSeconds, Temporal origin) {
         this.type = DURATION_GRANULARITY_TYPE;
         this.durationInMilliSeconds = durationInMilliSeconds;
         this.origin = origin;
     }
 
     public String getOrigin() {
-        return origin == null ? null : origin.toDateTimeISO().toString();
+        return origin == null ? null : FORMATTER.format(origin);
     }
 }
diff --git a/src/main/java/in/zapr/druid/druidry/granularity/PeriodGranularity.java b/src/main/java/in/zapr/druid/druidry/granularity/PeriodGranularity.java
@@ -16,20 +16,22 @@
 
 package in.zapr.druid.druidry.granularity;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
+import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
 @Builder
 @Getter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode(callSuper = true)
 public class PeriodGranularity extends Granularity {
+
     private static final String PERIOD_GRANULARITY_TYPE = "period";
     private static final String DEFAULT_TIMEZONE = "UTC";
 
@@ -40,14 +42,14 @@ public class PeriodGranularity extends Granularity {
     private String period;
 
     // TODO: Check if it is alright
-    private DateTimeZone timeZone;
-    private DateTime origin;
+    private ZoneId timeZone;
+    private ZonedDateTime origin;
 
     public String getOrigin() {
-        return origin == null ? null : origin.toDateTimeISO().toString();
+        return origin == null ? null : ISO_DATE_TIME.format(origin);
     }
 
     public String getTimeZone() {
-        return timeZone == null ? DEFAULT_TIMEZONE : timeZone.getID();
+        return timeZone == null ? DEFAULT_TIMEZONE : timeZone.getId();
     }
 }
diff --git a/src/main/java/in/zapr/druid/druidry/query/config/Interval.java b/src/main/java/in/zapr/druid/druidry/query/config/Interval.java
@@ -17,29 +17,31 @@
 package in.zapr.druid.druidry.query.config;
 
 import com.fasterxml.jackson.annotation.JsonValue;
-
-import org.joda.time.DateTime;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+
 @Getter
 @EqualsAndHashCode
 public class Interval {
 
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
     private final static String DRUID_INTERVAL_FORMAT = "%s/%s";
 
-    private DateTime startTime;
-    private DateTime endTime;
+    private TemporalAccessor startTime;
+    private TemporalAccessor endTime;
 
-    public Interval(@NonNull DateTime startTime, @NonNull DateTime endTime) {
+    public Interval(@NonNull TemporalAccessor startTime, @NonNull TemporalAccessor endTime) {
         this.startTime = startTime;
         this.endTime = endTime;
     }
 
     @JsonValue
     private String getIntervalAsString() {
-        return String.format(DRUID_INTERVAL_FORMAT, startTime.toDateTimeISO(), endTime.toDateTimeISO());
+        return String.format(DRUID_INTERVAL_FORMAT, FORMATTER.format(startTime), FORMATTER.format(endTime));
     }
 }
diff --git a/src/test/java/in/zapr/druid/druidry/dataSource/QueryDataSourceTest.java b/src/test/java/in/zapr/druid/druidry/dataSource/QueryDataSourceTest.java
@@ -18,9 +18,13 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
+import in.zapr.druid.druidry.dimension.DruidDimension;
+import in.zapr.druid.druidry.dimension.SimpleDimension;
+import in.zapr.druid.druidry.granularity.Granularity;
+import in.zapr.druid.druidry.granularity.PredefinedGranularity;
+import in.zapr.druid.druidry.granularity.SimpleGranularity;
+import in.zapr.druid.druidry.query.aggregation.DruidGroupByQuery;
+import in.zapr.druid.druidry.query.config.Interval;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,17 +33,12 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
 import java.util.Arrays;
 import java.util.Collections;
 
-import in.zapr.druid.druidry.dimension.DruidDimension;
-import in.zapr.druid.druidry.dimension.SimpleDimension;
-import in.zapr.druid.druidry.granularity.Granularity;
-import in.zapr.druid.druidry.granularity.PredefinedGranularity;
-import in.zapr.druid.druidry.granularity.SimpleGranularity;
-import in.zapr.druid.druidry.query.aggregation.DruidGroupByQuery;
-import in.zapr.druid.druidry.query.config.Interval;
-
 public class QueryDataSourceTest {
     private static ObjectMapper objectMapper;
 
@@ -55,8 +54,10 @@ public void testQueryDataSource() throws JsonProcessingException, JSONException
 
         Granularity granularity = new SimpleGranularity(PredefinedGranularity.ALL);
         // Interval
-        DateTime startTime = new DateTime(2012, 1, 1, 0, 0, 0, DateTimeZone.UTC);
-        DateTime endTime = new DateTime(2012, 1, 3, 0, 0, 0, DateTimeZone.UTC);
+        Temporal startTime = ZonedDateTime.of(2012, 1, 1,
+                                              0, 0, 0, 0, ZoneOffset.UTC);
+        Temporal endTime = ZonedDateTime.of(2012, 1, 3,
+                                            0, 0, 0, 0, ZoneOffset.UTC);
         Interval interval = new Interval(startTime, endTime);
 
         DruidGroupByQuery druidGroupByQuery = DruidGroupByQuery.builder()

diff --git a/...test/java/in/zapr/druid/druidry/extractionFunctions/TimeFormatExtractionFunctionTest.java b/...test/java/in/zapr/druid/druidry/extractionFunctions/TimeFormatExtractionFunctionTest.java
@@ -18,19 +18,19 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
+import in.zapr.druid.druidry.granularity.DurationGranularity;
 import org.json.JSONException;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.Temporal;
 import java.util.Locale;
 
-import in.zapr.druid.druidry.granularity.DurationGranularity;
-
 public class TimeFormatExtractionFunctionTest {
 
     private static ObjectMapper objectMapper;
@@ -48,7 +48,7 @@ public void testAllFields() throws JsonProcessingException, JSONException {
 
         String timeZone = "America/Montreal";
 
-        DateTime originDate = new DateTime(DateTimeZone.UTC);
+        Temporal originDate = ZonedDateTime.now(ZoneOffset.UTC);
 
         DurationGranularity spec = new DurationGranularity(7200000, originDate);
 
@@ -63,8 +63,8 @@ public void testAllFields() throws JsonProcessingException, JSONException {
         String actualJSON = objectMapper.writeValueAsString(timeFormatExtractonFunction);
 
         String expectedJSONString = "{\n\"type\" : \"timeFormat\",\n \"format\" : \"dd-MM-yyyy\",\n    \"timeZone\" : \"America/Montreal\",\n    \"locale\" : \"fr\",\n    \"granularity\": {\"type\": \"duration\", \"duration\": 7200000, \"origin\": \"" +
-                originDate.toDateTimeISO() +
-                "\"},\n    \"asMillis\": true\n\n  }";
+                                    DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'").format(originDate) +
+                                    "\"},\n    \"asMillis\": true\n\n  }";
 
         JSONAssert.assertEquals(expectedJSONString, actualJSON, JSONCompareMode.NON_EXTENSIBLE);
     }

diff --git a/src/test/java/in/zapr/druid/druidry/filter/IntervalFilterTest.java b/src/test/java/in/zapr/druid/druidry/filter/IntervalFilterTest.java
@@ -18,9 +18,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
+import in.zapr.druid.druidry.query.config.Interval;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,11 +27,12 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import in.zapr.druid.druidry.query.config.Interval;
-
 public class IntervalFilterTest {
 
     private static ObjectMapper objectMapper;
@@ -67,15 +66,15 @@ public void testFields() throws JsonProcessingException, JSONException {
         jsonObject.put("dimension", "__time");
         jsonObject.put("intervals", intervalJsonArray);
 
-        DateTime startTimeInterval1 = new DateTime(2013, 8, 31,
-                0, 0, 0, DateTimeZone.UTC);
-        DateTime endTimeInterval1 = new DateTime(2013, 9, 3,
-                0, 0, 0, DateTimeZone.UTC);
+        Temporal startTimeInterval1 = ZonedDateTime.of(2013, 8, 31,
+                                              0, 0, 0, 0, ZoneOffset.UTC);
+        Temporal endTimeInterval1 = ZonedDateTime.of(2013, 9, 3,
+                                            0, 0, 0, 0, ZoneOffset.UTC);
 
-        DateTime startTimeInterval2 = new DateTime(2018, 8, 31,
-                0, 0, 0, DateTimeZone.UTC);
-        DateTime endTimeInterval2 = new DateTime(2018, 9, 3,
-                0, 0, 0, DateTimeZone.UTC);
+        Temporal startTimeInterval2 = ZonedDateTime.of(2018, 8, 31,
+                                              0, 0, 0, 0, ZoneOffset.UTC);
+        Temporal endTimeInterval2 = ZonedDateTime.of(2018, 9, 3,
+                                            0, 0, 0, 0, ZoneOffset.UTC);
 
         Interval interval1 = new Interval(startTimeInterval1, endTimeInterval1);
         Interval interval2 = new Interval(startTimeInterval2, endTimeInterval2);

diff --git a/src/test/java/in/zapr/druid/druidry/granularity/DurationGranularityTest.java b/src/test/java/in/zapr/druid/druidry/granularity/DurationGranularityTest.java
@@ -18,9 +18,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -29,6 +26,10 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
+
 public class DurationGranularityTest {
 
     private static ObjectMapper objectMapper;
@@ -41,7 +42,7 @@ public void init() {
     @Test
     public void testAllFields() throws JSONException, JsonProcessingException {
 
-        DateTime originDate = new DateTime(DateTimeZone.UTC);
+        Temporal originDate = ZonedDateTime.now(ZoneOffset.UTC);
         DurationGranularity granularity = new DurationGranularity(3141, originDate);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("type", "duration");
@@ -85,7 +86,7 @@ public void testEqualsNegative() {
     public void testEqualsWithAnotherSubClass() {
         SimpleGranularity granularity1 = new SimpleGranularity(PredefinedGranularity.ALL);
 
-        DateTime originDate = new DateTime(DateTimeZone.UTC);
+        Temporal originDate = ZonedDateTime.now(ZoneOffset.UTC);
         DurationGranularity granularity2 = new DurationGranularity(3141, originDate);
 
         Assert.assertNotEquals(granularity1, granularity2);