okhttp3.Gzip (#8988)

* okhttp3.Gzip

Top level object for consistency.

* reformat and apis

android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt

@@ -49,11 +49,11 @@ import okhttp3.Cache
 import okhttp3.Call
 import okhttp3.CertificatePinner
 import okhttp3.CompressionInterceptor
-import okhttp3.CompressionInterceptor.Companion.Gzip
 import okhttp3.Connection
 import okhttp3.DelegatingSSLSocket
 import okhttp3.DelegatingSSLSocketFactory
 import okhttp3.EventListener
+import okhttp3.Gzip
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient

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

@@ -16,6 +16,7 @@
 package okhttp3.brotli
 
 import okhttp3.CompressionInterceptor
+import okhttp3.Gzip
 import okio.BufferedSource
 import okio.Source
 import okio.source

okhttp-brotli/src/test/java/okhttp3/brotli/BrotliInterceptorTest.kt

@@ -23,7 +23,7 @@ import assertk.assertions.isEqualTo
 import java.io.IOException
 import kotlin.test.assertFailsWith
 import okhttp3.CompressionInterceptor
-import okhttp3.CompressionInterceptor.Companion.Gzip
+import okhttp3.Gzip
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Protocol
 import okhttp3.Request

okhttp-zstd/src/test/java/okhttp3/zstd/ZstdInterceptorJavaTest.java

@@ -16,6 +16,7 @@
 package okhttp3.zstd;
 
 import okhttp3.CompressionInterceptor;
+import okhttp3.Gzip;
 import okhttp3.brotli.Brotli;
 import org.junit.jupiter.api.Test;
 
@@ -24,7 +25,7 @@ class ZstdInterceptorJavaTest {
   public void testConstructor() {
     CompressionInterceptor interceptor = new CompressionInterceptor(
       Zstd.INSTANCE,
-      CompressionInterceptor.Gzip,
+      Gzip.INSTANCE,
       Brotli.INSTANCE
     );
   }

okhttp-zstd/src/test/java/okhttp3/zstd/ZstdInterceptorTest.kt

@@ -24,7 +24,7 @@ import com.squareup.zstd.okio.zstdCompress
 import java.io.IOException
 import kotlin.test.assertFailsWith
 import okhttp3.CompressionInterceptor
-import okhttp3.CompressionInterceptor.Companion.Gzip
+import okhttp3.Gzip
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Protocol
 import okhttp3.Request

okhttp/api/android/okhttp.api

@@ -327,16 +327,11 @@ public final class okhttp3/CipherSuite$Companion {
 }
 
 public class okhttp3/CompressionInterceptor : okhttp3/Interceptor {
-	public static final field Companion Lokhttp3/CompressionInterceptor$Companion;
-	public static final field Gzip Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;
 	public fun <init> ([Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;)V
 	public final fun getAlgorithms ()[Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;
 	public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
 }
 
-public final class okhttp3/CompressionInterceptor$Companion {
-}
-
 public abstract interface class okhttp3/CompressionInterceptor$DecompressionAlgorithm {
 	public abstract fun decompress (Lokio/BufferedSource;)Lokio/Source;
 	public abstract fun getEncoding ()Ljava/lang/String;
@@ -554,6 +549,12 @@ public final class okhttp3/FormBody$Builder {
 public final class okhttp3/FormBody$Companion {
 }
 
+public final class okhttp3/Gzip : okhttp3/CompressionInterceptor$DecompressionAlgorithm {
+	public static final field INSTANCE Lokhttp3/Gzip;
+	public fun decompress (Lokio/BufferedSource;)Lokio/Source;
+	public fun getEncoding ()Ljava/lang/String;
+}
+
 public final class okhttp3/Handshake {
 	public static final field Companion Lokhttp3/Handshake$Companion;
 	public final fun -deprecated_cipherSuite ()Lokhttp3/CipherSuite;

okhttp/api/jvm/okhttp.api

@@ -327,16 +327,11 @@ public final class okhttp3/CipherSuite$Companion {
 }
 
 public class okhttp3/CompressionInterceptor : okhttp3/Interceptor {
-	public static final field Companion Lokhttp3/CompressionInterceptor$Companion;
-	public static final field Gzip Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;
 	public fun <init> ([Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;)V
 	public final fun getAlgorithms ()[Lokhttp3/CompressionInterceptor$DecompressionAlgorithm;
 	public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
 }
 
-public final class okhttp3/CompressionInterceptor$Companion {
-}
-
 public abstract interface class okhttp3/CompressionInterceptor$DecompressionAlgorithm {
 	public abstract fun decompress (Lokio/BufferedSource;)Lokio/Source;
 	public abstract fun getEncoding ()Ljava/lang/String;
@@ -554,6 +549,12 @@ public final class okhttp3/FormBody$Builder {
 public final class okhttp3/FormBody$Companion {
 }
 
+public final class okhttp3/Gzip : okhttp3/CompressionInterceptor$DecompressionAlgorithm {
+	public static final field INSTANCE Lokhttp3/Gzip;
+	public fun decompress (Lokio/BufferedSource;)Lokio/Source;
+	public fun getEncoding ()Ljava/lang/String;
+}
+
 public final class okhttp3/Handshake {
 	public static final field Companion Lokhttp3/Handshake$Companion;
 	public final fun -deprecated_cipherSuite ()Lokhttp3/CipherSuite;

okhttp/src/commonJvmAndroid/kotlin/okhttp3/CompressionInterceptor.kt

@@ -15,6 +15,7 @@
  */
 package okhttp3
 
+import okhttp3.CompressionInterceptor.DecompressionAlgorithm
 import okhttp3.ResponseBody.Companion.asResponseBody
 import okhttp3.internal.http.promisesBody
 import okio.BufferedSource
@@ -93,17 +94,10 @@ open class CompressionInterceptor(
 
     fun decompress(compressedSource: BufferedSource): Source
   }
-
-  companion object {
-    /**
-     * Request "gzip" compression.
-     */
-    @JvmField
-    public val Gzip =
-      object : DecompressionAlgorithm {
-        override val encoding: String get() = "gzip"
-
-        override fun decompress(compressedSource: BufferedSource): Source = GzipSource(compressedSource)
-      }
-  }
+}
+
+object Gzip : DecompressionAlgorithm {
+  override val encoding: String get() = "gzip"
+
+  override fun decompress(compressedSource: BufferedSource): Source = GzipSource(compressedSource)
 }

okhttp/src/commonTest/kotlin/okhttp3/CompressionInterceptorTest.kt

@@ -18,7 +18,6 @@ package okhttp3
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
-import okhttp3.CompressionInterceptor.Companion.Gzip
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.ResponseBody.Companion.asResponseBody
 import okhttp3.ResponseBody.Companion.toResponseBody