From 96c172a074294d03ad155c73c3e667bdd865097c Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Thu, 23 May 2019 14:12:34 -0400 Subject: [PATCH] Rename internal file and specify non-Kt-suffixed name --- .../java/okhttp3/internal/{InternalKt.kt => internal.kt} | 3 +++ okhttp/src/test/java/okhttp3/CacheTest.java | 6 +++--- okhttp/src/test/java/okhttp3/CallTest.java | 2 +- okhttp/src/test/java/okhttp3/CipherSuiteTest.java | 2 +- okhttp/src/test/java/okhttp3/ConnectionSpecTest.java | 2 +- okhttp/src/test/java/okhttp3/CookieTest.java | 2 +- okhttp/src/test/java/okhttp3/URLConnectionTest.java | 6 +++--- 7 files changed, 13 insertions(+), 10 deletions(-) rename okhttp/src/main/java/okhttp3/internal/{InternalKt.kt => internal.kt} (93%) diff --git a/okhttp/src/main/java/okhttp3/internal/InternalKt.kt b/okhttp/src/main/java/okhttp3/internal/internal.kt similarity index 93% rename from okhttp/src/main/java/okhttp3/internal/InternalKt.kt rename to okhttp/src/main/java/okhttp3/internal/internal.kt index 8e37548bf..4b6acc336 100644 --- a/okhttp/src/main/java/okhttp3/internal/InternalKt.kt +++ b/okhttp/src/main/java/okhttp3/internal/internal.kt @@ -14,6 +14,9 @@ * limitations under the License. */ +/** Exposes Kotlin-internal APIs to Java test code and code in other modules. */ +@file:JvmName("Internal") + package okhttp3.internal import okhttp3.Cache diff --git a/okhttp/src/test/java/okhttp3/CacheTest.java b/okhttp/src/test/java/okhttp3/CacheTest.java index e39fb55e1..a77729ee1 100644 --- a/okhttp/src/test/java/okhttp3/CacheTest.java +++ b/okhttp/src/test/java/okhttp3/CacheTest.java @@ -34,7 +34,7 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.HostnameVerifier; -import okhttp3.internal.InternalKtKt; +import okhttp3.internal.Internal; import okhttp3.internal.io.InMemoryFileSystem; import okhttp3.internal.platform.Platform; import okhttp3.mockwebserver.MockResponse; @@ -51,7 +51,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import static okhttp3.internal.InternalKtKt.cacheGet; +import static okhttp3.internal.Internal.cacheGet; import static okhttp3.mockwebserver.SocketPolicy.DISCONNECT_AT_END; import static okhttp3.tls.internal.TlsUtil.localhost; import static org.assertj.core.api.Assertions.assertThat; @@ -1992,7 +1992,7 @@ public final class CacheTest { @Test public void emptyResponseHeaderNameFromCacheIsLenient() throws Exception { Headers.Builder headers = new Headers.Builder() .add("Cache-Control: max-age=120"); - InternalKtKt.addHeaderLenient(headers, ": A"); + Internal.addHeaderLenient(headers, ": A"); server.enqueue(new MockResponse() .setHeaders(headers.build()) .setBody("body")); diff --git a/okhttp/src/test/java/okhttp3/CallTest.java b/okhttp/src/test/java/okhttp3/CallTest.java index 0463d461f..d761c24d7 100644 --- a/okhttp/src/test/java/okhttp3/CallTest.java +++ b/okhttp/src/test/java/okhttp3/CallTest.java @@ -91,7 +91,7 @@ import static java.net.CookiePolicy.ACCEPT_ORIGINAL_SERVER; import static java.util.Arrays.asList; import static okhttp3.CipherSuite.TLS_DH_anon_WITH_AES_128_GCM_SHA256; import static okhttp3.TestUtil.awaitGarbageCollection; -import static okhttp3.internal.InternalKtKt.addHeaderLenient; +import static okhttp3.internal.Internal.addHeaderLenient; import static okhttp3.internal.platform.PlatformTest.getJvmSpecVersion; import static okhttp3.tls.internal.TlsUtil.localhost; import static org.assertj.core.api.Assertions.assertThat; diff --git a/okhttp/src/test/java/okhttp3/CipherSuiteTest.java b/okhttp/src/test/java/okhttp3/CipherSuiteTest.java index 35d784381..d70d7d4b1 100644 --- a/okhttp/src/test/java/okhttp3/CipherSuiteTest.java +++ b/okhttp/src/test/java/okhttp3/CipherSuiteTest.java @@ -21,7 +21,7 @@ import static okhttp3.CipherSuite.TLS_KRB5_WITH_DES_CBC_MD5; import static okhttp3.CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5; import static okhttp3.CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256; import static okhttp3.CipherSuite.forJavaName; -import static okhttp3.internal.InternalKtKt.applyConnectionSpec; +import static okhttp3.internal.Internal.applyConnectionSpec; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.fail; diff --git a/okhttp/src/test/java/okhttp3/ConnectionSpecTest.java b/okhttp/src/test/java/okhttp3/ConnectionSpecTest.java index a42d05bc8..7c066e28c 100644 --- a/okhttp/src/test/java/okhttp3/ConnectionSpecTest.java +++ b/okhttp/src/test/java/okhttp3/ConnectionSpecTest.java @@ -25,7 +25,7 @@ import org.junit.Rule; import org.junit.Test; import static java.util.Arrays.asList; -import static okhttp3.internal.InternalKtKt.applyConnectionSpec; +import static okhttp3.internal.Internal.applyConnectionSpec; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/okhttp/src/test/java/okhttp3/CookieTest.java b/okhttp/src/test/java/okhttp3/CookieTest.java index a1f591360..230fae6fa 100644 --- a/okhttp/src/test/java/okhttp3/CookieTest.java +++ b/okhttp/src/test/java/okhttp3/CookieTest.java @@ -25,7 +25,7 @@ import okhttp3.internal.http.HttpDate; import org.junit.Test; import static java.util.Arrays.asList; -import static okhttp3.internal.InternalKtKt.parseCookie; +import static okhttp3.internal.Internal.parseCookie; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/okhttp/src/test/java/okhttp3/URLConnectionTest.java b/okhttp/src/test/java/okhttp3/URLConnectionTest.java index 745de7cc2..d95d253a9 100644 --- a/okhttp/src/test/java/okhttp3/URLConnectionTest.java +++ b/okhttp/src/test/java/okhttp3/URLConnectionTest.java @@ -59,7 +59,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import okhttp3.internal.InternalKtKt; +import okhttp3.internal.Internal; import okhttp3.internal.RecordingAuthenticator; import okhttp3.internal.RecordingOkAuthenticator; import okhttp3.internal.Version; @@ -88,7 +88,7 @@ import static java.util.Arrays.asList; import static java.util.Locale.US; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; -import static okhttp3.internal.InternalKtKt.addHeaderLenient; +import static okhttp3.internal.Internal.addHeaderLenient; import static okhttp3.internal.Util.immutableListOf; import static okhttp3.internal.http.StatusLine.HTTP_PERM_REDIRECT; import static okhttp3.internal.http.StatusLine.HTTP_TEMP_REDIRECT; @@ -3115,7 +3115,7 @@ public final class URLConnectionTest { @Test public void emptyResponseHeaderNameIsLenient() throws Exception { Headers.Builder headers = new Headers.Builder(); - InternalKtKt.addHeaderLenient(headers, ":A"); + Internal.addHeaderLenient(headers, ":A"); server.enqueue(new MockResponse() .setHeaders(headers.build()) .setBody("body"));