Add a cacheUrlOverride

Author: yschimke

okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsOverHttps.kt

@@ -186,9 +186,7 @@ class DnsOverHttps internal constructor(
     throw unknownHostException
   }
 
-  private fun getCacheOnlyResponse(
-    request: Request,
-  ): Response? {
+  private fun getCacheOnlyResponse(request: Request): Response? {
     if (client.cache != null) {
       try {
         // Use the cache without hitting the network first
@@ -200,10 +198,11 @@ class DnsOverHttps internal constructor(
 
         var cacheUrl = request.url
 
-        val cacheRequest = request.newBuilder()
-          .cacheControl(onlyIfCached)
-          .cacheUrlOverride(cacheUrl)
-          .build()
+        val cacheRequest =
+          request.newBuilder()
+            .cacheControl(onlyIfCached)
+            .cacheUrlOverride(cacheUrl)
+            .build()
 
         val cacheResponse = client.newCall(cacheRequest).execute()
 
@@ -258,7 +257,7 @@ class DnsOverHttps internal constructor(
         url(url)
           .cacheUrlOverride(
             url.newBuilder()
-              .addQueryParameter("hostname", hostname).build()
+              .addQueryParameter("hostname", hostname).build(),
           )
           .post(query.toRequestBody(DNS_MESSAGE))
       } else {
@@ -326,8 +325,7 @@ class DnsOverHttps internal constructor(
         this.bootstrapDnsHosts = bootstrapDnsHosts
       }
 
-    fun bootstrapDnsHosts(vararg bootstrapDnsHosts: InetAddress): Builder =
-      bootstrapDnsHosts(bootstrapDnsHosts.toList())
+    fun bootstrapDnsHosts(vararg bootstrapDnsHosts: InetAddress): Builder = bootstrapDnsHosts(bootstrapDnsHosts.toList())
 
     fun systemDns(systemDns: Dns) =
       apply {

okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsTest.kt

@@ -32,12 +32,9 @@ import java.util.concurrent.TimeUnit
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import okhttp3.Cache
-import okhttp3.Call
 import okhttp3.Dns
-import okhttp3.EventListener
 import okhttp3.OkHttpClient
 import okhttp3.Protocol
-import okhttp3.Response
 import okhttp3.testing.PlatformRule
 import okio.Buffer
 import okio.ByteString.Companion.decodeHex
@@ -59,27 +56,6 @@ class DnsOverHttpsTest {
   private val bootstrapClient =
     OkHttpClient.Builder()
       .protocols(listOf(Protocol.HTTP_2, Protocol.HTTP_1_1))
-      .eventListener(object : EventListener() {
-        override fun callStart(call: Call) {
-          println("callStart " + call.request().url + " " + call.request().cacheUrlOverride)
-        }
-
-        override fun satisfactionFailure(call: Call, response: Response) {
-          println("satisfactionFailure " + call.request().url)
-        }
-
-        override fun cacheHit(call: Call, response: Response) {
-          println("cacheHit " + call.request().url)
-        }
-
-        override fun cacheMiss(call: Call) {
-          println("cacheMiss " + call.request().url)
-        }
-
-        override fun cacheConditionalHit(call: Call, cachedResponse: Response) {
-          println("cacheConditionalHit " + call.request().url)
-        }
-      })
       .build()
 
   @BeforeEach
@@ -343,7 +319,7 @@ class DnsOverHttpsTest {
   private fun buildLocalhost(
     bootstrapClient: OkHttpClient,
     includeIPv6: Boolean,
-    post: Boolean = false
+    post: Boolean = false,
   ): DnsOverHttps {
     val url = server.url("/lookup?ct")
     return DnsOverHttps.Builder().client(bootstrapClient)

okhttp/src/main/kotlin/okhttp3/Request.kt

@@ -327,7 +327,8 @@ class Request internal constructor(builder: Builder) {
      *
      * If set, this will also allow caching for POST requests.
      */
-    fun cacheUrlOverride(cacheUrlOverride: HttpUrl?) = apply {
+    fun cacheUrlOverride(cacheUrlOverride: HttpUrl?) =
+      apply {
         this.cacheUrlOverride = cacheUrlOverride
       }