Date changes

ical4j · Jun 13, 2020 · 1d83736 · 1d83736
1 parent 96d5f38
commit 1d83736
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/CalendarDateFormat.java b/src/main/java/net/fortuna/ical4j/model/CalendarDateFormat.java
@@ -6,6 +6,7 @@
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQuery;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -225,6 +226,13 @@ public String format(TemporalAccessor date, ZoneId zoneId) {
         return getFormatter().withZone(zoneId).format(date);
     }
 
+    public static CalendarDateFormat from(List<? extends Temporal> list) {
+        if (!list.isEmpty()) {
+            return from(list.get(0));
+        }
+        return FLOATING_DATE_TIME_FORMAT;
+    }
+
     public static CalendarDateFormat from(Temporal temporal) {
         if (temporal instanceof Instant) {
             return UTC_DATE_TIME_FORMAT;

diff --git a/src/main/java/net/fortuna/ical4j/model/DateList.java b/src/main/java/net/fortuna/ical4j/model/DateList.java
@@ -88,7 +88,7 @@ public DateList(final boolean unmodifiable, CalendarDateFormat dateFormat) {
      * @param list a list of dates to include in the new list
      */
     public DateList(final List<T> list) {
-        this(list, CalendarDateFormat.FLOATING_DATE_TIME_FORMAT);
+        this(list, CalendarDateFormat.from(list));
     }
 
     public DateList(final List<T> list, CalendarDateFormat dateFormat) {
@@ -106,10 +106,15 @@ public DateList(final List<T> list, CalendarDateFormat dateFormat) {
      * @throws DateTimeParseException
      */
     public static <T extends Temporal> DateList<T> parse(String value) {
+        return parse(value, null);
+    }
+
+    public static <T extends Temporal> DateList<T> parse(String value, CalendarDateFormat calendarDateFormat) {
         List<Temporal> dates = Arrays.stream(value.split(",")).map(TemporalAdapter::parse)
                 .map(TemporalAdapter::getTemporal).collect(Collectors.toList());
-        if (!dates.isEmpty()) {
-            return new DateList<>((List<T>) dates, CalendarDateFormat.from(dates.get(0)));
+
+        if (calendarDateFormat != null) {
+            return new DateList<>((List<T>) dates, calendarDateFormat);
         } else {
             return new DateList<>((List<T>) dates);
         }

diff --git a/src/main/java/net/fortuna/ical4j/model/TemporalAdapter.java b/src/main/java/net/fortuna/ical4j/model/TemporalAdapter.java
@@ -166,7 +166,11 @@ public ZonedDateTime toLocalTime() {
 
     public ZonedDateTime toLocalTime(ZoneId zoneId) {
         if (isFloating(getTemporal())) {
-            return ((LocalDate) getTemporal()).atStartOfDay().atZone(zoneId);
+            if (getTemporal() instanceof LocalDateTime) {
+                return ((LocalDateTime) getTemporal()).atZone(zoneId);
+            } else {
+                return ((LocalDate) getTemporal()).atStartOfDay().atZone(zoneId);
+            }
         } else if (isUtc(getTemporal())) {
             return ((Instant) getTemporal()).atZone(zoneId);
         } else {