Spotless

Author: aleksandar-apostolov

stream-android-core/src/main/java/io/getstream/android/core/api/StreamClient.kt

@@ -260,13 +260,13 @@ fun StreamClient(
                 addInterceptor(StreamOkHttpInterceptors.clientInfo(clientInfoHeader))
                 addInterceptor(StreamOkHttpInterceptors.apiKey(apiKey))
                 addInterceptor(StreamOkHttpInterceptors.connectionId(connectionIdHolder))
-                addInterceptor(StreamOkHttpInterceptors.auth( "jwt", tokenManager, compositeSerialization))
+                addInterceptor(
+                    StreamOkHttpInterceptors.auth("jwt", tokenManager, compositeSerialization)
+                )
                 addInterceptor(StreamOkHttpInterceptors.error(compositeSerialization))
             }
         }
-        configuredInterceptors.forEach {
-            httpBuilder.addInterceptor(it)
-        }
+        configuredInterceptors.forEach { httpBuilder.addInterceptor(it) }
     }
 
     return StreamClientImpl(

stream-android-core/src/main/java/io/getstream/android/core/api/model/config/StreamClientSerializationConfig.kt

@@ -17,8 +17,8 @@ package io.getstream.android.core.api.model.config
 
 import io.getstream.android.core.annotations.StreamCoreApi
 import io.getstream.android.core.api.model.event.StreamClientWsEvent
-import io.getstream.android.core.api.serialization.StreamJsonSerialization
 import io.getstream.android.core.api.serialization.StreamEventSerialization
+import io.getstream.android.core.api.serialization.StreamJsonSerialization
 
 /**
  * Configuration for serialization and deserialization in the Stream client.

stream-android-core/src/main/java/io/getstream/android/core/api/serialization/StreamEventSerialization.kt

@@ -49,10 +49,9 @@ interface StreamEventSerialization<T> {
     fun deserialize(raw: String): Result<T>
 }
 
-
-
 /**
- * Creates a new [StreamEventSerialization] instance that can serialize [io.getstream.android.core.api.model.event.StreamClientWsEvent] objects.
+ * Creates a new [StreamEventSerialization] instance that can serialize
+ * [io.getstream.android.core.api.model.event.StreamClientWsEvent] objects.
  *
  * @param jsonParser The [StreamJsonSerialization] to use for JSON serialization and
  *   deserialization.

stream-android-core/src/main/java/io/getstream/android/core/internal/http/interceptor/StreamAuthInterceptor.kt

@@ -61,12 +61,16 @@ internal class StreamAuthInterceptor(
     }
 
     override fun intercept(chain: Interceptor.Chain): Response {
-        val token = runBlocking { tokenManager.loadIfAbsent() }.getOrEndpointException("Failed to load token.")
+        val token =
+            runBlocking { tokenManager.loadIfAbsent() }
+                .getOrEndpointException("Failed to load token.")
         val original = chain.request()
         val authed = original.withAuthHeaders(authType, token.rawValue)
 
         val first = chain.proceed(authed)
-        if (first.isSuccessful) return first
+        if (first.isSuccessful) {
+            return first
+        }
 
         // Peek only; do NOT consume
         val peeked = first.peekBody(PEEK_ERROR_BYTES_MAX).string()
@@ -82,11 +86,16 @@ internal class StreamAuthInterceptor(
                 // refresh & retry once
                 first.close()
                 tokenManager.invalidate().getOrEndpointException("Failed to invalidate token")
-                val refreshed = runBlocking { tokenManager.refresh() }
-                    .getOrEndpointException("Failed to refresh token")
+                val refreshed =
+                    runBlocking { tokenManager.refresh() }
+                        .getOrEndpointException("Failed to refresh token")
 
-                val retried = original.withAuthHeaders(authType, refreshed.rawValue)
-                    .newBuilder().header(HEADER_RETRIED_ON_AUTH, "present").build()
+                val retried =
+                    original
+                        .withAuthHeaders(authType, refreshed.rawValue)
+                        .newBuilder()
+                        .header(HEADER_RETRIED_ON_AUTH, "present")
+                        .build()
 
                 return chain.proceed(retried) // pass result (ok or error) downstream
             }
@@ -100,7 +109,6 @@ internal class StreamAuthInterceptor(
         }
     }
 
-
     private fun Request.withAuthHeaders(authType: String, bearer: String): Request =
         newBuilder()
             .addHeader(HEADER_STREAM_AUTH_TYPE, authType)

stream-android-core/src/test/java/io/getstream/android/core/internal/http/interceptor/StreamAuthInterceptorTest.kt

@@ -17,7 +17,6 @@ package io.getstream.android.core.internal.http.interceptor
 
 import io.getstream.android.core.api.authentication.StreamTokenManager
 import io.getstream.android.core.api.model.exceptions.StreamEndpointErrorData
-import io.getstream.android.core.api.model.exceptions.StreamEndpointException
 import io.getstream.android.core.api.model.value.StreamToken
 import io.getstream.android.core.api.serialization.StreamJsonSerialization
 import io.mockk.MockKAnnotations
@@ -28,7 +27,6 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.verify
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
@@ -196,7 +194,7 @@ class StreamAuthInterceptorTest {
         // Proper token error code handled by this interceptor
         val tokenError = tokenErrorData(40)
         every { json.fromJson(any(), StreamEndpointErrorData::class.java) } returns
-                Result.success(tokenError)
+            Result.success(tokenError)
 
         val interceptor = StreamAuthInterceptor(tokenManager, json, authType = "jwt")
         val client = client(interceptor)
@@ -205,15 +203,18 @@ class StreamAuthInterceptorTest {
 
         val url = server.url("/v1/protected")
 
-        client.newCall(
-            Request.Builder()
-                .url(url)
-                .header("x-stream-retried-on-auth", "present") // simulate already retried
-                .build()
-        ).execute().use { resp ->
-            assertFalse(resp.isSuccessful) // pass-through, no exception here
-            assertEquals(401, resp.code)
-        }
+        client
+            .newCall(
+                Request.Builder()
+                    .url(url)
+                    .header("x-stream-retried-on-auth", "present") // simulate already retried
+                    .build()
+            )
+            .execute()
+            .use { resp ->
+                assertFalse(resp.isSuccessful) // pass-through, no exception here
+                assertEquals(401, resp.code)
+            }
 
         val first = server.takeRequest(2, TimeUnit.SECONDS)
         kotlin.test.assertNotNull(first)
@@ -225,9 +226,7 @@ class StreamAuthInterceptorTest {
         coVerify(exactly = 0) { tokenManager.refresh() }
     }
 
-    /**
-     * Non-token error codes are NOT handled here; pass response through without retry.
-     */
+    /** Non-token error codes are NOT handled here; pass response through without retry. */
     @Test
     fun `non-token error passes through without retry`() {
         val token = streamToken("t1")
@@ -236,7 +235,7 @@ class StreamAuthInterceptorTest {
         // e.g., business error code that is not 40/41/42
         val nonTokenError = tokenErrorData(13)
         every { json.fromJson(any(), StreamEndpointErrorData::class.java) } returns
-                Result.success(nonTokenError)
+            Result.success(nonTokenError)
 
         val interceptor = StreamAuthInterceptor(tokenManager, json, authType = "jwt")
         val client = client(interceptor)
@@ -258,16 +257,14 @@ class StreamAuthInterceptorTest {
         coVerify(exactly = 0) { tokenManager.refresh() }
     }
 
-    /**
-     * If the error body cannot be parsed into StreamEndpointErrorData, pass through.
-     */
+    /** If the error body cannot be parsed into StreamEndpointErrorData, pass through. */
     @Test
     fun `unparsable error body passes through without retry`() {
         val token = streamToken("t1")
         coEvery { tokenManager.loadIfAbsent() } returns Result.success(token)
 
         every { json.fromJson(any(), StreamEndpointErrorData::class.java) } returns
-                Result.failure(IllegalStateException("bad json"))
+            Result.failure(IllegalStateException("bad json"))
 
         val interceptor = StreamAuthInterceptor(tokenManager, json, authType = "jwt")
         val client = client(interceptor)
@@ -291,7 +288,6 @@ class StreamAuthInterceptorTest {
         coVerify(exactly = 0) { tokenManager.refresh() }
     }
 
-
     // ----------------- Helpers -----------------
 
     private fun client(interceptor: Interceptor): OkHttpClient =