Configures FakeTokenGenerator and FakeTokenGenerator2 to be

resettable

GitOrigin-RevId: b307974fb2c2f463fc29a7a37e58a46c4177ecbf

Author: tgregory-block

misk-core/api/misk-core.api

@@ -281,11 +281,13 @@ public final class misk/security/ssl/TrustStoreConfig {
 public final class misk/tokens/FakeTokenGenerator : misk/testing/FakeFixture, wisp/token/TokenGenerator {
 	public fun <init> ()V
 	public fun generate (Ljava/lang/String;I)Ljava/lang/String;
+	public fun reset ()V
 }
 
-public final class misk/tokens/FakeTokenGenerator2 : misk/tokens/TokenGenerator2 {
+public final class misk/tokens/FakeTokenGenerator2 : misk/testing/FakeFixture, misk/tokens/TokenGenerator2 {
 	public fun <init> ()V
 	public fun generate (Ljava/lang/String;I)Ljava/lang/String;
+	public fun reset ()V
 }
 
 public final class misk/tokens/FakeTokenGeneratorModule : misk/inject/KAbstractModule {

misk-core/build.gradle.kts

@@ -22,8 +22,8 @@ dependencies {
   api(project(":misk-testing-api"))
   implementation(libs.guice)
   implementation(libs.kotlinStdLibJdk8)
-  implementation(project(":wisp:wisp-resource-loader"))
   implementation(project(":wisp:wisp-token-testing"))
+  implementation(project(":wisp:wisp-resource-loader"))
 
   testImplementation(libs.assertj)
   testImplementation(libs.junitApi)

misk-core/src/main/kotlin/misk/tokens/FakeTokenGenerator.kt

@@ -5,13 +5,22 @@ import jakarta.inject.Singleton
 import misk.testing.FakeFixture
 
 @Singleton
-class FakeTokenGenerator @Inject constructor() : FakeFixture(), TokenGenerator by wisp.token.FakeTokenGenerator()
+class FakeTokenGenerator @Inject constructor() : FakeFixture(), TokenGenerator {
+  private val tokenGenerator = wisp.token.FakeTokenGenerator()
+
+  override fun reset() =
+    tokenGenerator.reset()
+
+  override fun generate(label: String?, length: Int) =
+    tokenGenerator.generate(label, length)
+}
 
 @Singleton
-class FakeTokenGenerator2 @Inject constructor() : TokenGenerator2 {
+class FakeTokenGenerator2 @Inject constructor() : FakeFixture(), TokenGenerator2 {
   private val tokenGenerator = wisp.token.FakeTokenGenerator()
 
-  override fun generate(label: String?, length: Int): String {
-    return tokenGenerator.generate(label, length)
-  }
+  override fun generate(label: String?, length: Int) =
+    tokenGenerator.generate(label, length)
+
+  override fun reset() = tokenGenerator.reset()
 }

misk-core/src/main/kotlin/misk/tokens/FakeTokenGeneratorModule.kt

@@ -7,7 +7,10 @@ class FakeTokenGeneratorModule : KAbstractModule() {
   override fun configure() {
     bind<TokenGenerator>().to<FakeTokenGenerator>()
     multibind<TestFixture>().to<FakeTokenGenerator>()
+
     multibind<TestFixture>().to<wisp.token.FakeTokenGenerator>()
+
     bind<TokenGenerator2>().to<FakeTokenGenerator2>()
+    multibind<TestFixture>().to<FakeTokenGenerator2>()
   }
 }