#39 Deprecate TimeProvider to use Clock instead

plume-scheduler/src/main/java/com/coreoz/plume/scheduler/PlumeTimeProvider.java

@@ -2,17 +2,19 @@
 
 import com.coreoz.wisp.time.TimeProvider;
 
+import java.time.Clock;
+
 class PlumeTimeProvider implements TimeProvider {
 
-	private final com.coreoz.plume.services.time.TimeProvider plumeTimeProvider;
+	private final Clock clock;
 
-	public PlumeTimeProvider(com.coreoz.plume.services.time.TimeProvider plumeTimeProvider) {
-		this.plumeTimeProvider = plumeTimeProvider;
+	public PlumeTimeProvider(Clock clock) {
+		this.clock = clock;
 	}
 
 	@Override
 	public long currentTime() {
-		return plumeTimeProvider.currentTime();
+		return clock.millis();
 	}
 
 }

plume-scheduler/src/main/java/com/coreoz/plume/scheduler/SchedulerProvider.java

@@ -1,24 +1,24 @@
 package com.coreoz.plume.scheduler;
 
+import com.coreoz.wisp.Scheduler;
+import com.coreoz.wisp.SchedulerConfig;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.inject.Singleton;
 
-import com.coreoz.plume.services.time.TimeProvider;
-import com.coreoz.wisp.Scheduler;
-import com.coreoz.wisp.SchedulerConfig;
+import java.time.Clock;
 
 @Singleton
 public class SchedulerProvider implements Provider<Scheduler> {
 
 	private final Scheduler scheduler;
 
 	@Inject
-	public SchedulerProvider(TimeProvider timeProvider) {
+	public SchedulerProvider(Clock clock) {
 		this.scheduler = new Scheduler(
 			SchedulerConfig
 				.builder()
-				.timeProvider(new PlumeTimeProvider(timeProvider))
+				.timeProvider(new PlumeTimeProvider(clock))
 				.build()
 		);
 	}

plume-services/src/main/java/com/coreoz/plume/guice/GuiceServicesModule.java

@@ -1,13 +1,17 @@
 package com.coreoz.plume.guice;
 
+import com.coreoz.plume.services.time.ClockProvider;
 import com.coreoz.plume.services.time.SystemTimeProvider;
 import com.coreoz.plume.services.time.TimeProvider;
 import com.google.inject.AbstractModule;
 
+import java.time.Clock;
+
 public class GuiceServicesModule extends AbstractModule {
 
 	@Override
 	protected void configure() {
+		bind(Clock.class).toProvider(ClockProvider.class);
 		bind(TimeProvider.class).to(SystemTimeProvider.class);
 	}
 

plume-services/src/main/java/com/coreoz/plume/services/time/ClockProvider.java

@@ -0,0 +1,22 @@
+package com.coreoz.plume.services.time;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+
+import java.time.Clock;
+
+@Singleton
+public class ClockProvider implements Provider<Clock> {
+    private final Clock clock;
+
+    @Inject
+    public ClockProvider() {
+        this.clock = Clock.systemDefaultZone();
+    }
+
+    @Override
+    public Clock get() {
+        return clock;
+    }
+}

plume-services/src/main/java/com/coreoz/plume/services/time/SystemTimeProvider.java

@@ -5,14 +5,18 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
+/**
+ * @deprecated {@link Clock} should be used instead
+ */
+@Deprecated
 @Singleton
 public class SystemTimeProvider implements TimeProvider {
 
 	private final Clock clock;
 
 	@Inject
-	public SystemTimeProvider() {
-		this.clock = Clock.systemDefaultZone();
+	public SystemTimeProvider(Clock clock) {
+		this.clock = clock;
 	}
 
 	@Override

plume-services/src/main/java/com/coreoz/plume/services/time/TimeProvider.java

@@ -5,6 +5,10 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+/**
+ * @deprecated {@link Clock} should be used instead
+ */
+@Deprecated
 public interface TimeProvider {
 
 	Clock clock();