Update DateWrapper to store an Instant

Isira-Seneviratne · Isira-Seneviratne · commit 953189f0ba88 · 2025-09-12T08:16:56.000+05:30
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/localization/DateWrapper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/localization/DateWrapper.java
@@ -1,65 +1,52 @@
 package org.schabi.newpipe.extractor.localization;
 
-
 import javax.annotation.Nonnull;
 import java.io.Serializable;
+import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
 /**
  * A wrapper class that provides a field to describe if the date/time is precise or just an
  * approximation.
  */
 public class DateWrapper implements Serializable {
     @Nonnull
-    private final OffsetDateTime offsetDateTime;
+    private final Instant instant;
     private final boolean isApproximation;
 
-    /**
-     * @deprecated Use {@link #DateWrapper(OffsetDateTime)} instead.
-     */
-    @Deprecated
-    public DateWrapper(@Nonnull final Calendar calendar) {
-        //noinspection deprecation
-        this(calendar, false);
-    }
-
-    /**
-     * @deprecated Use {@link #DateWrapper(OffsetDateTime, boolean)} instead.
-     */
-    @Deprecated
-    public DateWrapper(@Nonnull final Calendar calendar, final boolean isApproximation) {
-        this(OffsetDateTime.ofInstant(calendar.toInstant(), ZoneOffset.UTC), isApproximation);
-    }
-
     public DateWrapper(@Nonnull final OffsetDateTime offsetDateTime) {
         this(offsetDateTime, false);
     }
 
     public DateWrapper(@Nonnull final OffsetDateTime offsetDateTime,
                        final boolean isApproximation) {
-        this.offsetDateTime = offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC);
+        this(offsetDateTime.toInstant(), isApproximation);
+    }
+
+    public DateWrapper(@Nonnull final Instant instant) {
+        this(instant, false);
+    }
+
+    public DateWrapper(@Nonnull final Instant instant, final boolean isApproximation) {
+        this.instant = instant;
         this.isApproximation = isApproximation;
     }
 
     /**
-     * @return the wrapped date/time as a {@link Calendar}.
-     * @deprecated use {@link #offsetDateTime()} instead.
+     * @return the wrapped {@link Instant}
      */
-    @Deprecated
     @Nonnull
-    public Calendar date() {
-        return GregorianCalendar.from(offsetDateTime.toZonedDateTime());
+    public Instant getInstant() {
+        return instant;
     }
 
     /**
-     * @return the wrapped date/time.
+     * @return the wrapped {@link Instant} as an {@link OffsetDateTime} set to UTC.
      */
     @Nonnull
     public OffsetDateTime offsetDateTime() {
-        return offsetDateTime;
+        return instant.atOffset(ZoneOffset.UTC);
     }
 
     /**
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/localization/TimeAgoParser.java b/extractor/src/main/java/org/schabi/newpipe/extractor/localization/TimeAgoParser.java
@@ -5,7 +5,6 @@
 import org.schabi.newpipe.extractor.utils.Parser;
 
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -28,7 +27,7 @@ public class TimeAgoParser {
      *                       language word separator.
      */
     public TimeAgoParser(final PatternsHolder patternsHolder) {
-        this(patternsHolder, OffsetDateTime.now(ZoneOffset.UTC));
+        this(patternsHolder, OffsetDateTime.now());
     }
 
     /**
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampExtractorHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampExtractorHelper.java
@@ -204,7 +204,7 @@ public static DateWrapper parseDate(final String textDate) throws ParsingExcepti
         try {
             final ZonedDateTime zonedDateTime = ZonedDateTime.parse(textDate,
                     DateTimeFormatter.ofPattern("dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH));
-            return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);
+            return new DateWrapper(zonedDateTime.toInstant());
         } catch (final DateTimeException e) {
             throw new ParsingException("Could not parse date '" + textDate + "'", e);
         }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKiosk.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKiosk.java
@@ -54,7 +54,7 @@ public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, Extrac
         // Sort them to have the latest stream at the beginning of the list.
         final Comparator<StreamInfoItem> comparator = Comparator
                 .comparing(StreamInfoItem::getUploadDate, Comparator
-                        .nullsLast(Comparator.comparing(DateWrapper::offsetDateTime)))
+                        .nullsLast(Comparator.comparing(DateWrapper::getInstant)))
                 .reversed();
         final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId(),
                 comparator);
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKioskExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKioskExtractor.java
@@ -92,6 +92,6 @@ public String getTextualUploadDate() throws ParsingException {
     public DateWrapper getUploadDate() throws ParsingException {
         final ZonedDateTime zonedDateTime = ZonedDateTime.parse(event.getString("date"),
                 DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSzzzz"));
-        return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);
+        return new DateWrapper(zonedDateTime.toInstant());
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeParsingHelper.java
@@ -19,8 +19,6 @@
 
 import javax.annotation.Nonnull;
 import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,10 +46,9 @@ public static void validate(final JsonObject json) throws ContentNotAvailableExc
         }
     }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
-            throws ParsingException {
+    public static Instant parseInstantFrom(final String textualUploadDate) throws ParsingException {
         try {
-            return OffsetDateTime.ofInstant(Instant.parse(textualUploadDate), ZoneOffset.UTC);
+            return Instant.parse(textualUploadDate);
         } catch (final DateTimeParseException e) {
             throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
         }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
@@ -23,7 +23,7 @@
 
 import static org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeCommentsExtractor.CHILDREN;
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseInstantFrom;
 
 public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtractor {
     @Nonnull
@@ -73,8 +73,7 @@ public String getTextualUploadDate() throws ParsingException {
 
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        final String textualUploadDate = getTextualUploadDate();
-        return new DateWrapper(parseDateFrom(textualUploadDate));
+        return new DateWrapper(parseInstantFrom(getTextualUploadDate()));
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
@@ -85,7 +85,7 @@ public DateWrapper getUploadDate() throws ParsingException {
             return null;
         }
 
-        return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
+        return new DateWrapper(PeertubeParsingHelper.parseInstantFrom(textualUploadDate));
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java
@@ -14,7 +14,7 @@
 
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;
-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseInstantFrom;
 
 public class PeertubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
 
@@ -91,7 +91,7 @@ public DateWrapper getUploadDate() throws ParsingException {
             return null;
         }
 
-        return new DateWrapper(parseDateFrom(textualUploadDate));
+        return new DateWrapper(parseInstantFrom(textualUploadDate));
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -67,9 +67,10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
+import java.time.ZoneId;
 import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.List;
@@ -294,13 +295,14 @@ public static String getFeedUrlFrom(@Nonnull final String channelIdOrUser) {
         }
     }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
+    public static Instant parseInstantFrom(final String textualUploadDate)
             throws ParsingException {
         try {
-            return OffsetDateTime.parse(textualUploadDate);
+            return OffsetDateTime.parse(textualUploadDate).toInstant();
         } catch (final DateTimeParseException e) {
             try {
-                return LocalDate.parse(textualUploadDate).atStartOfDay().atOffset(ZoneOffset.UTC);
+                return LocalDate.parse(textualUploadDate).atStartOfDay(ZoneId.systemDefault())
+                        .toInstant();
             } catch (final DateTimeParseException e1) {
                 throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"",
                         e1);
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -87,7 +87,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
-import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -196,34 +196,33 @@ public String getTextualUploadDate() throws ParsingException {
                 final String time = videoPrimaryInfoRendererDateText.substring(13);
 
                 try { // Premiered 20 hours ago
-                    final TimeAgoParser timeAgoParser = TimeAgoPatternsManager.getTimeAgoParserFor(
+                    final var timeAgoParser = TimeAgoPatternsManager.getTimeAgoParserFor(
                             new Localization("en"));
-                    final OffsetDateTime parsedTime = timeAgoParser.parse(time).offsetDateTime();
-                    return DateTimeFormatter.ISO_LOCAL_DATE.format(parsedTime);
+                    final var instant = timeAgoParser.parse(time).getInstant();
+                    return LocalDate.ofInstant(instant, ZoneId.systemDefault()).toString();
                 } catch (final Exception ignored) {
                 }
 
                 try { // Premiered Feb 21, 2020
-                    final LocalDate localDate = LocalDate.parse(time,
-                            DateTimeFormatter.ofPattern("MMM dd, yyyy", Locale.ENGLISH));
-                    return DateTimeFormatter.ISO_LOCAL_DATE.format(localDate);
+                    final var formatter = DateTimeFormatter.ofPattern("MMM dd, yyyy",
+                            Locale.ENGLISH);
+                    return LocalDate.parse(time, formatter).toString();
                 } catch (final Exception ignored) {
                 }
 
                 try { // Premiered on 21 Feb 2020
-                    final LocalDate localDate = LocalDate.parse(time,
-                            DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.ENGLISH));
-                    return DateTimeFormatter.ISO_LOCAL_DATE.format(localDate);
+                    final var formatter = DateTimeFormatter.ofPattern("dd MMM yyyy",
+                            Locale.ENGLISH);
+                    return LocalDate.parse(time, formatter).toString();
                 } catch (final Exception ignored) {
                 }
             }
 
             try {
                 // TODO: this parses English formatted dates only, we need a better approach to
                 //  parse the textual date
-                final LocalDate localDate = LocalDate.parse(videoPrimaryInfoRendererDateText,
-                        DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.ENGLISH));
-                return DateTimeFormatter.ISO_LOCAL_DATE.format(localDate);
+                final var formatter = DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.ENGLISH);
+                return LocalDate.parse(videoPrimaryInfoRendererDateText, formatter).toString();
             } catch (final Exception e) {
                 throw new ParsingException("Could not get upload date", e);
             }
@@ -240,7 +239,7 @@ public DateWrapper getUploadDate() throws ParsingException {
             return null;
         }
 
-        return new DateWrapper(YoutubeParsingHelper.parseDateFrom(textualUploadDate), true);
+        return new DateWrapper(YoutubeParsingHelper.parseInstantFrom(textualUploadDate), true);
     }
 
     @Nonnull
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemExtractor.java
@@ -43,8 +43,8 @@
 import javax.annotation.Nullable;
 
 import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -251,7 +251,9 @@ public String getTextualUploadDate() throws ParsingException {
         }
 
         if (isPremiere()) {
-            return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(getDateFromPremiere());
+            final var localDateTime = LocalDateTime.ofInstant(getInstantFromPremiere(),
+                    ZoneId.systemDefault());
+            return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(localDateTime);
         }
 
         String publishedTimeText = getTextFromObject(videoInfo.getObject("publishedTimeText"));
@@ -277,7 +279,7 @@ public DateWrapper getUploadDate() throws ParsingException {
         }
 
         if (isPremiere()) {
-            return new DateWrapper(getDateFromPremiere());
+            return new DateWrapper(getInstantFromPremiere());
         }
 
         final String textualUploadDate = getTextualUploadDate();
@@ -401,15 +403,15 @@ private boolean isPremiere() {
         return isPremiere;
     }
 
-    private OffsetDateTime getDateFromPremiere() throws ParsingException {
+    private Instant getInstantFromPremiere() throws ParsingException {
         final JsonObject upcomingEventData = videoInfo.getObject("upcomingEventData");
         final String startTime = upcomingEventData.getString("startTime");
 
         try {
-            return OffsetDateTime.ofInstant(Instant.ofEpochSecond(Long.parseLong(startTime)),
-                    ZoneOffset.UTC);
+            return Instant.ofEpochSecond(Long.parseLong(startTime));
         } catch (final Exception e) {
-            throw new ParsingException("Could not parse date from premiere: \"" + startTime + "\"");
+            final String message = "Could not parse date from premiere: \"" + startTime + "\"";
+            throw new ParsingException(message, e);
         }
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/kiosk/YoutubeChartsBaseKioskExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/kiosk/YoutubeChartsBaseKioskExtractor.java
@@ -27,7 +27,7 @@
 import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
+import java.time.LocalDate;
 import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.List;
@@ -204,19 +204,14 @@ public String getTextualUploadDate() {
         @Override
         public DateWrapper getUploadDate() {
             final JsonObject releaseDate = videoObject.getObject("releaseDate");
-            return new DateWrapper(OffsetDateTime.of(
-                    releaseDate.getInt("year"),
-                    releaseDate.getInt("month"),
-                    releaseDate.getInt("day"),
-                    0,
-                    0,
-                    0,
-                    0,
-                    // We request that times should be returned with 0 offset to UTC timezone in
-                    // the JSON body, but YouTube charts does it only in its HTTP headers
-                    ZoneOffset.UTC),
-                    // We don't have more info than the release day
-                    true);
+            final var localDate = LocalDate.of(releaseDate.getInt("year"),
+                    releaseDate.getInt("month"), releaseDate.getInt("day"));
+            // We request that times should be returned with 0 offset to UTC timezone in
+            // the JSON body, but YouTube charts does it only in its HTTP headers
+            final var instant = localDate.atStartOfDay(ZoneOffset.UTC).toInstant();
+
+            // We don't have more info than the release day
+            return new DateWrapper(instant, true);
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public static DateWrapper parseDate(final String textDate) throws ParsingExcepti`
`204`	`204`	`try {`
`205`	`205`	`final ZonedDateTime zonedDateTime = ZonedDateTime.parse(textDate,`
`206`	`206`	`DateTimeFormatter.ofPattern("dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH));`
`207`		`- return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);`
	`207`	`+ return new DateWrapper(zonedDateTime.toInstant());`
`208`	`208`	`} catch (final DateTimeException e) {`
`209`	`209`	`throw new ParsingException("Could not parse date '" + textDate + "'", e);`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,6 @@ public String getTextualUploadDate() throws ParsingException {`
`92`	`92`	`public DateWrapper getUploadDate() throws ParsingException {`
`93`	`93`	`final ZonedDateTime zonedDateTime = ZonedDateTime.parse(event.getString("date"),`
`94`	`94`	`DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSzzzz"));`
`95`		`- return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);`
	`95`	`+ return new DateWrapper(zonedDateTime.toInstant());`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`
`20`	`20`	`import javax.annotation.Nonnull;`
`21`	`21`	`import java.time.Instant;`
`22`		`-import java.time.OffsetDateTime;`
`23`		`-import java.time.ZoneOffset;`
`24`	`22`	`import java.time.format.DateTimeParseException;`
`25`	`23`	`import java.util.ArrayList;`
`26`	`24`	`import java.util.Collections;`
`@@ -48,10 +46,9 @@ public static void validate(final JsonObject json) throws ContentNotAvailableExc`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`
`51`		`- public static OffsetDateTime parseDateFrom(final String textualUploadDate)`
`52`		`- throws ParsingException {`
	`49`	`+ public static Instant parseInstantFrom(final String textualUploadDate) throws ParsingException {`
`53`	`50`	`try {`
`54`		`- return OffsetDateTime.ofInstant(Instant.parse(textualUploadDate), ZoneOffset.UTC);`
	`51`	`+ return Instant.parse(textualUploadDate);`
`55`	`52`	`} catch (final DateTimeParseException e) {`
`56`	`53`	`throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);`
`57`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public DateWrapper getUploadDate() throws ParsingException {`
`85`	`85`	`return null;`
`86`	`86`	`}`
`87`	`87`
`88`		`- return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));`
	`88`	`+ return new DateWrapper(PeertubeParsingHelper.parseInstantFrom(textualUploadDate));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Nonnull`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;`
`16`	`16`	`import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;`
`17`		`-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;`
	`17`	`+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseInstantFrom;`
`18`	`18`
`19`	`19`	`public class PeertubeStreamInfoItemExtractor implements StreamInfoItemExtractor {`
`20`	`20`
`@@ -91,7 +91,7 @@ public DateWrapper getUploadDate() throws ParsingException {`
`91`	`91`	`return null;`
`92`	`92`	`}`
`93`	`93`
`94`		`- return new DateWrapper(parseDateFrom(textualUploadDate));`
	`94`	`+ return new DateWrapper(parseInstantFrom(textualUploadDate));`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Override`