From 376b9a4e59799134aa5b5b4fc3bb724c816b57f5 Mon Sep 17 00:00:00 2001
From: Tang HuaiZhe <tanghuaizhe@me.com>
Date: Sat, 25 May 2019 11:59:23 +0800
Subject: [PATCH] Replace !isEmpty with isNotEmpty

---
 .../java/okhttp3/dnsoverhttps/DnsOverHttps.kt    |  2 +-
 .../src/main/java/okhttp3/tls/HeldCertificate.kt |  2 +-
 .../java/okhttp3/internal/http/RequestLine.kt    | 16 ++++++----------
 .../main/java/okhttp3/internal/http2/Http2.kt    |  6 +++---
 .../java/okhttp3/internal/ws/RealWebSocket.kt    |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/okhttp-dnsoverhttps/src/main/java/okhttp3/dnsoverhttps/DnsOverHttps.kt b/okhttp-dnsoverhttps/src/main/java/okhttp3/dnsoverhttps/DnsOverHttps.kt
index 55928968b..d5f34c374 100644
--- a/okhttp-dnsoverhttps/src/main/java/okhttp3/dnsoverhttps/DnsOverHttps.kt
+++ b/okhttp-dnsoverhttps/src/main/java/okhttp3/dnsoverhttps/DnsOverHttps.kt
@@ -103,7 +103,7 @@ class DnsOverHttps internal constructor(builder: Builder) : Dns {
 
     executeRequests(hostname, networkRequests, results, failures)
 
-    return if (!results.isEmpty()) {
+    return if (results.isNotEmpty()) {
       results
     } else {
       throwBestFailure(hostname, failures)
diff --git a/okhttp-tls/src/main/java/okhttp3/tls/HeldCertificate.kt b/okhttp-tls/src/main/java/okhttp3/tls/HeldCertificate.kt
index 07a30e624..074dad960 100644
--- a/okhttp-tls/src/main/java/okhttp3/tls/HeldCertificate.kt
+++ b/okhttp-tls/src/main/java/okhttp3/tls/HeldCertificate.kt
@@ -357,7 +357,7 @@ class HeldCertificate(private val keyPair: KeyPair, private val certificate: X50
             BasicConstraints(maxIntermediateCas))
       }
 
-      if (!altNames.isEmpty()) {
+      if (altNames.isNotEmpty()) {
         val encodableAltNames = arrayOfNulls<ASN1Encodable>(altNames.size)
         for (i in 0 until altNames.size) {
           val altName = altNames[i]
diff --git a/okhttp/src/main/java/okhttp3/internal/http/RequestLine.kt b/okhttp/src/main/java/okhttp3/internal/http/RequestLine.kt
index 077206b60..068c86f50 100644
--- a/okhttp/src/main/java/okhttp3/internal/http/RequestLine.kt
+++ b/okhttp/src/main/java/okhttp3/internal/http/RequestLine.kt
@@ -27,19 +27,15 @@ object RequestLine {
    * [HttpURLConnection.getHeaderFields], so it needs to be set even if the transport is
    * HTTP/2.
    */
-  fun get(request: Request, proxyType: Proxy.Type): String {
-    val result = StringBuilder()
-    result.append(request.method)
-    result.append(' ')
-
+  fun get(request: Request, proxyType: Proxy.Type) = buildString {
+    append(request.method)
+    append(' ')
     if (includeAuthorityInRequestLine(request, proxyType)) {
-      result.append(request.url)
+      append(request.url)
     } else {
-      result.append(requestPath(request.url))
+      append(requestPath(request.url))
     }
-
-    result.append(" HTTP/1.1")
-    return result.toString()
+    append(" HTTP/1.1")
   }
 
   /**
diff --git a/okhttp/src/main/java/okhttp3/internal/http2/Http2.kt b/okhttp/src/main/java/okhttp3/internal/http2/Http2.kt
index 941d167eb..571ab0fd9 100644
--- a/okhttp/src/main/java/okhttp3/internal/http2/Http2.kt
+++ b/okhttp/src/main/java/okhttp3/internal/http2/Http2.kt
@@ -128,10 +128,10 @@ object Http2 {
     if (flags == 0) return ""
     when (type) {
       // Special case types that have 0 or 1 flag.
-      TYPE_SETTINGS, TYPE_PING -> return if (flags == FLAG_ACK) "ACK" else BINARY[flags]!!
-      TYPE_PRIORITY, TYPE_RST_STREAM, TYPE_GOAWAY, TYPE_WINDOW_UPDATE -> return BINARY[flags]!!
+      TYPE_SETTINGS, TYPE_PING -> return if (flags == FLAG_ACK) "ACK" else BINARY[flags]
+      TYPE_PRIORITY, TYPE_RST_STREAM, TYPE_GOAWAY, TYPE_WINDOW_UPDATE -> return BINARY[flags]
     }
-    val result = if (flags < FLAGS.size) FLAGS[flags]!! else BINARY[flags]!!
+    val result = if (flags < FLAGS.size) FLAGS[flags]!! else BINARY[flags]
     // Special case types that have overlap flag values.
     return when {
       type == TYPE_PUSH_PROMISE && flags and FLAG_END_PUSH_PROMISE != 0 -> {
diff --git a/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt b/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt
index 47179ff9d..c7feccef4 100644
--- a/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt
+++ b/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt
@@ -231,7 +231,7 @@ class RealWebSocket(
         executor!!.scheduleAtFixedRate(
             PingRunnable(), pingIntervalMillis, pingIntervalMillis, MILLISECONDS)
       }
-      if (!messageAndCloseQueue.isEmpty()) {
+      if (messageAndCloseQueue.isNotEmpty()) {
         runWriter() // Send messages that were enqueued before we were connected.
       }
     }