[4.x] Avoid exposing internal functions and properties (#8137)

* Avoid exposing internal functions and properties This is a backport for 4.x branch from f408411. * More internal modifiers
square · Dec 24, 2023 · 710bdc1 · 710bdc1
1 parent cdf8a6e
commit 710bdc1
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 70 deletions.
diff --git a/mockwebserver/src/main/kotlin/okhttp3/mockwebserver/MockResponse.kt b/mockwebserver/src/main/kotlin/okhttp3/mockwebserver/MockResponse.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.mockwebserver
 
 import java.util.concurrent.TimeUnit

diff --git a/mockwebserver/src/main/kotlin/okhttp3/mockwebserver/MockWebServer.kt b/mockwebserver/src/main/kotlin/okhttp3/mockwebserver/MockWebServer.kt
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.mockwebserver
 
 import java.io.Closeable

diff --git a/okcurl/src/main/kotlin/okhttp3/curl/Main.kt b/okcurl/src/main/kotlin/okhttp3/curl/Main.kt
@@ -36,7 +36,6 @@ import okhttp3.Protocol
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.curl.Main.Companion.NAME
-import okhttp3.internal.format
 import okhttp3.internal.http.StatusLine
 import okhttp3.internal.http2.Http2
 import okhttp3.internal.platform.Platform
@@ -48,6 +47,7 @@ import picocli.CommandLine.Command
 import picocli.CommandLine.IVersionProvider
 import picocli.CommandLine.Option
 import picocli.CommandLine.Parameters
+import java.util.Locale
 
 @Command(name = NAME, description = ["A curl for the next-generation web."],
     mixinStandardHelpOptions = true, versionProvider = Main.VersionProvider::class)
@@ -273,7 +273,7 @@ class Main : Runnable {
           level = Level.FINE
           formatter = object : SimpleFormatter() {
             override fun format(record: LogRecord): String {
-              return format("%s%n", record.message)
+              return "%s%n".format(Locale.US, record.message)
             }
           }
         })
@@ -289,9 +289,9 @@ class Main : Runnable {
             override fun format(record: LogRecord): String {
               val parameters = record.parameters
               if (parameters != null) {
-                return format("%s%n%s%n", record.message, record.parameters.first())
+                return "%s%n%s%n".format(Locale.US, record.message, record.parameters.first())
               } else {
-                return format("%s%n", record.message)
+                return "%s%n".format(Locale.US, record.message)
               }
             }
           }

diff --git a/okhttp-sse/src/main/kotlin/okhttp3/internal/sse/RealEventSource.kt b/okhttp-sse/src/main/kotlin/okhttp3/internal/sse/RealEventSource.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.internal.sse
 
 import java.io.IOException

diff --git a/okhttp-sse/src/main/kotlin/okhttp3/internal/sse/ServerSentEventReader.kt b/okhttp-sse/src/main/kotlin/okhttp3/internal/sse/ServerSentEventReader.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.internal.sse
 
 import java.io.IOException

diff --git a/okhttp-tls/src/main/kotlin/okhttp3/tls/HandshakeCertificates.kt b/okhttp-tls/src/main/kotlin/okhttp3/tls/HandshakeCertificates.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.tls
 
 import java.security.SecureRandom

diff --git a/okhttp-tls/src/main/kotlin/okhttp3/tls/HeldCertificate.kt b/okhttp-tls/src/main/kotlin/okhttp3/tls/HeldCertificate.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.tls
 
 import java.math.BigInteger

diff --git a/okhttp-tls/src/main/kotlin/okhttp3/tls/internal/InsecureExtendedTrustManager.kt b/okhttp-tls/src/main/kotlin/okhttp3/tls/internal/InsecureExtendedTrustManager.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3.tls.internal
 
 import java.net.Socket

diff --git a/okhttp-urlconnection/src/main/kotlin/okhttp3/JavaNetCookieJar.kt b/okhttp-urlconnection/src/main/kotlin/okhttp3/JavaNetCookieJar.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package okhttp3
 
 import java.io.IOException