Bug 1859017 - Use extension functions instead of deprecated constructors/methods.

Author: mcarare

android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchUnitTestCases.kt

@@ -14,7 +14,7 @@ import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.whenever
 import mozilla.components.tooling.fetch.tests.FetchTestCases
-import okhttp3.Headers
+import okhttp3.Headers.Companion.toHeaders
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.junit.Assert.assertEquals
@@ -297,7 +297,7 @@ class GeckoViewFetchUnitTestCases : FetchTestCases() {
         whenever(request.method).thenReturn(method)
 
         headerMap?.let {
-            whenever(request.headers).thenReturn(Headers.of(headerMap))
+            whenever(request.headers).thenReturn(headerMap.toHeaders())
             whenever(request.getHeader(any())).thenAnswer { inv -> it[inv.getArgument(0)] }
         }
 

android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/BrowserIconsTest.kt

@@ -24,7 +24,8 @@ import mozilla.components.support.test.rule.MainCoroutineRule
 import mozilla.components.support.test.rule.runTestOnMain
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
-import okio.Okio
+import okio.buffer
+import okio.source
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -79,7 +80,7 @@ class BrowserIconsTest {
         server.enqueue(
             MockResponse().setBody(
 
-                Okio.buffer(Okio.source(javaClass.getResourceAsStream("/png/mozac.png")!!)).buffer,
+                javaClass.getResourceAsStream("/png/mozac.png")!!.source().buffer().buffer,
             ),
         )
 
@@ -131,7 +132,7 @@ class BrowserIconsTest {
 
         server.enqueue(
             MockResponse().setBody(
-                Okio.buffer(Okio.source(javaClass.getResourceAsStream("/png/mozac.png")!!)).buffer,
+                javaClass.getResourceAsStream("/png/mozac.png")!!.source().buffer().buffer,
             ),
         )
 
@@ -174,7 +175,7 @@ class BrowserIconsTest {
 
         server.enqueue(
             MockResponse().setBody(
-                Okio.buffer(Okio.source(javaClass.getResourceAsStream("/png/mozac.png")!!)).buffer,
+                javaClass.getResourceAsStream("/png/mozac.png")!!.source().buffer().buffer,
             ),
         )
 

android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/loader/HttpIconLoaderTest.kt

@@ -81,7 +81,7 @@ class HttpIconLoaderTest {
                 assertEquals("GET", request.method)
 
                 val headers = request.headers
-                for (i in 0 until headers.size()) {
+                for (i in 0 until headers.size) {
                     println(headers.name(i) + ": " + headers.value(i))
                 }
             } finally {

android-components/components/lib/fetch-okhttp/src/main/java/mozilla/components/lib/fetch/okhttp/OkHttpClient.kt

@@ -18,7 +18,7 @@ import okhttp3.Cache
 import okhttp3.CacheControl
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.net.CookieHandler
 import java.net.CookieManager
 
@@ -104,20 +104,20 @@ private fun OkHttpClient.rebuildFor(request: Request, context: Context?): OkHttp
 }
 
 private fun okhttp3.Response.toResponse(): Response {
-    val body = body()
-    val headers = translateHeaders(headers())
+    val body = body
+    val headers = translateHeaders(headers)
 
     return Response(
-        url = request().url().toString(),
+        url = request.url.toString(),
         headers = headers,
-        status = code(),
+        status = code,
         body = if (body != null) Response.Body(body.byteStream(), headers["Content-Type"]) else Response.Body.empty(),
     )
 }
 
 private fun createRequestBuilderWithBody(request: Request): RequestBuilder {
-    val requestBody = request.body?.let { body ->
-        RequestBody.create(null, body.useStream { it.readBytes() })
+    val requestBody = request.body?.useStream { it.readBytes() }?.let {
+        it.toRequestBody(null, 0, it.size)
     }
 
     return RequestBuilder()
@@ -141,7 +141,7 @@ private fun RequestBuilder.addHeadersFrom(request: Request, defaultHeaders: Head
 private fun translateHeaders(actualHeaders: okhttp3.Headers): Headers {
     val headers = MutableHeaders()
 
-    for (i in 0 until actualHeaders.size()) {
+    for (i in 0 until actualHeaders.size) {
         headers.append(actualHeaders.name(i), actualHeaders.value(i))
     }
 

android-components/components/tooling/fetch-tests/src/main/java/mozilla/components/tooling/fetch/tests/FetchTestCases.kt

@@ -15,7 +15,7 @@ import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okio.Buffer
 import okio.GzipSink
-import okio.Okio
+import okio.buffer
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -92,7 +92,7 @@ abstract class FetchTestCases {
 
             val request = takeRequest()
 
-            assertTrue(request.headers.size() >= 5)
+            assertTrue(request.headers.size >= 5)
 
             val names = request.headers.names()
             assertTrue(names.contains("Accept"))
@@ -359,7 +359,7 @@ abstract class FetchTestCases {
 
             val request = takeRequest()
 
-            for (i in 0 until request.headers.size()) {
+            for (i in 0 until request.headers.size) {
                 println(" Header: " + request.headers.name(i) + " = " + request.headers.value(i))
             }
 
@@ -516,7 +516,7 @@ abstract class FetchTestCases {
 @Throws(IOException::class)
 private fun gzip(data: String): Buffer {
     val result = Buffer()
-    val sink = Okio.buffer(GzipSink(result))
+    val sink = GzipSink(result).buffer()
     sink.writeUtf8(data)
     sink.close()
     return result