Better fix of dataformat

apache · Jun 21, 2024 · 2432393 · 2432393
1 parent 2633151
commit 2432393
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/.../dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/.../dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java
@@ -17,12 +17,10 @@
 package org.apache.camel.quarkus.component.dataformat.it;
 
 import java.net.URI;
-import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 
 import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.TimeZoneRegistry;
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory;
 import net.fortuna.ical4j.model.component.VEvent;
@@ -49,8 +47,8 @@ protected static Calendar createTestCalendar(ZonedDateTime start, ZonedDateTime
         // Create the event
         VEvent meeting = new VEvent();
         meeting.replace(new DtStamp(Instant.ofEpochMilli(0)));
-        meeting.add(new DtStart(toDateTime(start, registry).toInstant()));
-        meeting.add(new DtEnd(toDateTime(end, registry).toInstant()));
+        meeting.add(new DtStart(start));
+        meeting.add(new DtEnd(end));
         meeting.add(new Summary(summary));
 
         // add timezone info..
@@ -76,8 +74,4 @@ protected static Calendar createTestCalendar(ZonedDateTime start, ZonedDateTime
         return icsCalendar;
     }
 
-    static DateTime toDateTime(ZonedDateTime zonedDateTime, TimeZoneRegistry registry) {
-        return new DateTime(zonedDateTime.toInstant().toEpochMilli());
-    }
-
 }
diff --git a/...format/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/...format/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java
@@ -68,7 +68,9 @@ public void ical() throws ParseException, IOException {
         final String icsTemplate = IOUtils.toString(getClass().getResourceAsStream("/test.ics"), StandardCharsets.UTF_8);
         final String icalString = String.format(
                 icsTemplate,
+                ZoneId.systemDefault().getId(),
                 toFormatedLocalDateTime(START),
+                ZoneId.systemDefault().getId(),
                 toFormatedLocalDateTime(END),
                 START.getZone().getId());
 

diff --git a/integration-tests/dataformat/src/test/resources/test.ics b/integration-tests/dataformat/src/test/resources/test.ics
@@ -4,8 +4,8 @@ PRODID:-//Events Calendar//iCal4j 1.0//EN
 CALSCALE:GREGORIAN
 BEGIN:VEVENT
 DTSTAMP:19700101T000000Z
-DTSTART:%s
-DTEND:%s
+DTSTART;TZID=%s:%s
+DTEND;TZID=%s:%s
 SUMMARY:Progress Meeting
 TZID:%s
 UID:00000000