Provide abstraction for check of date-time values

ical4j · Mar 24, 2023 · 0e6b4f1 · 0e6b4f1
1 parent 8fd6dec
commit 0e6b4f1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/CalendarDateFormat.java b/src/main/java/net/fortuna/ical4j/model/CalendarDateFormat.java
@@ -313,9 +313,9 @@ public static CalendarDateFormat from(List<? extends Temporal> list) {
      * @return a date format instance applicable to the given temporal value
      */
     public static CalendarDateFormat from(Temporal temporal) {
-        if (temporal instanceof Instant) {
+        if (TemporalAdapter.isUtc(temporal)) {
             return UTC_DATE_TIME_FORMAT;
-        } else if (temporal instanceof LocalDate) {
+        } else if (!TemporalAdapter.isDateTimePrecision(temporal)) {
             return DATE_FORMAT;
         } else {
             return FLOATING_DATE_TIME_FORMAT;

diff --git a/src/main/java/net/fortuna/ical4j/model/Period.java b/src/main/java/net/fortuna/ical4j/model/Period.java
@@ -358,7 +358,7 @@ public final Period<T> add(final Period<T> period) {
     public final PeriodList<T> subtract(final Period<T> period) {
         if (period.equals(this)) {
             return new PeriodList<>(dateFormat);
-        } else if (!period.intersects(this) || start instanceof LocalDate) {
+        } else if (!period.intersects(this) || !TemporalAdapter.isDateTimePrecision(start)) {
             return new PeriodList<>(Collections.singletonList(this), dateFormat);
         }
         return subtractInterval(period);
@@ -405,7 +405,7 @@ private PeriodList<T> subtractInterval(Period<T> period) {
      * @return true if this period consumes no time, otherwise false
      */
     public final boolean isEmpty() {
-        if (start instanceof LocalDate) {
+        if (!TemporalAdapter.isDateTimePrecision(start)) {
             return start.equals(end);
         }
         return toInterval().isEmpty();

diff --git a/src/main/java/net/fortuna/ical4j/model/PeriodList.java b/src/main/java/net/fortuna/ical4j/model/PeriodList.java
@@ -34,7 +34,6 @@
 import org.threeten.extra.Interval;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.Temporal;
 import java.util.*;
@@ -164,7 +163,7 @@ public final PeriodList<T> normalise() {
         boolean normalised = false;
         for (Period<T> period1 : periods) {
             period = period1;
-            if (period.getStart() instanceof LocalDate) {
+            if (!TemporalAdapter.isDateTimePrecision(period.getStart())) {
                 continue;
             }
             if (period.isEmpty()) {
@@ -244,7 +243,7 @@ public final PeriodList<T> subtract(final PeriodList<T> subtractions) {
         PeriodList<T> tmpResult = new PeriodList<>(dateFormat);
 
         for (final Period<T> subtraction : subtractions.getPeriods()) {
-            if (subtraction.getStart() instanceof LocalDate) {
+            if (!TemporalAdapter.isDateTimePrecision(subtraction.getStart())) {
                 tmpResult = tmpResult.addAll(result.getPeriods().stream()
                         .filter(p -> !p.equals(subtraction)).collect(Collectors.toList()));
             } else {

diff --git a/src/main/java/net/fortuna/ical4j/model/Recur.java b/src/main/java/net/fortuna/ical4j/model/Recur.java
@@ -39,7 +39,6 @@
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.chrono.Chronology;
 import java.time.temporal.*;
 import java.util.*;
@@ -760,7 +759,7 @@ public final List<T> getDates(final T seed, final T periodStart, final T periodE
         final List<T> dates = getDatesAsStream(seed, periodStart, periodEnd, maxCount).collect(Collectors.toList());
 
         // sort final list..
-        if (seed instanceof LocalDate) {
+        if (!TemporalAdapter.isDateTimePrecision(seed)) {
             dates.sort(new TemporalComparator(ChronoUnit.DAYS));
         } else {
             dates.sort(CANDIDATE_SORTER);

diff --git a/src/main/java/net/fortuna/ical4j/model/component/Observance.java b/src/main/java/net/fortuna/ical4j/model/component/Observance.java
@@ -137,7 +137,7 @@ public ValidationResult validate(final boolean recurse) throws ValidationExcepti
      * specified date
      */
     public final OffsetDateTime getLatestOnset(final Temporal date) {
-        if (date instanceof LocalDate) {
+        if (!TemporalAdapter.isDateTimePrecision(date)) {
             throw new UnsupportedOperationException("Unable to get timezone observance for date-only temporal.");
         }
 

diff --git a/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java b/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java
@@ -41,7 +41,6 @@
 import net.fortuna.ical4j.validate.property.DatePropertyValidator;
 import org.slf4j.LoggerFactory;
 
-import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
@@ -149,7 +148,7 @@ public T getDate() {
     public void setDate(T date) {
         if (date != null) {
             this.date = new TemporalAdapter<>(date, timeZoneRegistry);
-            if (date instanceof LocalDate) {
+            if (!TemporalAdapter.isDateTimePrecision(date)) {
                 replace(Value.DATE);
                 removeAll(Parameter.TZID);
             } else if (date instanceof ZonedDateTime) {