From 0412d826d0e1b18d88a8c7db256a5a10067faa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sikora?= Date: Wed, 3 Feb 2021 18:10:01 +0100 Subject: [PATCH 1/3] Inline variable --- .../chuckerteam/chucker/internal/support/RequestProcessor.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt index e5904d473..9c87ce0c8 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt @@ -36,8 +36,7 @@ internal class RequestProcessor( private fun processBody(request: Request, transaction: HttpTransaction) { val body = request.body ?: return - val isEncodingSupported = request.headers.hasSupportedContentEncoding - if (!isEncodingSupported) { + if (!request.headers.hasSupportedContentEncoding) { return } From 627a40d1941dc81e45d3da80bea8aaf9229617d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sikora?= Date: Wed, 3 Feb 2021 18:19:23 +0100 Subject: [PATCH 2/3] Simplify processing request body --- .../chuckerteam/chucker/internal/support/RequestProcessor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt index 9c87ce0c8..eb5536647 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt @@ -40,12 +40,13 @@ internal class RequestProcessor( return } - val limitingSource = try { + val requestSource = try { Buffer().apply { body.writeTo(this) } } catch (e: IOException) { Logger.error("Failed to read request payload", e) return - }.uncompress(request.headers).let { LimitingSource(it, maxContentLength) } + } + val limitingSource = LimitingSource(requestSource.uncompress(request.headers), maxContentLength) val contentBuffer = Buffer().apply { limitingSource.use { writeAll(it) } } if (!contentBuffer.isProbablyPlainText) { From e0881d5968a46d63a447ae5462e57af9afc34941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sikora?= Date: Wed, 3 Feb 2021 18:20:04 +0100 Subject: [PATCH 3/3] Remove return type from request processor --- .../java/com/chuckerteam/chucker/api/ChuckerInterceptor.kt | 4 +++- .../chuckerteam/chucker/internal/support/RequestProcessor.kt | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/api/ChuckerInterceptor.kt b/library/src/main/java/com/chuckerteam/chucker/api/ChuckerInterceptor.kt index bb5b7f19b..39193f3c4 100755 --- a/library/src/main/java/com/chuckerteam/chucker/api/ChuckerInterceptor.kt +++ b/library/src/main/java/com/chuckerteam/chucker/api/ChuckerInterceptor.kt @@ -62,7 +62,9 @@ public class ChuckerInterceptor private constructor( @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val transaction = HttpTransaction() - val request = requestProcessor.process(chain.request(), transaction) + val request = chain.request() + + requestProcessor.process(request, transaction) val response = try { chain.proceed(request) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt index eb5536647..32bce334f 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/support/RequestProcessor.kt @@ -14,11 +14,10 @@ internal class RequestProcessor( private val collector: ChuckerCollector, private val maxContentLength: Long, ) { - fun process(request: Request, transaction: HttpTransaction): Request { + fun process(request: Request, transaction: HttpTransaction) { processMetadata(request, transaction) processBody(request, transaction) collector.onRequestSent(transaction) - return request } private fun processMetadata(request: Request, transaction: HttpTransaction) {