android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-08-01 16:06:56 +03:00
Code Releases Activity

Use idiomatic Kotlin in Request.kt (#5092)

Browse Source 
- define @get:JvmName(...) for the following vals in constructor instead of passing builder: Builder.
  - url: HttpUrl
  - method: String
  - headers: Headers
  - body: RequestBody?

- add @Deprecated(...) to the following functions.
  - fun url(): HttpUrl
  - fun method(): String
  - fun headers(): Headers
  - fun body(): RequestBody?
  - fun cacheControl(): CacheControl

- clean up code where ()(Parentheses) is unnecessarily used.
This commit is contained in:
monkey-mas
2019-05-22 15:55:00 -04:00
committed by Jesse Wilson
parent b21ed68c08
commit fa9118949e
23 changed files with 127 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
okhttp-logging-interceptor/src/main/java/okhttp3/logging/HttpLoggingInterceptor.kt
View File

@ -153,11 +153,11 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
val logBody = level == Level.BODY
val logHeaders = logBody || level == Level.HEADERS
val requestBody = request.body()
val requestBody = request.body
val connection = chain.connection()
var requestStartMessage =
("--> ${request.method()} ${request.url()}${if (connection != null) " " + connection.protocol() else ""}")
("--> ${request.method} ${request.url}${if (connection != null) " " + connection.protocol() else ""}")
if (!logHeaders && requestBody != null) {
requestStartMessage += " (${requestBody.contentLength()}-byte body)"
}
@ -175,7 +175,7 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
}
}
val headers = request.headers()
val headers = request.headers
var i = 0
val count = headers.size
while (i < count) {
@ -189,11 +189,11 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
}
if (!logBody || requestBody == null) {
logger.log("--> END ${request.method()}")
} else if (bodyHasUnknownEncoding(request.headers())) {
logger.log("--> END ${request.method()} (encoded body omitted)")
logger.log("--> END ${request.method}")
} else if (bodyHasUnknownEncoding(request.headers)) {
logger.log("--> END ${request.method} (encoded body omitted)")
} else if (requestBody.isDuplex()) {
logger.log("--> END ${request.method()} (duplex request body omitted)")
logger.log("--> END ${request.method} (duplex request body omitted)")
} else {
val buffer = Buffer()
requestBody.writeTo(buffer)
@ -204,10 +204,10 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
logger.log("")
if (buffer.isUtf8()) {
logger.log(buffer.readString(charset))
logger.log("--> END ${request.method()} (${requestBody.contentLength()}-byte body)")
logger.log("--> END ${request.method} (${requestBody.contentLength()}-byte body)")
} else {
logger.log(
"--> END ${request.method()} (binary ${requestBody.contentLength()}-byte body omitted)")
"--> END ${request.method} (binary ${requestBody.contentLength()}-byte body omitted)")
}
}
}
@ -227,7 +227,7 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
val contentLength = responseBody.contentLength()
val bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length"
logger.log(
"<-- ${response.code()}${if (response.message().isEmpty()) "" else ' ' + response.message()} ${response.request().url()} (${tookMs}ms${if (!logHeaders) ", $bodySize body" else ""})")
"<-- ${response.code()}${if (response.message().isEmpty()) "" else ' ' + response.message()} ${response.request().url} (${tookMs}ms${if (!logHeaders) ", $bodySize body" else ""})")
if (logHeaders) {
val headers = response.headers()