From 9e740ca033f37a3ce5b3614816862852c9a371ca Mon Sep 17 00:00:00 2001
From: Mehdi Mollaverdi <mmollaverdi@squareup.com>
Date: Tue, 4 Feb 2025 10:58:06 +1100
Subject: [PATCH] ReusableTestModule is no longer considered experimental

GitOrigin-RevId: c62e4691193531b30b1a4815a72cc58e0745f554
---
 misk-inject/build.gradle.kts                                    | 2 --
 .../src/test/kotlin/misk/inject/ReusableTestModuleTest.kt       | 2 --
 misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt   | 2 --
 misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt  | 2 --
 .../kotlin/misk/web/shutdown/GracefulShutdownInterceptor.kt     | 1 -
 .../main/kotlin/misk/web/shutdown/GracefulShutdownService.kt    | 1 -
 6 files changed, 10 deletions(-)

diff --git a/misk-inject/build.gradle.kts b/misk-inject/build.gradle.kts
index 339089347af..13f7032de60 100644
--- a/misk-inject/build.gradle.kts
+++ b/misk-inject/build.gradle.kts
@@ -13,8 +13,6 @@ dependencies {
   implementation(libs.kotlinReflect)
   implementation(libs.kotlinStdLibJdk8)
 
-  implementation(project(":misk-api"))
-
   testImplementation(libs.assertj)
   testImplementation(libs.junitApi)
   testImplementation(libs.kotlinTest)
diff --git a/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/ReusableTestModuleTest.kt b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/ReusableTestModuleTest.kt
index c242954c79a..771b8a03a2b 100644
--- a/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/ReusableTestModuleTest.kt
+++ b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/ReusableTestModuleTest.kt
@@ -1,11 +1,9 @@
 package misk.inject
 
-import misk.annotation.ExperimentalMiskApi
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Test
 
-@OptIn(ExperimentalMiskApi::class)
 class ReusableTestModuleTest {
 
   class NoArgTestModuleOne: ReusableTestModule()
diff --git a/misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt b/misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt
index 71e532f77c9..ff5c82bae98 100644
--- a/misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt
+++ b/misk-inject/src/main/kotlin/misk/inject/ReusableTestModule.kt
@@ -1,6 +1,5 @@
 package misk.inject
 
-import misk.annotation.ExperimentalMiskApi
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.jvm.isAccessible
@@ -9,7 +8,6 @@ import kotlin.reflect.jvm.isAccessible
  * This class should be extended by test modules used in tests,
  * for Misk to reuse the Guice injector across tests for significantly faster test suite performance.
  */
-@ExperimentalMiskApi
 abstract class ReusableTestModule: KAbstractModule() {
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
diff --git a/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt b/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt
index abc0130f305..656d7cfc841 100644
--- a/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt
+++ b/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt
@@ -7,7 +7,6 @@ import com.google.inject.Module
 import com.google.inject.testing.fieldbinder.BoundFieldModule
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
-import misk.annotation.ExperimentalMiskApi
 import misk.inject.KAbstractModule
 import misk.inject.ReusableTestModule
 import misk.inject.getInstance
@@ -206,7 +205,6 @@ private fun ExtensionContext.startService(): Boolean {
 // The injector is reused across tests if
 //   1. The tests module(s) used in the test extend ReusableTestModules, AND
 //   2. The environment variable MISK_TEST_REUSE_INJECTOR is set to true
-@OptIn(ExperimentalMiskApi::class)
 private fun ExtensionContext.reuseInjector(): Boolean {
   return getFromStoreOrCompute("reuseInjector") {
     (System.getenv("MISK_TEST_REUSE_INJECTOR")?.toBoolean() ?: false) &&
diff --git a/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownInterceptor.kt b/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownInterceptor.kt
index 356e4e31f87..9be630cc6b2 100644
--- a/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownInterceptor.kt
+++ b/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownInterceptor.kt
@@ -18,7 +18,6 @@ internal class GracefulShutdownInterceptorFactory @Inject constructor(
   @OptIn(ExperimentalMiskApi::class)
   private val rejectionStatusCode = webConfig.graceful_shutdown_config!!.rejection_status_code
 
-  @OptIn(ExperimentalMiskApi::class)
   private val interceptor = object : NetworkInterceptor {
     override fun intercept(chain: NetworkChain) {
       // Don't do anything for health checks.
diff --git a/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownService.kt b/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownService.kt
index 3da58fc9c0b..f33d004e47a 100644
--- a/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownService.kt
+++ b/misk/src/main/kotlin/misk/web/shutdown/GracefulShutdownService.kt
@@ -101,7 +101,6 @@ internal class GracefulShutdownService @Inject constructor(
     shuttingDown = false
   }
 
-  @OptIn(ExperimentalMiskApi::class)
   override fun shutDown() {
     shuttingDown = true