Skip to content

refactor(RSSHandlerRoutine): switch to Instant #1365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christolis wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

refactor(RSSHandlerRoutine): switch to Instant #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17c604c
refactor(RSSHandlerRoutine): switch to Instant
christolis Dec 29, 2025
a7b93a0
Pull in hotfix so that CI checks pass
christolis Dec 29, 2025
d688bb2
Remove unnecessary DateTimeFormatter variable
christolis Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions application/src/main/java/org/togetherjava/tjbot/features/rss/FailureState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.togetherjava.tjbot.features.rss;

import java.time.ZonedDateTime;
import java.time.Instant;

record FailureState(int count, ZonedDateTime lastFailure) {
record FailureState(int count, Instant lastFailure) {
}
69 changes: 29 additions & 40 deletions application/src/main/java/org/togetherjava/tjbot/features/rss/RSSHandlerRoutine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@
import javax.annotation.Nonnull;

import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -74,8 +73,6 @@ public final class RSSHandlerRoutine implements Routine {

private static final Logger logger = LoggerFactory.getLogger(RSSHandlerRoutine.class);
private static final int MAX_CONTENTS = 1000;
private static final ZonedDateTime ZONED_TIME_MIN =
ZonedDateTime.of(LocalDateTime.MIN, ZoneId.systemDefault());
private static final String HTTP_USER_AGENT =
"TJ-Bot/1.0 (+https://github.com/Together-Java/TJ-Bot)";
private final RssReader rssReader;
Expand Down Expand Up @@ -181,7 +178,7 @@ private void sendRSS(JDA jda, RSSFeed feedConfig) {
private Optional<Predicate<Item>> prepareItemPostPredicate(RSSFeed feedConfig,
List<Item> rssItems) {
Optional<RssFeedRecord> rssFeedRecord = getRssFeedRecordFromDatabase(feedConfig);
Optional<ZonedDateTime> lastPostedDate =
Optional<Instant> lastPostedDate =
getLatestPostDateFromItems(rssItems, feedConfig.dateFormatterPattern());

lastPostedDate.ifPresent(
Expand All @@ -191,16 +188,15 @@ private Optional<Predicate<Item>> prepareItemPostPredicate(RSSFeed feedConfig,
return Optional.empty();
}

Optional<ZonedDateTime> lastSavedDate = getLastSavedDateFromDatabaseRecord(
rssFeedRecord.orElseThrow(), feedConfig.dateFormatterPattern());
Optional<Instant> lastSavedDate =
getLastSavedDateFromDatabaseRecord(rssFeedRecord.orElseThrow());

if (lastSavedDate.isEmpty()) {
return Optional.empty();
}

return Optional.of(item -> {
ZonedDateTime itemPubDate =
getDateTimeFromItem(item, feedConfig.dateFormatterPattern());
Instant itemPubDate = getDateTimeFromItem(item, feedConfig.dateFormatterPattern());
return itemPubDate.isAfter(lastSavedDate.orElseThrow());
});
}
Expand All @@ -223,16 +219,13 @@ private Optional<RssFeedRecord> getRssFeedRecordFromDatabase(RSSFeed feedConfig)
* record.
*
* @param rssRecord an existing RSS feed record to retrieve the last saved date from
* @param dateFormatterPattern the pattern used to parse the date from the database record
* @return An {@link Optional} containing the last saved date if it could be retrieved and
* parsed successfully, otherwise an empty {@link Optional}
*/
private Optional<ZonedDateTime> getLastSavedDateFromDatabaseRecord(RssFeedRecord rssRecord,
String dateFormatterPattern) throws DateTimeParseException {
private Optional<Instant> getLastSavedDateFromDatabaseRecord(RssFeedRecord rssRecord)
throws DateTimeParseException {
try {
ZonedDateTime savedDate =
getZonedDateTime(rssRecord.getLastDate(), dateFormatterPattern);
return Optional.of(savedDate);
return Optional.of(Instant.parse(rssRecord.getLastDate()));
Copy link
Member

@ankitsmt211 ankitsmt211 Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will throw java.time.format.DateTimeParseException, we should handle it instead of just silenty eating the exception. Something like

catch (DateTimeParseException ignored) {
        try {
            //TODO: Should be removed once we cycle through all stored ZDT string instances
            Instant parsed_instant = ZonedDateTime.parse(raw).toInstant();
            //INFO log here converted from raw -> instant
            // save parsed_instant to database so this doesnt trigger exception on next run
            return Optional.of(parsed_instant); //
        } catch (DateTimeParseException e) {
            return Optional.empty();
        }
    }

} catch (DateTimeParseException _) {
return Optional.empty();
}
Expand All @@ -243,13 +236,13 @@ private Optional<ZonedDateTime> getLastSavedDateFromDatabaseRecord(RssFeedRecord
*
* @param items the list of items to retrieve the latest post date from
* @param dateFormatterPattern the pattern used to parse the date from the database record
* @return the latest post date as a {@link ZonedDateTime} object, or null if the list is empty
* @return the latest post date as a {@link Instant} object, or null if the list is empty
*/
private Optional<ZonedDateTime> getLatestPostDateFromItems(List<Item> items,
private Optional<Instant> getLatestPostDateFromItems(List<Item> items,
String dateFormatterPattern) {
return items.stream()
.map(item -> getDateTimeFromItem(item, dateFormatterPattern))
.max(ZonedDateTime::compareTo);
.max(Instant::compareTo);
}

/**
Expand Down Expand Up @@ -277,10 +270,8 @@ private void postItem(List<TextChannel> textChannels, Item rssItem, RSSFeed feed
* @throws DateTimeParseException if the date cannot be parsed
*/
private void updateLastDateToDatabase(RSSFeed feedConfig, @Nullable RssFeedRecord rssFeedRecord,
ZonedDateTime lastPostedDate) {
DateTimeFormatter dateTimeFormatter =
DateTimeFormatter.ofPattern(feedConfig.dateFormatterPattern());
String lastDateStr = lastPostedDate.format(dateTimeFormatter);
Instant lastPostedDate) {
String lastDateStr = lastPostedDate.toString();

if (rssFeedRecord == null) {
database.write(context -> context.newRecord(RSS_FEED)
Expand All @@ -297,22 +288,22 @@ private void updateLastDateToDatabase(RSSFeed feedConfig, @Nullable RssFeedRecor
}

/**
* Attempts to get a {@link ZonedDateTime} from an {@link Item} with a provided string date time
* Attempts to get a {@link Instant} from an {@link Item} with a provided string date time
* format.
* <p>
* If either of the function inputs are null or a {@link DateTimeParseException} is caught, the
* oldest-possible {@link ZonedDateTime} will get returned instead.
* oldest-possible {@link Instant} will get returned instead.
*
* @param item The {@link Item} from which to extract the date.
* @param dateTimeFormat The format of the date time string.
* @return The computed {@link ZonedDateTime}
* @return The computed {@link Instant}
* @throws DateTimeParseException if the date cannot be parsed
*/
private static ZonedDateTime getDateTimeFromItem(Item item, String dateTimeFormat)
private static Instant getDateTimeFromItem(Item item, String dateTimeFormat)
throws DateTimeParseException {
Optional<String> pubDate = item.getPubDate();

return pubDate.map(s -> getZonedDateTime(s, dateTimeFormat)).orElse(ZONED_TIME_MIN);
return pubDate.map(s -> getInstantTimeFromFormat(s, dateTimeFormat)).orElse(Instant.MIN);

}

Expand All @@ -334,7 +325,7 @@ private static boolean isValidDateFormat(Item rssItem, RSSFeed feedConfig) {
// If this throws a DateTimeParseException then it's certain
// that the format pattern defined in the config and the
// feed's actual format differ.
getZonedDateTime(firstRssFeedPubDate.get(), feedConfig.dateFormatterPattern());
getInstantTimeFromFormat(firstRssFeedPubDate.get(), feedConfig.dateFormatterPattern());
} catch (DateTimeParseException _) {
return false;
}
Expand Down Expand Up @@ -384,7 +375,7 @@ private MessageCreateData constructMessage(Item item, RSSFeed feedConfig) {
// Set the item's timestamp to the embed if found
item.getPubDate()
.ifPresent(date -> embedBuilder
.setTimestamp(getZonedDateTime(date, feedConfig.dateFormatterPattern())));
.setTimestamp(getInstantTimeFromFormat(date, feedConfig.dateFormatterPattern())));

embedBuilder.setTitle(title, titleLink);
embedBuilder.setAuthor(item.getChannel().getLink());
Expand Down Expand Up @@ -428,7 +419,7 @@ private List<Item> fetchRSSItemsFromURL(String rssUrl) {
"Possibly dead RSS feed URL: {} - Failed {} times. Please remove it from config.",
rssUrl, newCount);
}
circuitBreaker.put(rssUrl, new FailureState(newCount, ZonedDateTime.now()));
circuitBreaker.put(rssUrl, new FailureState(newCount, Instant.now()));

long blacklistedHours = calculateWaitHours(newCount);

Expand All @@ -441,21 +432,19 @@ private List<Item> fetchRSSItemsFromURL(String rssUrl) {
}

/**
* Helper function for parsing a given date value to a {@link ZonedDateTime} with a given
* format.
* Helper function for parsing a given date value to a {@link Instant} with a given format.
*
* @param date the date value to parse, can be null
* @param format the format pattern to use for parsing
* @return the parsed {@link ZonedDateTime} object
* @return the parsed {@link Instant} object
* @throws DateTimeParseException if the date cannot be parsed
*/
private static ZonedDateTime getZonedDateTime(@Nullable String date, String format)
private static Instant getInstantTimeFromFormat(@Nullable String date, String datePattern)
Copy link
Member

@Zabuzard Zabuzard Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, having the need to rename this on a type-change indicates that the method name is flawed.

it should be renamed into getTimeFromFormat or more idiomatic parseTime.

Also note the inconsistency with the parameter names called date instead of time. To avoid confusion it should proibably be renamed into parseDateTime and String dateTime, String pattern`

throws DateTimeParseException {
if (date == null) {
return ZONED_TIME_MIN;
return Instant.MIN;
}

return ZonedDateTime.parse(date, DateTimeFormatter.ofPattern(format));
return Instant.from(DateTimeFormatter.ofPattern(datePattern).parse(date));
}

private long calculateWaitHours(int failureCount) {
Expand All @@ -470,8 +459,8 @@ private boolean isBackingOff(String url) {
}

long waitHours = calculateWaitHours(state.count());
ZonedDateTime retryAt = state.lastFailure().plusHours(waitHours);
Instant retryAt = state.lastFailure().plus(waitHours, ChronoUnit.HOURS);

return ZonedDateTime.now().isBefore(retryAt);
return Instant.now().isBefore(retryAt);
}
}
Loading