[isis] 02/06: ISIS-2266: adds in ClockService#nowAsJodaDateTime

[da...@apache.org]

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 2cd1116dc9e374b823d66b6d1aa78e004484a3ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 21:43:27 2020 +0100

    ISIS-2266: adds in ClockService#nowAsJodaDateTime
---
 .../org/apache/isis/applib/services/clock/ClockService.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
index e1b1663..55db9b8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
@@ -25,6 +25,7 @@ import java.time.OffsetDateTime;
 
 import javax.inject.Named;
 
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
@@ -46,19 +47,19 @@ import org.apache.isis.applib.clock.Clock;
 @Qualifier("Default")
 public class ClockService {
 
-    public LocalDate now() {
+    public java.time.LocalDate now() {
         return Clock.getTimeAsLocalDate();
     }
 
-    public LocalDateTime nowAsLocalDateTime() {
+    public java.time.LocalDateTime nowAsLocalDateTime() {
         return Clock.getTimeAsLocalDateTime();
     }
 
-    public OffsetDateTime nowAsOffsetDateTime() {
+    public java.time.OffsetDateTime nowAsOffsetDateTime() {
         return Clock.getTimeAsOffsetDateTime();
     }
 
-    public Timestamp nowAsJavaSqlTimestamp() {
+    public java.sql.Timestamp nowAsJavaSqlTimestamp() {
         return Clock.getTimeAsJavaSqlTimestamp();
     }
 
@@ -70,4 +71,8 @@ public class ClockService {
         return new java.util.Date(nowAsMillis());
     }
 
+    public org.joda.time.DateTime nowAsJodaDateTime() {
+        return Clock.getTimeAsJodaDateTime();
+    }
+
 }