Support for UTC as default timezone for DateTime instances

ical4j · Jan 14, 2020 · 091d720 · 091d720
1 parent 7ec4302
commit 091d720
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/util/TimeZones.java b/src/main/java/net/fortuna/ical4j/util/TimeZones.java
@@ -82,7 +82,7 @@ public static boolean isUtc(final TimeZone timezone) {
     }
 
     public static TimeZone getDefault() {
-        if ("true".equals(Configurator.getProperty("net.fortuna.ical4j.timezone.utcDefault").orElse("false"))) {
+        if ("true".equals(Configurator.getProperty("net.fortuna.ical4j.timezone.default.utc").orElse("false"))) {
             return getUtcTimeZone();
         }
         return TimeZone.getDefault();

diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTimezoneTest.java
@@ -75,6 +75,8 @@ protected final void tearDown() throws Exception {
         CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_UNFOLDING);
         CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_NOTES_COMPATIBILITY);
         CompatibilityHints.clearHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION);
+
+        System.clearProperty("net.fortuna.ical4j.timezone.utcDefault");
     }
 
 
@@ -112,7 +114,9 @@ public void testVTimeZoneAfterVEvent() throws Exception {
 
     public void testTwoDaylights() throws IOException, ParserException {
 
-String ical = "BEGIN:VCALENDAR\n" +
+        System.setProperty("net.fortuna.ical4j.timezone.utcDefault", "true");
+
+        String ical = "BEGIN:VCALENDAR\n" +
                 "VERSION:2.0\n" +
                 "PRODID:-//Test - ECPv4.9.9//NONSGML v1.0//EN\n" +
                 "CALSCALE:GREGORIAN\n" +

diff --git a/src/test/resources/ical4j.properties b/src/test/resources/ical4j.properties
@@ -45,7 +45,7 @@ net.fortuna.ical4j.timezone.update.enabled=false
 #net.fortuna.ical4j.timezone.cache.impl=net.fortuna.ical4j.util.MapTimeZoneCache
 
 #net.fortuna.ical4j.timezone.date.floating={true|false}
-#net.fortuna.ical4j.timezone.utcDefault={true|false}
+#net.fortuna.ical4j.timezone.default.utc={true|false}
 
 #net.fortuna.ical4j.factory.decoder=net.fortuna.ical4j.util.DefaultDecoderFactory