diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt index 07d24aa497a..60fa2406c64 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt @@ -592,7 +592,6 @@ namespace Akka.Actor [System.ObsoleteAttribute("This class will be removed in Akka.NET v1.6.0 - use the IScheduler instead.")] public class DateTimeOffsetNowTimeProvider : Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider { - public System.DateTime DateTimeNow { get; } public System.TimeSpan HighResMonotonicClock { get; } public static Akka.Actor.DateTimeOffsetNowTimeProvider Instance { get; } public System.TimeSpan MonotonicClock { get; } @@ -933,7 +932,6 @@ namespace Akka.Actor public sealed class HashedWheelTimerScheduler : Akka.Actor.SchedulerBase, Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider, System.IDisposable { public HashedWheelTimerScheduler(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { } - protected override System.DateTime DateTimeNow { get; } public override System.TimeSpan HighResMonotonicClock { get; } public override System.TimeSpan MonotonicClock { get; } protected override System.DateTimeOffset TimeNow { get; } @@ -1174,7 +1172,6 @@ namespace Akka.Actor } public interface ITimeProvider { - System.DateTime DateTimeNow { get; } System.TimeSpan HighResMonotonicClock { get; } System.TimeSpan MonotonicClock { get; } System.DateTimeOffset Now { get; } @@ -1625,7 +1622,6 @@ namespace Akka.Actor protected readonly Akka.Event.ILoggingAdapter Log; protected readonly Akka.Configuration.Config SchedulerConfig; protected SchedulerBase(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { } - protected abstract System.DateTime DateTimeNow { get; } public abstract System.TimeSpan HighResMonotonicClock { get; } public abstract System.TimeSpan MonotonicClock { get; } protected abstract System.DateTimeOffset TimeNow { get; } diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt index c9b83f24a7d..eccf3f67d9b 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt @@ -592,7 +592,6 @@ namespace Akka.Actor [System.ObsoleteAttribute("This class will be removed in Akka.NET v1.6.0 - use the IScheduler instead.")] public class DateTimeOffsetNowTimeProvider : Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider { - public System.DateTime DateTimeNow { get; } public System.TimeSpan HighResMonotonicClock { get; } public static Akka.Actor.DateTimeOffsetNowTimeProvider Instance { get; } public System.TimeSpan MonotonicClock { get; } @@ -931,7 +930,6 @@ namespace Akka.Actor public sealed class HashedWheelTimerScheduler : Akka.Actor.SchedulerBase, Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider, System.IDisposable { public HashedWheelTimerScheduler(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { } - protected override System.DateTime DateTimeNow { get; } public override System.TimeSpan HighResMonotonicClock { get; } public override System.TimeSpan MonotonicClock { get; } protected override System.DateTimeOffset TimeNow { get; } @@ -1172,7 +1170,6 @@ namespace Akka.Actor } public interface ITimeProvider { - System.DateTime DateTimeNow { get; } System.TimeSpan HighResMonotonicClock { get; } System.TimeSpan MonotonicClock { get; } System.DateTimeOffset Now { get; } @@ -1623,7 +1620,6 @@ namespace Akka.Actor protected readonly Akka.Event.ILoggingAdapter Log; protected readonly Akka.Configuration.Config SchedulerConfig; protected SchedulerBase(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { } - protected abstract System.DateTime DateTimeNow { get; } public abstract System.TimeSpan HighResMonotonicClock { get; } public abstract System.TimeSpan MonotonicClock { get; } protected abstract System.DateTimeOffset TimeNow { get; } diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt index 31de4931eff..55cff536c32 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt @@ -577,7 +577,6 @@ namespace Akka.TestKit { public TestScheduler(Akka.Configuration.Config schedulerConfig, Akka.Event.ILoggingAdapter log) { } public Akka.Actor.IAdvancedScheduler Advanced { get; } - public System.DateTime DateTimeNow { get; } public System.TimeSpan HighResMonotonicClock { get; } public System.TimeSpan MonotonicClock { get; } public System.DateTimeOffset Now { get; } diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt index 43d0479d33c..681fff75319 100644 --- a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt +++ b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt @@ -577,7 +577,6 @@ namespace Akka.TestKit { public TestScheduler(Akka.Configuration.Config schedulerConfig, Akka.Event.ILoggingAdapter log) { } public Akka.Actor.IAdvancedScheduler Advanced { get; } - public System.DateTime DateTimeNow { get; } public System.TimeSpan HighResMonotonicClock { get; } public System.TimeSpan MonotonicClock { get; } public System.DateTimeOffset Now { get; } diff --git a/src/core/Akka.Persistence/Eventsourced.cs b/src/core/Akka.Persistence/Eventsourced.cs index 04683204439..4d34a40745e 100644 --- a/src/core/Akka.Persistence/Eventsourced.cs +++ b/src/core/Akka.Persistence/Eventsourced.cs @@ -218,7 +218,7 @@ public void LoadSnapshot(string persistenceId, SnapshotSelectionCriteria criteri /// TBD public void SaveSnapshot(object snapshot) { - SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(SnapshotterId, SnapshotSequenceNr, Context.System.Scheduler.DateTimeNow), snapshot)); + SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(SnapshotterId, SnapshotSequenceNr, Context.System.Scheduler.Now.Date), snapshot)); } /// diff --git a/src/core/Akka.TestKit/TestScheduler.cs b/src/core/Akka.TestKit/TestScheduler.cs index 73d64b5e51c..43e39765176 100644 --- a/src/core/Akka.TestKit/TestScheduler.cs +++ b/src/core/Akka.TestKit/TestScheduler.cs @@ -212,10 +212,6 @@ public void ScheduleRepeatedly(TimeSpan initialDelay, TimeSpan interval, Action /// /// TBD /// - public DateTime DateTimeNow { get { return DateTime.SpecifyKind(_now.DateTime, DateTimeKind.Utc); } } - /// - /// TBD - /// public TimeSpan MonotonicClock { get { return Util.MonotonicClock.Elapsed; } } /// /// TBD diff --git a/src/core/Akka.Tests/Actor/ActorSystemSpec.cs b/src/core/Akka.Tests/Actor/ActorSystemSpec.cs index 658c913c3b1..d6b02a7d71f 100644 --- a/src/core/Akka.Tests/Actor/ActorSystemSpec.cs +++ b/src/core/Akka.Tests/Actor/ActorSystemSpec.cs @@ -452,7 +452,6 @@ public void ScheduleTellRepeatedly(TimeSpan initialDelay, TimeSpan interval, ICa } public DateTimeOffset Now { get; private set; } - public DateTime DateTimeNow { get; private set; } public TimeSpan MonotonicClock { get; private set; } public TimeSpan HighResMonotonicClock { get; private set; } public IAdvancedScheduler Advanced { get; private set; } diff --git a/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs b/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs index 929fcb5c939..bf613c85095 100644 --- a/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs +++ b/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs @@ -36,7 +36,6 @@ private class ShutdownScheduler : SchedulerBase, IDisposable protected override DateTimeOffset TimeNow { get; } - protected override DateTime DateTimeNow { get; } public override TimeSpan MonotonicClock { get; } public override TimeSpan HighResMonotonicClock { get; } diff --git a/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs b/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs index 2ed4ef2f36d..d8784095c64 100644 --- a/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs +++ b/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs @@ -19,8 +19,6 @@ private DateTimeOffsetNowTimeProvider() { } public DateTimeOffset Now { get { return DateTimeOffset.UtcNow; } } - public DateTime DateTimeNow => DateTime.UtcNow; - public TimeSpan MonotonicClock {get { return Util.MonotonicClock.Elapsed; }} public TimeSpan HighResMonotonicClock{get { return Util.MonotonicClock.ElapsedHighRes; }} diff --git a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs index ce346ff52c4..78429b41754 100644 --- a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs +++ b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs @@ -396,11 +396,6 @@ private void PlaceInBucket(SchedulerRegistration reg) /// protected override DateTimeOffset TimeNow => DateTimeOffset.UtcNow; - /// - /// TBD - /// - protected override DateTime DateTimeNow => DateTime.UtcNow; - /// /// TBD /// diff --git a/src/core/Akka/Actor/Scheduler/ITimeProvider.cs b/src/core/Akka/Actor/Scheduler/ITimeProvider.cs index a889ddab8e0..6f8f30a5adf 100644 --- a/src/core/Akka/Actor/Scheduler/ITimeProvider.cs +++ b/src/core/Akka/Actor/Scheduler/ITimeProvider.cs @@ -20,14 +20,10 @@ namespace Akka.Actor public interface ITimeProvider { /// - /// Gets the scheduler's notion of current time in . + /// Gets the scheduler's notion of current time. /// DateTimeOffset Now { get; } /// - /// Gets the scheduler's notion of current time in . - /// - DateTime DateTimeNow { get; } - /// /// TBD /// TimeSpan MonotonicClock { get; } diff --git a/src/core/Akka/Actor/Scheduler/SchedulerBase.cs b/src/core/Akka/Actor/Scheduler/SchedulerBase.cs index 7e11197ec01..c5416e16535 100644 --- a/src/core/Akka/Actor/Scheduler/SchedulerBase.cs +++ b/src/core/Akka/Actor/Scheduler/SchedulerBase.cs @@ -97,18 +97,11 @@ void IActionScheduler.ScheduleRepeatedly(TimeSpan initialDelay, TimeSpan interva IAdvancedScheduler IScheduler.Advanced { get { return this; } } DateTimeOffset ITimeProvider.Now { get { return TimeNow; } } - DateTime ITimeProvider.DateTimeNow => DateTime.SpecifyKind(TimeNow.DateTime, DateTimeKind.Utc); - /// - /// The current time in UTC. + /// The current time in UTC. /// protected abstract DateTimeOffset TimeNow { get; } - /// - /// The current time in UTC. - /// - protected abstract DateTime DateTimeNow { get; } - /// /// The current time since startup, as determined by the monotonic clock implementation. ///