You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/16 21:43:35 UTC

[isis] 01/06: ISIS-2266: adds back in Clock#getTimeAsJodDateTime

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 9a88502b1ff2411b0be5b7f98c596c7c624dc140
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 21:43:01 2020 +0100

    ISIS-2266: adds back in Clock#getTimeAsJodDateTime
---
 .../src/main/java/org/apache/isis/applib/clock/Clock.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java b/api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
index 8b5c47a..a5fbf61 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
@@ -26,6 +26,9 @@ import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.util.Date;
 
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
 import lombok.val;
 
 /**
@@ -90,8 +93,8 @@ public abstract class Clock {
     }
 
     /**
-     * Returns the {@link #getTime() time} as {@link OffsetDateTime},
-     * using the {@link ZoneId.systemDefault()} timezone.
+     * Returns the time as {@link OffsetDateTime},
+     * using the {@link ZoneId#systemDefault() system default} timezone.
      */
     public static OffsetDateTime getTimeAsOffsetDateTime() {
         val zoneId = ZoneId.systemDefault();
@@ -103,6 +106,14 @@ public abstract class Clock {
         return new java.sql.Timestamp(getEpochMillis());
     }
 
+    /**
+     * Returns the time as a Joda {@link DateTime},
+     * using the {@link ZoneId#systemDefault() system default} timezone.
+     */
+    public static DateTime getTimeAsJodaDateTime() {
+        final ZoneId zoneId = ZoneId.systemDefault();
+        return new DateTime(getInstance().now().toEpochMilli(), DateTimeZone.forID(zoneId.getId()));
+    }
 
     /**
      * Allows subclasses to remove their implementation.