From 1a0f26a8a918c7a28a6307494bd5cf01ce167430 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Fri, 17 May 2019 22:22:49 +1000 Subject: [PATCH] Deprecated old date/time classes --- .../net/fortuna/ical4j/model/CalendarDateFormatFactory.java | 3 +++ src/main/java/net/fortuna/ical4j/model/TimeZone.java | 3 +++ src/main/java/net/fortuna/ical4j/util/Dates.java | 3 +++ src/main/java/net/fortuna/ical4j/util/FixedUidGenerator.java | 5 +++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/model/CalendarDateFormatFactory.java b/src/main/java/net/fortuna/ical4j/model/CalendarDateFormatFactory.java index a497d1569..8979fa07f 100644 --- a/src/main/java/net/fortuna/ical4j/model/CalendarDateFormatFactory.java +++ b/src/main/java/net/fortuna/ical4j/model/CalendarDateFormatFactory.java @@ -49,7 +49,10 @@ * * @author Dave Nault dnault@laszlosystems.com * @see #getInstance(String) + * + * @deprecated adoption of the new date/time API means formatting is now supported via {@link java.time.format.DateTimeFormatter} */ +@Deprecated public final class CalendarDateFormatFactory { private static final Logger LOG = LoggerFactory.getLogger(CalendarDateFormatFactory.class); diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZone.java b/src/main/java/net/fortuna/ical4j/model/TimeZone.java index 6fd507c0b..47fb5c9e7 100644 --- a/src/main/java/net/fortuna/ical4j/model/TimeZone.java +++ b/src/main/java/net/fortuna/ical4j/model/TimeZone.java @@ -51,7 +51,10 @@ * definition. * * @author Ben Fortuna + * + * @deprecated with the introduction of the new date/time API the older API is now deprecated. */ +@Deprecated public class TimeZone extends java.util.TimeZone { private static final long serialVersionUID = -5620979316746547234L; diff --git a/src/main/java/net/fortuna/ical4j/util/Dates.java b/src/main/java/net/fortuna/ical4j/util/Dates.java index d2e5f4aaf..89b6d0f1d 100644 --- a/src/main/java/net/fortuna/ical4j/util/Dates.java +++ b/src/main/java/net/fortuna/ical4j/util/Dates.java @@ -49,7 +49,10 @@ * Implements a collection of utility methods relevant to date processing. * * @author Ben Fortuna + * + * @deprecated Utility class for old date/time API no longer required */ +@Deprecated public final class Dates { /** diff --git a/src/main/java/net/fortuna/ical4j/util/FixedUidGenerator.java b/src/main/java/net/fortuna/ical4j/util/FixedUidGenerator.java index ae022f768..6d256a61f 100644 --- a/src/main/java/net/fortuna/ical4j/util/FixedUidGenerator.java +++ b/src/main/java/net/fortuna/ical4j/util/FixedUidGenerator.java @@ -36,6 +36,7 @@ import java.net.SocketException; import java.time.Instant; +import java.util.concurrent.TimeUnit; /** * $Id$ @@ -96,8 +97,8 @@ private static TemporalAdapter uniqueTimestamp() { if (currentMillis < lastMillis) { currentMillis = lastMillis; } - if (currentMillis - lastMillis < Dates.MILLIS_PER_SECOND) { - currentMillis += Dates.MILLIS_PER_SECOND; + if (currentMillis - lastMillis < TimeUnit.SECONDS.toMillis(1)) { + currentMillis += TimeUnit.SECONDS.toMillis(1); } lastMillis = currentMillis; }