From a8bde5972b7347c7b42fdd5725b7fc3ab92a528f Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Mon, 7 Dec 2020 17:42:12 +1100 Subject: [PATCH] Removed dependency on temporal adapter --- .../transform/recurrence/AbstractDateExpansionRule.java | 4 +--- .../fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/transform/recurrence/AbstractDateExpansionRule.java b/src/main/java/net/fortuna/ical4j/transform/recurrence/AbstractDateExpansionRule.java index f00cac318..9b34b39fb 100644 --- a/src/main/java/net/fortuna/ical4j/transform/recurrence/AbstractDateExpansionRule.java +++ b/src/main/java/net/fortuna/ical4j/transform/recurrence/AbstractDateExpansionRule.java @@ -1,6 +1,5 @@ package net.fortuna.ical4j.transform.recurrence; -import net.fortuna.ical4j.model.TemporalAdapter; import net.fortuna.ical4j.transform.Transformer; import java.io.Serializable; @@ -128,8 +127,7 @@ private int getTemporalField(T date, TemporalField field) { if (date.isSupported(field)) { return date.get(field); } else { - ZonedDateTime zonedDateTime = new TemporalAdapter<>(date).toLocalTime(); - return zonedDateTime.get(field); + return ZonedDateTime.from(date).get(field); } } diff --git a/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy b/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy index ce286a8b5..6df34d0ad 100644 --- a/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy +++ b/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy @@ -14,7 +14,7 @@ class ByDayRuleTest extends Specification { def 'verify transformations by day'() { given: 'a BYDAY rule' - ByDayRule rule = [new WeekDayList(rulePart), frequency, DayOfWeek.SUNDAY] + ByDayRule rule = [new WeekDayList((WeekDay) rulePart), frequency, DayOfWeek.SUNDAY] and: 'a list of dates' def dates = []