## Summary

Refactors `misk.time.FakeClock` to have the exact same implementation as
`wisp.time.FakeClock` instead of relying on delegation, and fixes module
bindings to remove wisp dependency.

### Key Changes

- **Refactored `misk.time.FakeClock`**: Replaced delegation to
`wisp.time.FakeClock` with direct implementation identical to wisp's
version
- **Updated `FakeClockModule`**: Removed binding to
`wisp.time.FakeClock` and uses singleton instance binding pattern
- **Maintained `@JvmOverloads`**: Preserved Java interoperability while
avoiding Guice injection conflicts
- **Deprecated `wisp.time.FakeClock`**: Added deprecation notice
directing users to use `misk.time.FakeClock`
- **Updated API declarations**: Ran `apiDump` to reflect the new public
interface

### Technical Details

The solution uses a singleton instance binding pattern in
`FakeClockModule`:
```kotlin
val fakeClock = FakeClock()
bind<Clock>().toInstance(fakeClock)
multibind<TestFixture>().toInstance(fakeClock)
```

This approach:
- Eliminates the `@Inject` + `@JvmOverloads` conflict that was causing
Guice failures
- Maintains Java interoperability with constructor overloads
- Creates a single shared instance for both `Clock` and `TestFixture`
bindings
- Removes dependency on wisp implementation

GitOrigin-RevId: 3eedbc67b516d9cd49a9e42ecfe5341a23edd28a

Author: eugene-deng

misk-testing/api/misk-testing.api

@@ -268,12 +268,30 @@ public final class misk/testing/TemporaryFolderModule$DeleteTempFolder : org/jun
 	public fun afterEach (Lorg/junit/jupiter/api/extension/ExtensionContext;)V
 }
 
-public final class misk/time/FakeClock : wisp/time/FakeClock {
+public class misk/time/FakeClock : java/time/Clock, misk/testing/TestFixture {
+	public static final field Companion Lmisk/time/FakeClock$Companion;
 	public fun <init> ()V
+	public fun <init> (J)V
+	public fun <init> (JLjava/time/ZoneId;)V
+	public synthetic fun <init> (JLjava/time/ZoneId;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun add (JLjava/util/concurrent/TimeUnit;)J
+	public final fun add (Ljava/time/Duration;)J
+	public final fun add (Ljava/time/Period;)J
+	public fun getZone ()Ljava/time/ZoneId;
+	public fun instant ()Ljava/time/Instant;
+	public fun reset ()V
+	public final fun setNow (Ljava/time/Instant;)V
+	public fun withZone (Ljava/time/ZoneId;)Ljava/time/Clock;
+}
+
+public final class misk/time/FakeClock$Companion {
 }
 
 public final class misk/time/FakeClockModule : misk/inject/KInstallOnceModule {
 	public fun <init> ()V
+	public final fun provideClock (Lmisk/time/FakeClock;)Ljava/time/Clock;
+	public final fun provideFakeClock ()Lmisk/time/FakeClock;
+	public final fun provideTestFixture (Lmisk/time/FakeClock;)Lmisk/testing/TestFixture;
 }
 
 public final class misk/time/FakeTickerModule : misk/inject/KAbstractModule {

misk-testing/build.gradle.kts

@@ -19,7 +19,6 @@ dependencies {
   api(libs.okHttp)
   api(libs.openTracingMock)
   api(libs.servletApi)
-  api(project(":wisp:wisp-time-testing"))
   api(project(":misk"))
   api(project(":misk-actions"))
   api(project(":misk-api"))

misk-testing/src/main/kotlin/misk/time/FakeClock.kt

@@ -1,7 +1,51 @@
 package misk.time
 
-import jakarta.inject.Inject
-import jakarta.inject.Singleton
+import java.time.Clock
+import java.time.Duration
+import java.time.Instant
+import java.time.Period
+import java.time.ZoneId
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicLong
+import misk.testing.TestFixture
 
-@Singleton
-class FakeClock @Inject constructor() : wisp.time.FakeClock()
+open class FakeClock @JvmOverloads constructor(
+    epochMillis: Long = initialValue.toEpochMilli(),
+    private val zone: ZoneId = ZoneId.of("UTC")
+) : Clock(), TestFixture {
+    
+    private val millis: AtomicLong = AtomicLong(epochMillis)
+
+    override fun getZone(): ZoneId = zone
+
+    override fun withZone(zone: ZoneId): Clock = FakeClock(millis.get(), zone)
+
+    override fun instant(): Instant = Instant.ofEpochMilli(millis.get()).atZone(zone).toInstant()
+
+    /** Advance the clock by specified [Duration]. */
+    fun add(d: Duration) = millis.addAndGet(d.toMillis())
+
+    /**
+     * Advance the clock by the specified [Period].
+     * Note that unlike adding a [Duration] the exact amount that is added to the clock will depend on
+     * its current time and timezone. Not all days, months or years have the same length. See the
+     * documentation for [Period].
+     */
+    fun add(p: Period) = millis.updateAndGet { millis ->
+        Instant.ofEpochMilli(millis).atZone(zone).plus(p).toInstant().toEpochMilli()
+    }
+
+    /** Advance the clock by specified amount `n` of [TimeUnit]. */
+    fun add(n: Long, unit: TimeUnit) = millis.addAndGet(TimeUnit.MILLISECONDS.convert(n, unit))
+
+    /** Set the clock to the specified [Instant]. */
+    fun setNow(instant: Instant) = millis.set(instant.toEpochMilli())
+
+    override fun reset() {
+      setNow(initialValue)
+    }
+
+    companion object {
+        private val initialValue = Instant.parse("2018-01-01T00:00:00Z")
+    }
+}

misk-testing/src/main/kotlin/misk/time/FakeClockModule.kt

@@ -1,14 +1,19 @@
 package misk.time
 
+import com.google.inject.Provides
+import com.google.inject.multibindings.ProvidesIntoSet
+import jakarta.inject.Singleton
 import misk.inject.KInstallOnceModule
 import misk.testing.TestFixture
 import java.time.Clock
-import wisp.time.FakeClock as WispFakeClock
 
 class FakeClockModule : KInstallOnceModule() {
-  override fun configure() {
-    bind<Clock>().to<FakeClock>()
-    bind<WispFakeClock>().to<FakeClock>()
-    multibind<TestFixture>().to<FakeClock>()
-  }
+  @Provides @Singleton
+  fun provideFakeClock(): FakeClock = FakeClock()
+  
+  @Provides 
+  fun provideClock(fakeClock: FakeClock): Clock = fakeClock
+  
+  @ProvidesIntoSet
+  fun provideTestFixture(fakeClock: FakeClock): TestFixture = fakeClock
 }

misk-testing/src/test/kotlin/misk/concurrent/FakeScheduledExecutorServiceTest.kt

@@ -2,7 +2,7 @@ package misk.concurrent
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import wisp.time.FakeClock
+import misk.time.FakeClock
 import java.time.Duration
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit

misk-testing/src/test/kotlin/misk/concurrent/FakeSleeperTest.kt

@@ -2,7 +2,7 @@ package misk.concurrent
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import wisp.time.FakeClock
+import misk.time.FakeClock
 import java.time.Duration
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit

wisp/wisp-time-testing/src/main/kotlin/wisp/time/FakeClock.kt

@@ -10,6 +10,13 @@ import java.util.concurrent.atomic.AtomicLong
 import misk.testing.TestFixture
 
 /** Controllable clock for testing. */
+@Deprecated(
+  message = "Duplicate implementations in Wisp are being migrated to the unified type in Misk.",
+  replaceWith = ReplaceWith(
+    expression = "FakeClock()",
+    imports = ["misk.time.FakeClock"]
+  )
+)
 open class FakeClock @JvmOverloads constructor(
     epochMillis: Long = initialValue.toEpochMilli(),
     private val zone: ZoneId = ZoneId.of("UTC")