Code cleanup and imports (#6822)

mockwebserver-deprecated/src/main/kotlin/okhttp3/mockwebserver/RecordedRequest.kt

@@ -88,7 +88,7 @@ class RecordedRequest {
     socket: Socket,
     failure: IOException? = null
   ) {
-    this.requestLine = requestLine;
+    this.requestLine = requestLine
     this.headers = headers
     this.chunkSizes = chunkSizes
     this.bodySize = bodySize

mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt

@@ -17,9 +17,7 @@ package mockwebserver3.junit4
 
 import java.net.ConnectException
 import java.util.concurrent.atomic.AtomicBoolean
-import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Assert
 import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.Description

mockwebserver/src/main/kotlin/mockwebserver3/MockWebServer.kt

@@ -909,11 +909,11 @@ class MockWebServer : Closeable {
   override fun close() = shutdown()
 
   /** A buffer wrapper that drops data after [bodyLimit] bytes. */
-  private class TruncatingBuffer internal constructor(
+  private class TruncatingBuffer(
     private var remainingByteCount: Long
   ) : Sink {
-    internal val buffer = Buffer()
+    val buffer = Buffer()
-    internal var receivedByteCount = 0L
+    var receivedByteCount = 0L
 
     @Throws(IOException::class)
     override fun write(source: Buffer, byteCount: Long) {

okcurl/src/main/kotlin/okhttp3/curl/Main.kt

@@ -48,7 +48,6 @@ import picocli.CommandLine.Command
 import picocli.CommandLine.IVersionProvider
 import picocli.CommandLine.Option
 import picocli.CommandLine.Parameters
-import java.lang.IllegalArgumentException
 
 @Command(name = NAME, description = ["A curl for the next-generation web."],
     mixinStandardHelpOptions = true, versionProvider = Main.VersionProvider::class)
@@ -175,7 +174,7 @@ class Main : Runnable {
     return builder.build()
   }
 
-  public fun createRequest(): Request {
+  fun createRequest(): Request {
     val request = Request.Builder()
 
     val requestMethod = method ?: if (data != null) "POST" else "GET"
@@ -291,10 +290,10 @@ class Main : Runnable {
           formatter = object : SimpleFormatter() {
             override fun format(record: LogRecord): String {
               val parameters = record.parameters
-              if (parameters != null) {
+              return if (parameters != null) {
-                return format("%s%n%s%n", record.message, record.parameters.first())
+                format("%s%n%s%n", record.message, record.parameters.first())
               } else {
-                return format("%s%n", record.message)
+                format("%s%n", record.message)
               }
             }
           }

okhttp-brotli/src/main/kotlin/okhttp3/brotli/BrotliInterceptor.kt

@@ -17,13 +17,7 @@ package okhttp3.brotli
 
 import okhttp3.Interceptor
 import okhttp3.Response
-import okhttp3.ResponseBody.Companion.asResponseBody
 import okhttp3.brotli.internal.uncompress
-import okhttp3.internal.http.promisesBody
-import okio.GzipSource
-import okio.buffer
-import okio.source
-import org.brotli.dec.BrotliInputStream
 
 /**
  * Transparent Brotli response support.

okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsOverHttps.kt

@@ -19,7 +19,6 @@ import java.io.IOException
 import java.net.HttpURLConnection
 import java.net.InetAddress
 import java.net.UnknownHostException
-import java.util.ArrayList
 import java.util.concurrent.CountDownLatch
 import okhttp3.CacheControl
 import okhttp3.Call
@@ -85,9 +84,7 @@ class DnsOverHttps internal constructor(
 
     executeRequests(hostname, networkRequests, results, failures)
 
-    return if (results.isNotEmpty()) {
+    return results.ifEmpty {
-      results
-    } else {
       throwBestFailure(hostname, failures)
     }
   }

okhttp-testing-support/src/main/kotlin/okhttp3/FakeDns.kt

@@ -43,7 +43,7 @@ class FakeDns : Dns {
     hostname: String,
     index: Int
   ): InetAddress {
-    return hostAddresses[hostname]!!.get(index)
+    return hostAddresses[hostname]!![index]
   }
 
   @Throws(UnknownHostException::class)

okhttp-tls/src/main/kotlin/okhttp3/tls/internal/der/DerReader.kt

@@ -112,8 +112,7 @@ internal class DerReader(source: Source) {
     val tagAndClass = source.readByte().toInt() and 0xff
     val tagClass = tagAndClass and 0b1100_0000
     val constructed = (tagAndClass and 0b0010_0000) == 0b0010_0000
-    val tag0 = tagAndClass and 0b0001_1111
+    val tag = when (val tag0 = tagAndClass and 0b0001_1111) {
-    val tag = when (tag0) {
       0b0001_1111 -> readVariableLengthLong()
       else -> tag0.toLong()
     }

okhttp/src/main/kotlin/okhttp3/Handshake.kt

@@ -145,8 +145,7 @@ class Handshake internal constructor(
     @JvmStatic
     @JvmName("get")
     fun SSLSession.handshake(): Handshake {
-      val cipherSuiteString = checkNotNull(cipherSuite) { "cipherSuite == null" }
+      val cipherSuite = when (val cipherSuiteString = checkNotNull(cipherSuite) { "cipherSuite == null" }) {
-      val cipherSuite = when (cipherSuiteString) {
         "TLS_NULL_WITH_NULL_NULL", "SSL_NULL_WITH_NULL_NULL" -> {
           throw IOException("cipherSuite == $cipherSuiteString")
         }

okhttp/src/main/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt

@@ -30,16 +30,16 @@ fun buildCache(file: Path, maxSize: Long, fileSystem: FileSystem): Cache {
   return Cache(file, maxSize, fileSystem)
 }
 
-var RealConnection.idleAtNsAccessor
+var RealConnection.idleAtNsAccessor: Long
   get() = idleAtNs
   set(value) {
     idleAtNs = value
   }
 
-val Response.exchange
+val Response.exchangeAccessor: Exchange?
   get() = this.exchange
 
-val Exchange.connection
+val Exchange.connectionAccessor: RealConnection
   get() = this.connection
 
-fun Dispatcher.finished(call: RealCall.AsyncCall) = this.finished(call)
+fun Dispatcher.finishedAccessor(call: RealCall.AsyncCall) = this.finished(call)

okhttp/src/main/kotlin/okhttp3/internal/http/StatusLine.kt

@@ -65,12 +65,10 @@ class StatusLine(
         }
         val httpMinorVersion = statusLine[7] - '0'
         codeStart = 9
-        protocol = if (httpMinorVersion == 0) {
+        protocol = when (httpMinorVersion) {
-          Protocol.HTTP_1_0
+          0 -> Protocol.HTTP_1_0
-        } else if (httpMinorVersion == 1) {
+          1 -> Protocol.HTTP_1_1
-          Protocol.HTTP_1_1
+          else -> throw ProtocolException("Unexpected status line: $statusLine")
-        } else {
-          throw ProtocolException("Unexpected status line: $statusLine")
         }
       } else if (statusLine.startsWith("ICY ")) {
         // Shoutcast uses ICY instead of "HTTP/1.0".

okhttp/src/main/kotlin/okhttp3/internal/platform/Jdk9Platform.kt

@@ -42,16 +42,16 @@ open class Jdk9Platform : Platform() {
 
   @SuppressSignatureCheck
   override fun getSelectedProtocol(sslSocket: SSLSocket): String? {
-    try {
+    return try {
       // SSLSocket.getApplicationProtocol returns "" if application protocols values will not
       // be used. Observed if you didn't specify SSLParameters.setApplicationProtocols
-      return when (val protocol = sslSocket.applicationProtocol) {
+      when (val protocol = sslSocket.applicationProtocol) {
         null, "" -> null
         else -> protocol
       }
     } catch (e: UnsupportedOperationException) {
       // https://docs.oracle.com/javase/9/docs/api/javax/net/ssl/SSLSocket.html#getApplicationProtocol--
-      return null
+      null
     }
   }
 

okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt

@@ -81,9 +81,9 @@ open class AndroidSocketAdapter(private val sslSocketClass: Class<in SSLSocket>)
       val alpnResult = getAlpnSelectedProtocol.invoke(sslSocket) as ByteArray?
       if (alpnResult != null) String(alpnResult, StandardCharsets.UTF_8) else null
     } catch (e: NullPointerException) {
-      when {
+      // https://github.com/square/okhttp/issues/5587
-        // https://github.com/square/okhttp/issues/5587
+      when (e.message) {
-        e.message == "ssl == null" -> null
+        "ssl == null" -> null
         else -> throw e
       }
     } catch (e: IllegalAccessException) {

okhttp/src/test/java/okhttp3/HeadersKotlinTest.kt

@@ -55,9 +55,9 @@ class HeadersKotlinTest {
     builder["c"] = "d"
     builder["e"] = Date(0L)
     builder["g"] = Instant.EPOCH
-    assertThat(builder.get("a")).isEqualTo("b")
+    assertThat(builder["a"]).isEqualTo("b")
-    assertThat(builder.get("c")).isEqualTo("d")
+    assertThat(builder["c"]).isEqualTo("d")
-    assertThat(builder.get("e")).isEqualTo("Thu, 01 Jan 1970 00:00:00 GMT")
+    assertThat(builder["e"]).isEqualTo("Thu, 01 Jan 1970 00:00:00 GMT")
-    assertThat(builder.get("g")).isEqualTo("Thu, 01 Jan 1970 00:00:00 GMT")
+    assertThat(builder["g"]).isEqualTo("Thu, 01 Jan 1970 00:00:00 GMT")
   }
 }

okhttp/src/test/java/okhttp3/KotlinDeprecationErrorTest.kt

@@ -45,7 +45,6 @@ import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import okhttp3.tls.internal.TlsUtil.localhost
 import okio.Buffer
-import org.junit.Ignore
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
@@ -101,7 +100,7 @@ class KotlinDeprecationErrorTest {
 
   @Test @Disabled
   fun challenge() {
-    val challenge = Challenge("", mapOf<String?, String>("" to ""))
+    val challenge = Challenge("", mapOf("" to ""))
     val scheme: String = challenge.scheme()
     val authParams: Map<String?, String> = challenge.authParams()
     val realm: String? = challenge.realm()

okhttp/src/test/java/okhttp3/KotlinSourceModernTest.kt

@@ -119,9 +119,7 @@ class KotlinSourceModernTest {
 
   @Test
   fun authenticator() {
-    var authenticator: Authenticator = object : Authenticator {
+    var authenticator: Authenticator = Authenticator { route, response -> TODO() }
-      override fun authenticate(route: Route?, response: Response): Request? = TODO()
-    }
   }
 
   @Test
@@ -402,9 +400,7 @@ class KotlinSourceModernTest {
 
   @Test
   fun eventListenerBuilder() {
-    var builder: EventListener.Factory = object : EventListener.Factory {
+    var builder: EventListener.Factory = EventListener.Factory { TODO() }
-      override fun create(call: Call): EventListener = TODO()
-    }
   }
 
   @Test
@@ -453,7 +449,7 @@ class KotlinSourceModernTest {
   fun headers() {
     var headers: Headers = headersOf("", "")
     headers = mapOf("" to "").toHeaders()
-    val get: String? = headers.get("")
+    val get: String? = headers[""]
     val date: Date? = headers.getDate("")
     val instant: Instant? = headers.getInstant("")
     val size: Int = headers.size
@@ -479,7 +475,7 @@ class KotlinSourceModernTest {
     builder = builder.set("", Date(0L))
     builder = builder.set("", Instant.EPOCH)
     builder = builder.removeAll("")
-    val get: String? = builder.get("")
+    val get: String? = builder[""]
     val headers: Headers = builder.build()
   }
 
@@ -503,9 +499,7 @@ class KotlinSourceModernTest {
 
   @Test
   fun httpLoggingInterceptorLogger() {
-    var logger: HttpLoggingInterceptor.Logger = object : HttpLoggingInterceptor.Logger {
+    var logger: HttpLoggingInterceptor.Logger = HttpLoggingInterceptor.Logger { TODO() }
-      override fun log(message: String) = TODO()
-    }
     val default: HttpLoggingInterceptor.Logger = HttpLoggingInterceptor.Logger.DEFAULT
   }
 
@@ -580,9 +574,7 @@ class KotlinSourceModernTest {
 
   @Test
   fun interceptor() {
-    var interceptor: Interceptor = object : Interceptor {
+    var interceptor: Interceptor = Interceptor { TODO() }
-      override fun intercept(chain: Interceptor.Chain): Response = TODO()
-    }
     interceptor = Interceptor { it: Interceptor.Chain -> TODO() }
   }
 
@@ -874,19 +866,13 @@ class KotlinSourceModernTest {
     builder = builder.protocols(listOf(Protocol.HTTP_1_1))
     builder = builder.connectionSpecs(listOf(ConnectionSpec.MODERN_TLS))
     val interceptors: List<Interceptor> = builder.interceptors()
-    builder = builder.addInterceptor(object : Interceptor {
+    builder = builder.addInterceptor(Interceptor { TODO() })
-      override fun intercept(chain: Interceptor.Chain): Response = TODO()
-    })
     builder = builder.addInterceptor { it: Interceptor.Chain -> TODO() }
     val networkInterceptors: List<Interceptor> = builder.networkInterceptors()
-    builder = builder.addNetworkInterceptor(object : Interceptor {
+    builder = builder.addNetworkInterceptor(Interceptor { TODO() })
-      override fun intercept(chain: Interceptor.Chain): Response = TODO()
-    })
     builder = builder.addNetworkInterceptor { it: Interceptor.Chain -> TODO() }
     builder = builder.eventListener(EventListener.NONE)
-    builder = builder.eventListenerFactory(object : EventListener.Factory {
+    builder = builder.eventListenerFactory { TODO() }
-      override fun create(call: Call): EventListener = TODO()
-    })
     val client: OkHttpClient = builder.build()
   }
 

okhttp/src/test/java/okhttp3/OpenJSSETest.kt

@@ -19,6 +19,8 @@ import java.net.InetAddress
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import okhttp3.TestUtil.assumeNetwork
+import okhttp3.internal.connectionAccessor
+import okhttp3.internal.exchangeAccessor
 import okhttp3.internal.platform.OpenJSSEPlatform
 import okhttp3.testing.PlatformRule
 import okhttp3.tls.HandshakeCertificates
@@ -31,8 +33,6 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.openjsse.sun.security.ssl.SSLSocketFactoryImpl
 import org.openjsse.sun.security.ssl.SSLSocketImpl
-import okhttp3.internal.exchange
-import okhttp3.internal.connection
 
 class OpenJSSETest(
   val server: MockWebServer
@@ -62,7 +62,7 @@ class OpenJSSETest(
       assertEquals(TlsVersion.TLS_1_3, response.handshake?.tlsVersion)
       assertEquals(Protocol.HTTP_2, response.protocol)
 
-      assertThat(response.exchange?.connection?.socket()).isInstanceOf(SSLSocketImpl::class.java)
+      assertThat(response.exchangeAccessor?.connectionAccessor?.socket()).isInstanceOf(SSLSocketImpl::class.java)
     }
   }
 

okhttp/src/test/java/okhttp3/RecordingExecutor.kt

@@ -19,8 +19,8 @@ import java.util.concurrent.AbstractExecutorService
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
 import okhttp3.internal.connection.RealCall
+import okhttp3.internal.finishedAccessor
 import org.assertj.core.api.Assertions.assertThat
-import okhttp3.internal.finished
 
 internal class RecordingExecutor(
   private val dispatcherTest: DispatcherTest
@@ -44,7 +44,7 @@ internal class RecordingExecutor(
       val call = i.next()
       if (call.request.url.toString() == url) {
         i.remove()
-        dispatcherTest.dispatcher.finished(call)
+        dispatcherTest.dispatcher.finishedAccessor(call)
         return
       }
     }

okhttp/src/test/java/okhttp3/SocketChannelTest.kt

@@ -25,15 +25,10 @@ import okhttp3.TlsExtensionMode.DISABLED
 import okhttp3.TlsExtensionMode.STANDARD
 import okhttp3.TlsVersion.TLS_1_2
 import okhttp3.TlsVersion.TLS_1_3
-import okhttp3.internal.platform.ConscryptPlatform
-import okhttp3.internal.platform.Platform
-import okhttp3.testing.Flaky
 import okhttp3.testing.PlatformRule
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import org.assertj.core.api.Assertions.assertThat
-import org.conscrypt.Conscrypt
-import org.junit.After
 import org.junit.jupiter.api.Assumptions.assumeFalse
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.Tag
@@ -43,7 +38,6 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import java.io.IOException
 import java.net.InetAddress
-import java.security.Security
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit.SECONDS
 import javax.net.ssl.SNIHostName
@@ -241,4 +235,4 @@ enum class Provider {
 enum class TlsExtensionMode {
   DISABLED,
   STANDARD
-}
+}

okhttp/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.kt

@@ -388,8 +388,8 @@ class DiskLruCacheTest {
 
     cache["k1"]!!.use { snapshot1 ->
       val inV1 = snapshot1.getSource(0).buffer()
-      assertThat(inV1.readByte()).isEqualTo('A'.toByte())
+      assertThat(inV1.readByte()).isEqualTo('A'.code.toByte())
-      assertThat(inV1.readByte()).isEqualTo('A'.toByte())
+      assertThat(inV1.readByte()).isEqualTo('A'.code.toByte())
 
       val v1Updater = cache.edit("k1")!!
       v1Updater.setString(0, "CCcc")
@@ -401,8 +401,8 @@ class DiskLruCacheTest {
         snapshot2.assertValue(1, "DDdd")
       }
 
-      assertThat(inV1.readByte()).isEqualTo('a'.toByte())
+      assertThat(inV1.readByte()).isEqualTo('a'.code.toByte())
-      assertThat(inV1.readByte()).isEqualTo('a'.toByte())
+      assertThat(inV1.readByte()).isEqualTo('a'.code.toByte())
       snapshot1.assertValue(1, "BBbb")
     }
   }

okhttp/src/test/java/okhttp3/internal/concurrent/TaskFaker.kt

@@ -25,7 +25,7 @@ import org.assertj.core.api.Assertions.assertThat
  * deterministic. All tasks are executed on-demand on the test thread by calls to [runTasks] and
  * [advanceUntil].
  */
-class TaskFaker() {
+class TaskFaker {
   @Suppress("NOTHING_TO_INLINE")
   internal inline fun Any.assertThreadHoldsLock() {
     if (assertionsEnabled && !Thread.holdsLock(this)) {
@@ -156,7 +156,7 @@ class TaskFaker() {
       val runnable = futureRunnables.removeAt(0)
       currentRunnables.add(runnable)
       if (currentRunnables.size > 1) isParallel = true
-      executorService.execute(Runnable {
+      executorService.execute {
         try {
           runnable.run()
         } finally {
@@ -165,7 +165,7 @@ class TaskFaker() {
             taskRunner.notify()
           }
         }
-      })
+      }
       taskRunner.wait() // Wait for the coordinator to stall.
     }
   }

samples/guide/src/main/java/okhttp3/recipes/kt/YubikeyClientAuth.kt

@@ -19,7 +19,6 @@ import java.io.IOException
 import java.security.KeyStore
 import java.security.SecureRandom
 import java.security.Security
-import java.util.Arrays
 import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.KeyStoreBuilderParameters
 import javax.net.ssl.SSLContext
@@ -47,7 +46,7 @@ import okhttp3.internal.platform.Platform
  * Install OpenSC separately. On a mac `brew cast install opensc`.
  */
 @SuppressSignatureCheck
-class YubikeyClientAuth() {
+class YubikeyClientAuth {
   fun run() {
     // The typical PKCS11 slot, may vary with different hardware.
     val slot = 0
@@ -61,11 +60,11 @@ class YubikeyClientAuth() {
 
     val callbackHandler = ConsoleCallbackHandler
 
-    val builderList: List<KeyStore.Builder> = Arrays.asList(
+    val builderList: List<KeyStore.Builder> = listOf(
-        KeyStore.Builder.newInstance("PKCS11", null, KeyStore.CallbackHandlerProtection(callbackHandler))
+      KeyStore.Builder.newInstance("PKCS11", null, KeyStore.CallbackHandlerProtection(callbackHandler))
 
-        // Example if you want to combine multiple keystore types
+      // Example if you want to combine multiple keystore types
-        // KeyStore.Builder.newInstance("PKCS12", null, File("keystore.p12"), PasswordProtection("rosebud".toCharArray()))
+      // KeyStore.Builder.newInstance("PKCS12", null, File("keystore.p12"), PasswordProtection("rosebud".toCharArray()))
     )
 
     val keyManagerFactory = KeyManagerFactory.getInstance("NewSunX509")