android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-27 18:21:14 +03:00
Code Releases Activity

Beef up Request's toString

Browse Source 
Previously it unconditionally showed tags even if empty and would not show headers.
This commit is contained in:
Jake Wharton
2019-05-24 21:57:46 -04:00
parent 31ec0c74cc
commit a0a3ef543c
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.java
View File

@@ -73,7 +73,7 @@ public final class LoggingEventListenerTest {
response.body().bytes(); response.body().bytes();
logRecorder logRecorder
.assertLogMatch("callStart: Request\\{method=GET, url=" + url + ", tags=\\{\\}\\}") .assertLogMatch("callStart: Request\\{method=GET, url=" + url + "\\}")
.assertLogMatch("dnsStart: " + url.host()) .assertLogMatch("dnsStart: " + url.host())
.assertLogMatch("dnsEnd: \\[.+\\]") .assertLogMatch("dnsEnd: \\[.+\\]")
.assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT") .assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT")
@@ -104,7 +104,7 @@ public final class LoggingEventListenerTest {
client.newCall(request().post(RequestBody.create("Hello!", PLAIN)).build()).execute(); client.newCall(request().post(RequestBody.create("Hello!", PLAIN)).build()).execute();
logRecorder logRecorder
.assertLogMatch("callStart: Request\\{method=POST, url=" + url + ", tags=\\{\\}\\}") .assertLogMatch("callStart: Request\\{method=POST, url=" + url + "\\}")
.assertLogMatch("dnsStart: " + url.host()) .assertLogMatch("dnsStart: " + url.host())
.assertLogMatch("dnsEnd: \\[.+\\]") .assertLogMatch("dnsEnd: \\[.+\\]")
.assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT") .assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT")
@@ -144,7 +144,7 @@ public final class LoggingEventListenerTest {
platform.assumeHttp2Support(); platform.assumeHttp2Support();
logRecorder logRecorder
.assertLogMatch("callStart: Request\\{method=GET, url=" + url + ", tags=\\{\\}\\}") .assertLogMatch("callStart: Request\\{method=GET, url=" + url + "\\}")
.assertLogMatch("dnsStart: " + url.host()) .assertLogMatch("dnsStart: " + url.host())
.assertLogMatch("dnsEnd: \\[.+\\]") .assertLogMatch("dnsEnd: \\[.+\\]")
.assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT") .assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT")
@@ -187,7 +187,7 @@ public final class LoggingEventListenerTest {
} }
logRecorder logRecorder
.assertLogMatch("callStart: Request\\{method=GET, url=" + url + ", tags=\\{\\}\\}") .assertLogMatch("callStart: Request\\{method=GET, url=" + url + "\\}")
.assertLogMatch("dnsStart: " + url.host()) .assertLogMatch("dnsStart: " + url.host())
.assertLogMatch("callFailed: java.net.UnknownHostException: reason") .assertLogMatch("callFailed: java.net.UnknownHostException: reason")
.assertNoMoreLogs(); .assertNoMoreLogs();
@@ -207,7 +207,7 @@ public final class LoggingEventListenerTest {
} }
logRecorder logRecorder
.assertLogMatch("callStart: Request\\{method=GET, url=" + url + ", tags=\\{\\}\\}") .assertLogMatch("callStart: Request\\{method=GET, url=" + url + "\\}")
.assertLogMatch("dnsStart: " + url.host()) .assertLogMatch("dnsStart: " + url.host())
.assertLogMatch("dnsEnd: \\[.+\\]") .assertLogMatch("dnsEnd: \\[.+\\]")
.assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT") .assertLogMatch("connectStart: " + url.host() + "/.+ DIRECT")

24
okhttp/src/main/java/okhttp3/Request.kt
View File

@@ -109,7 +109,29 @@ class Request internal constructor(
level = DeprecationLevel.WARNING) level = DeprecationLevel.WARNING)
fun cacheControl(): CacheControl = cacheControl fun cacheControl(): CacheControl = cacheControl
override fun toString(): String = "Request{method=$method, url=$url, tags=$tags}" override fun toString() = buildString {
append("Request{method=")
append(method)
append(", url=")
append(url)
if (headers.size != 0) {
append(", headers=[")
headers.forEachIndexed { index, (name, value) ->
if (index > 0) {
append(", ")
}
append(name)
append(':')
append(value)
}
append(']')
}
if (tags.isNotEmpty()) {
append(", tags=")
append(tags)
}
append('}')
}
open class Builder { open class Builder {
internal var url: HttpUrl? = null internal var url: HttpUrl? = null