From 33b093a86c119dfb1254b60767ee804792fec59e Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jesse@swank.ca>
Date: Mon, 16 Jun 2025 18:36:18 -0400
Subject: [PATCH] Stabilize the JUnit 4 API (#8857)

Co-authored-by: Jesse Wilson <jwilson@squareup.com>
---
 .../api/mockwebserver3-junit4.api                 |  4 ----
 .../mockwebserver3/junit4/MockWebServerRule.kt    | 15 +--------------
 .../main/kotlin/mockwebserver3/MockWebServer.kt   |  5 ++---
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/mockwebserver-junit4/api/mockwebserver3-junit4.api b/mockwebserver-junit4/api/mockwebserver3-junit4.api
index b9d1cfa7e..13add8f42 100644
--- a/mockwebserver-junit4/api/mockwebserver3-junit4.api
+++ b/mockwebserver-junit4/api/mockwebserver3-junit4.api
@@ -1,9 +1,5 @@
 public final class mockwebserver3/junit4/MockWebServerRule : org/junit/rules/ExternalResource {
-	public static final field Companion Lmockwebserver3/junit4/MockWebServerRule$Companion;
 	public fun <init> ()V
 	public final fun getServer ()Lmockwebserver3/MockWebServer;
 }
 
-public final class mockwebserver3/junit4/MockWebServerRule$Companion {
-}
-
diff --git a/mockwebserver-junit4/src/main/kotlin/mockwebserver3/junit4/MockWebServerRule.kt b/mockwebserver-junit4/src/main/kotlin/mockwebserver3/junit4/MockWebServerRule.kt
index be364a1fe..9ccc1eada 100644
--- a/mockwebserver-junit4/src/main/kotlin/mockwebserver3/junit4/MockWebServerRule.kt
+++ b/mockwebserver-junit4/src/main/kotlin/mockwebserver3/junit4/MockWebServerRule.kt
@@ -16,10 +16,7 @@
 package mockwebserver3.junit4
 
 import java.io.IOException
-import java.util.logging.Level
-import java.util.logging.Logger
 import mockwebserver3.MockWebServer
-import okhttp3.ExperimentalOkHttpApi
 import org.junit.rules.ExternalResource
 
 /**
@@ -38,7 +35,6 @@ import org.junit.rules.ExternalResource
  * @JvmField @Rule val serverRule = MockWebServerRule()
  * ```
  */
-@ExperimentalOkHttpApi
 class MockWebServerRule : ExternalResource() {
   val server: MockWebServer = MockWebServer()
 
@@ -51,15 +47,6 @@ class MockWebServerRule : ExternalResource() {
   }
 
   override fun after() {
-    try {
-      server.close()
-    } catch (e: IOException) {
-      logger.log(Level.WARNING, "MockWebServer shutdown failed", e)
-    }
-  }
-
-  @ExperimentalOkHttpApi
-  companion object {
-    private val logger = Logger.getLogger(MockWebServerRule::class.java.name)
+    server.close()
   }
 }
diff --git a/mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt b/mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt
index 6695ba5ed..a0b0dd6cf 100644
--- a/mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt
+++ b/mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt
@@ -401,7 +401,6 @@ public class MockWebServer : Closeable {
     }
   }
 
-  @Throws(IOException::class)
   public override fun close() {
     if (closed) return
     closed = true
@@ -410,12 +409,12 @@ public class MockWebServer : Closeable {
     val serverSocket = this.serverSocket ?: return // If this is null, start() must have failed.
 
     // Cause acceptConnections() to break out.
-    serverSocket.close()
+    serverSocket.closeQuietly()
 
     // Await shutdown.
     for (queue in taskRunner.activeQueues()) {
       if (!queue.idleLatch().await(5, TimeUnit.SECONDS)) {
-        throw IOException("Gave up waiting for queue to shut down")
+        throw AssertionError("Gave up waiting for queue to shut down")
       }
     }
     taskRunnerBackend.shutdown()