Default date time parser

w3stling · Oct 14, 2024 · 9c2651b · 9c2651b
1 parent db84e2c
commit 9c2651b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/src/main/java/com/apptasticsoftware/rssreader/Channel.java b/src/main/java/com/apptasticsoftware/rssreader/Channel.java
@@ -23,6 +23,7 @@
  */
 package com.apptasticsoftware.rssreader;
 
+import com.apptasticsoftware.rssreader.util.Default;
 import com.apptasticsoftware.rssreader.util.Util;
 
 import java.time.ZonedDateTime;
@@ -60,7 +61,7 @@ public class Channel {
     @SuppressWarnings("java:S1133")
     @Deprecated(since="3.5.0", forRemoval=true)
     public Channel() {
-        dateTimeParser = new DateTime();
+        dateTimeParser = Default.getDateTimeParser();
     }
 
     /**

diff --git a/src/main/java/com/apptasticsoftware/rssreader/DateTimeParser.java b/src/main/java/com/apptasticsoftware/rssreader/DateTimeParser.java
@@ -23,6 +23,7 @@
  */
 package com.apptasticsoftware.rssreader;
 
+import java.time.Instant;
 import java.time.ZonedDateTime;
 
 /**
@@ -36,4 +37,11 @@ public interface DateTimeParser {
      * @return ZonedDateTime
      */
     ZonedDateTime parse(String timestamp);
+
+    /**
+     * Converts a timestamp in String format to an Instant
+     * @param dateTime timestamp
+     * @return Instant
+     */
+    Instant toInstant(String dateTime);
 }
diff --git a/src/main/java/com/apptasticsoftware/rssreader/Item.java b/src/main/java/com/apptasticsoftware/rssreader/Item.java
@@ -24,6 +24,7 @@
 package com.apptasticsoftware.rssreader;
 
 
+import com.apptasticsoftware.rssreader.util.Default;
 import com.apptasticsoftware.rssreader.util.ItemComparator;
 
 import java.time.ZonedDateTime;
@@ -60,7 +61,7 @@ public class Item implements Comparable<Item> {
     @SuppressWarnings("java:S1133")
     @Deprecated(since="3.5.0", forRemoval=true)
     public Item() {
-        dateTimeParser = new DateTime();
+        dateTimeParser = Default.getDateTimeParser();
         defaultComparator = ItemComparator.newestItemFirst();
     }
 

diff --git a/src/main/java/com/apptasticsoftware/rssreader/util/Default.java b/src/main/java/com/apptasticsoftware/rssreader/util/Default.java
@@ -0,0 +1,22 @@
+package com.apptasticsoftware.rssreader.util;
+
+import com.apptasticsoftware.rssreader.DateTime;
+import com.apptasticsoftware.rssreader.DateTimeParser;
+
+/**
+ * Provides default implementations for various components.
+ */
+public class Default {
+
+    private Default() {
+        // Utility class
+    }
+
+    /**
+     * Get the default date time parser.
+     * @return date time parser
+     */
+    public static DateTimeParser getDateTimeParser() {
+        return new DateTime();
+    }
+}
diff --git a/src/main/java/com/apptasticsoftware/rssreader/util/ItemComparator.java b/src/main/java/com/apptasticsoftware/rssreader/util/ItemComparator.java
@@ -23,7 +23,6 @@
  */
 package com.apptasticsoftware.rssreader.util;
 
-import com.apptasticsoftware.rssreader.DateTime;
 import com.apptasticsoftware.rssreader.DateTimeParser;
 import com.apptasticsoftware.rssreader.Item;
 
@@ -47,7 +46,7 @@ private ItemComparator() {
      * @return comparator
      */
     public static <I extends Item> Comparator<I> oldestItemFirst() {
-        var dateTime = new DateTime();
+        var dateTime = Default.getDateTimeParser();
         return Comparator.comparing((I i) -> i.getPubDate().map(dateTime::toInstant).orElse(Instant.EPOCH));
     }
 
@@ -68,7 +67,7 @@ public static <I extends Item> Comparator<I> oldestItemFirst(DateTimeParser date
      * @return comparator
      */
     public static <I extends Item> Comparator<I> newestItemFirst() {
-        var dateTime = new DateTime();
+        var dateTime = Default.getDateTimeParser();
         return Comparator.comparing((I i) -> i.getPubDate().map(dateTime::toInstant).orElse(Instant.EPOCH)).reversed();
     }