Revert "Add QUERY method support (#8550)"

This reverts commit 35ac3f5a72.
This commit is contained in:
Yuri Schimke
2025-08-16 22:01:59 +01:00
committed by GitHub
parent 35ac3f5a72
commit 72e195e7b3
6 changed files with 3 additions and 95 deletions

View File

@@ -1040,7 +1040,6 @@ public class okhttp3/Request$Builder {
public fun patch (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun post (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun put (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun query (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun removeHeader (Ljava/lang/String;)Lokhttp3/Request$Builder;
public fun tag (Ljava/lang/Class;Ljava/lang/Object;)Lokhttp3/Request$Builder;
public fun tag (Ljava/lang/Object;)Lokhttp3/Request$Builder;

View File

@@ -1039,7 +1039,6 @@ public class okhttp3/Request$Builder {
public fun patch (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun post (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun put (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun query (Lokhttp3/RequestBody;)Lokhttp3/Request$Builder;
public fun removeHeader (Ljava/lang/String;)Lokhttp3/Request$Builder;
public fun tag (Ljava/lang/Class;Ljava/lang/Object;)Lokhttp3/Request$Builder;
public fun tag (Ljava/lang/Object;)Lokhttp3/Request$Builder;

View File

@@ -228,10 +228,9 @@ class Cache internal constructor(
return null
}
if (requestMethod != "GET" && requestMethod != "QUERY") {
// Don't cache non-GET and non-QUERY responses. We're technically allowed to cache HEAD
// requests and some POST requests, but the complexity of doing so is high and the benefit
// is low.
if (requestMethod != "GET") {
// Don't cache non-GET responses. We're technically allowed to cache HEAD requests and some
// POST requests, but the complexity of doing so is high and the benefit is low.
return null
}

View File

@@ -317,8 +317,6 @@ class Request internal constructor(
open fun patch(body: RequestBody): Builder = method("PATCH", body)
open fun query(body: RequestBody): Builder = method("QUERY", body)
open fun method(
method: String,
body: RequestBody?,

View File

@@ -173,7 +173,6 @@ class CacheTest {
private fun assertCached(
shouldWriteToCache: Boolean,
responseCode: Int,
method: String = "GET",
) {
var expectedResponseCode = responseCode
val server = MockWebServer()
@@ -217,7 +216,6 @@ class CacheTest {
Request
.Builder()
.url(server.url("/"))
.method(method, null)
.build()
val response = client.newCall(request).execute()
assertThat(response.code).isEqualTo(expectedResponseCode)
@@ -501,82 +499,6 @@ class CacheTest {
assertThat(recordedRequest3.exchangeIndex).isEqualTo(2)
}
@Test
fun getAndQueryRedirectToCachedResultIndependently() {
// GET responses
server.enqueue(
MockResponse
.Builder()
.addHeader("Cache-Control: max-age=60")
.body("ABC")
.build(),
)
server.enqueue(
MockResponse
.Builder()
.code(HttpURLConnection.HTTP_MOVED_PERM)
.addHeader("Location: /foo")
.build(),
)
// QUERY responses
server.enqueue(
MockResponse
.Builder()
.addHeader("Cache-Control: max-age=60")
.body("DEF")
.build(),
)
server.enqueue(
MockResponse
.Builder()
.code(HttpURLConnection.HTTP_MOVED_PERM)
.addHeader("Location: /baz")
.build(),
)
val request1 =
Request
.Builder()
.url(server.url("/foo"))
.get()
.build()
val response1 = client.newCall(request1).execute()
assertThat(response1.body.string()).isEqualTo("ABC")
val recordedRequest1 = server.takeRequest()
assertThat(recordedRequest1.requestLine).isEqualTo("GET /foo HTTP/1.1")
val request2 =
Request
.Builder()
.url(server.url("/bar"))
.get()
.build()
val response2 = client.newCall(request2).execute()
assertThat(response2.body.string()).isEqualTo("ABC")
val recordedRequest2 = server.takeRequest()
assertThat(recordedRequest2.requestLine).isEqualTo("GET /bar HTTP/1.1")
val request3 =
Request
.Builder()
.url(server.url("/baz"))
.query(RequestBody.EMPTY)
.build()
val response3 = client.newCall(request3).execute()
assertThat(response3.body.string()).isEqualTo("DEF")
val recordedRequest3 = server.takeRequest()
assertThat(recordedRequest3.requestLine).isEqualTo("QUERY /baz HTTP/1.1")
val request4 =
Request
.Builder()
.url(server.url("/bar"))
.query(RequestBody.EMPTY)
.build()
val response4 = client.newCall(request4).execute()
assertThat(response4.body.string()).isEqualTo("DEF")
val recordedRequest4 = server.takeRequest()
assertThat(recordedRequest4.requestLine).isEqualTo("QUERY /bar HTTP/1.1")
}
@Test
fun secureResponseCachingAndRedirects() {
server.useHttps(handshakeCertificates.sslSocketFactory())

View File

@@ -244,15 +244,6 @@ class RequestTest {
.build()
assertThat(patch.method).isEqualTo("PATCH")
assertThat(patch.body).isEqualTo(body)
val query =
Request
.Builder()
.url("http://localhost/api")
.query(body)
.build()
assertThat(query.method).isEqualTo("QUERY")
assertThat(query.body).isEqualTo(body)
}
@Test