Merge remote-tracking branch 'origin/adjustments' into adjustments

Author: aleksandar-apostolov

app/src/main/java/io/getstream/android/core/sample/client/StreamClient.kt

@@ -29,7 +29,7 @@ import io.getstream.android.core.api.processing.StreamBatcher
 import io.getstream.android.core.api.processing.StreamRetryProcessor
 import io.getstream.android.core.api.processing.StreamSerialProcessingQueue
 import io.getstream.android.core.api.processing.StreamSingleFlightProcessor
-import io.getstream.android.core.api.serialization.StreamProductEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 import io.getstream.android.core.api.socket.StreamConnectionIdHolder
 import io.getstream.android.core.api.socket.StreamWebSocketFactory
 import io.getstream.android.core.api.socket.listeners.StreamClientListener
@@ -107,7 +107,7 @@ fun createStreamClient(
         healthMonitor = healthMonitor,
         serializationConfig =
             StreamClientSerializationConfig.default(
-                object : StreamProductEventSerialization<Unit> {
+                object : StreamEventSerialization<Unit> {
                     override fun serialize(data: Unit): Result<String> = Result.success("")
 
                     override fun deserialize(raw: String): Result<Unit> = Result.success(Unit)

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

@@ -33,7 +33,7 @@ import io.getstream.android.core.api.processing.StreamBatcher
 import io.getstream.android.core.api.processing.StreamRetryProcessor
 import io.getstream.android.core.api.processing.StreamSerialProcessingQueue
 import io.getstream.android.core.api.processing.StreamSingleFlightProcessor
-import io.getstream.android.core.api.serialization.StreamClientEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 import io.getstream.android.core.api.socket.StreamConnectionIdHolder
 import io.getstream.android.core.api.socket.StreamWebSocket
 import io.getstream.android.core.api.socket.StreamWebSocketFactory
@@ -293,7 +293,7 @@ fun StreamClient(
                     StreamCompositeEventSerializationImpl(
                         internal =
                             serializationConfig.eventParser
-                                ?: StreamClientEventSerialization(compositeSerialization),
+                                ?: StreamEventSerialization(compositeSerialization),
                         external = serializationConfig.productEventSerializers,
                     ),
                 healthMonitor = healthMonitor,

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

@@ -16,9 +16,9 @@
 package io.getstream.android.core.api.model.config
 
 import io.getstream.android.core.annotations.StreamCoreApi
-import io.getstream.android.core.api.serialization.StreamClientEventSerialization
+import io.getstream.android.core.api.model.event.StreamClientWsEvent
 import io.getstream.android.core.api.serialization.StreamJsonSerialization
-import io.getstream.android.core.api.serialization.StreamProductEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 
 /**
  * Configuration for serialization and deserialization in the Stream client.
@@ -31,8 +31,8 @@ import io.getstream.android.core.api.serialization.StreamProductEventSerializati
 data class StreamClientSerializationConfig
 private constructor(
     val json: StreamJsonSerialization? = null,
-    val eventParser: StreamClientEventSerialization? = null,
-    val productEventSerializers: StreamProductEventSerialization<*>,
+    val eventParser: StreamEventSerialization<StreamClientWsEvent>? = null,
+    val productEventSerializers: StreamEventSerialization<*>,
     val internalTypes: Set<String> = setOf("connection.ok", "connection.error", "health.check"),
     val alsoExternal: Set<String> = emptySet(),
 ) {
@@ -45,7 +45,7 @@ private constructor(
          * @return A default [StreamClientSerializationConfig].
          */
         fun <T> default(
-            productEvents: StreamProductEventSerialization<T>,
+            productEvents: StreamEventSerialization<T>,
             alsoExternal: Set<String> = emptySet(),
         ) =
             StreamClientSerializationConfig(
@@ -63,7 +63,7 @@ private constructor(
          */
         fun <T> json(
             serialization: StreamJsonSerialization,
-            productEvents: StreamProductEventSerialization<T>,
+            productEvents: StreamEventSerialization<T>,
             alsoExternal: Set<String> = emptySet(),
         ) =
             StreamClientSerializationConfig(
@@ -81,8 +81,8 @@ private constructor(
          * @return A [StreamClientSerializationConfig] with the given event parsing.
          */
         fun <T> event(
-            serialization: StreamClientEventSerialization,
-            productEvents: StreamProductEventSerialization<T>,
+            serialization: StreamEventSerialization<StreamClientWsEvent>,
+            productEvents: StreamEventSerialization<T>,
             alsoExternal: Set<String> = emptySet(),
         ) =
             StreamClientSerializationConfig(

stream-android-core/src/main/java/io/getstream/android/core/api/model/exceptions/StreamEndpointErrorData.kt

@@ -15,6 +15,7 @@
  */
 package io.getstream.android.core.api.model.exceptions
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import io.getstream.android.core.annotations.StreamCoreApi
 
@@ -40,12 +41,12 @@ import io.getstream.android.core.annotations.StreamCoreApi
 @StreamCoreApi
 @JsonClass(generateAdapter = true)
 public data class StreamEndpointErrorData(
-    val code: Int,
-    val duration: String,
-    val message: String,
-    val moreInfo: String,
-    val statusCode: Int,
-    val details: List<Int>,
-    val unrecoverable: Boolean? = null,
-    val exceptionFields: Map<String, String>? = null,
+    @Json(name = "code") val code: Int,
+    @Json(name = "duration") val duration: String? = null,
+    @Json(name = "message") val message: String? = null,
+    @Json(name = "more_info") val moreInfo: String? = null,
+    @Json(name = "StatusCode") val statusCode: Int? = null,
+    @Json(name = "details") val details: List<Int>? = null,
+    @Json(name = "unrecoverable") val unrecoverable: Boolean? = null,
+    @Json(name = "exception_fields") val exceptionFields: Map<String, String>? = null,
 )

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

@@ -16,6 +16,8 @@
 package io.getstream.android.core.api.serialization
 
 import io.getstream.android.core.annotations.StreamCoreApi
+import io.getstream.android.core.api.model.event.StreamClientWsEvent
+import io.getstream.android.core.internal.serialization.StreamClientEventSerializationImpl
 
 /**
  * Interface for serializing and deserializing product event objects.
@@ -26,7 +28,7 @@ import io.getstream.android.core.annotations.StreamCoreApi
  * @param T The product event type handled by this interface.
  */
 @StreamCoreApi
-interface StreamProductEventSerialization<T> {
+interface StreamEventSerialization<T> {
 
     /**
      * Encodes a product event into a [String] suitable for transport or storage.
@@ -46,3 +48,17 @@ interface StreamProductEventSerialization<T> {
      */
     fun deserialize(raw: String): Result<T>
 }
+
+
+
+/**
+ * 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.
+ * @return A new [StreamEventSerialization] instance.
+ */
+@StreamCoreApi
+fun StreamEventSerialization(
+    jsonParser: StreamJsonSerialization
+): StreamEventSerialization<StreamClientWsEvent> = StreamClientEventSerializationImpl(jsonParser)

…ation/StreamProductEventSerialization.kt …erialization/StreamEventSerialization.ktstream-android-core/src/main/java/io/getstream/android/core/api/serialization/StreamProductEventSerialization.kt renamed to stream-android-core/src/main/java/io/getstream/android/core/api/serialization/StreamEventSerialization.kt stream-android-core/src/main/java/io/getstream/android/core/api/serialization/StreamProductEventSerialization.kt renamed to stream-android-core/src/main/java/io/getstream/android/core/api/serialization/StreamEventSerialization.kt

@@ -16,11 +16,11 @@
 package io.getstream.android.core.internal.serialization
 
 import io.getstream.android.core.api.model.event.StreamClientWsEvent
-import io.getstream.android.core.api.serialization.StreamClientEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 import io.getstream.android.core.api.serialization.StreamJsonSerialization
 
 internal class StreamClientEventSerializationImpl(private val jsonParser: StreamJsonSerialization) :
-    StreamClientEventSerialization {
+    StreamEventSerialization<StreamClientWsEvent> {
     override fun serialize(data: StreamClientWsEvent): Result<String> = jsonParser.toJson(data)
 
     override fun deserialize(raw: String): Result<StreamClientWsEvent> =

stream-android-core/src/main/java/io/getstream/android/core/internal/serialization/StreamClientEventSerializationImpl.kt

@@ -17,8 +17,7 @@ package io.getstream.android.core.internal.serialization
 
 import com.squareup.moshi.JsonReader
 import io.getstream.android.core.api.model.event.StreamClientWsEvent
-import io.getstream.android.core.api.serialization.StreamClientEventSerialization
-import io.getstream.android.core.api.serialization.StreamProductEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 import io.getstream.android.core.api.utils.runCatchingCancellable
 import okio.Buffer
 
@@ -65,8 +64,8 @@ private constructor(val core: StreamClientWsEvent? = null, val product: T? = nul
  * @param T The type of the product-specific event.
  */
 internal class StreamCompositeEventSerializationImpl<T>(
-    private val internal: StreamClientEventSerialization,
-    private val external: StreamProductEventSerialization<T>,
+    private val internal: StreamEventSerialization<StreamClientWsEvent>,
+    private val external: StreamEventSerialization<T>,
     private val internalTypes: Set<String> =
         setOf("connection.ok", "connection.error", "health.check"),
     private val alsoExternal: Set<String> = emptySet(),

stream-android-core/src/main/java/io/getstream/android/core/internal/serialization/StreamCompositeEventSerializationImpl.kt

@@ -16,17 +16,16 @@
 package io.getstream.android.core.internal.serialization
 
 import io.getstream.android.core.api.model.event.StreamClientWsEvent
-import io.getstream.android.core.api.serialization.StreamClientEventSerialization
-import io.getstream.android.core.api.serialization.StreamProductEventSerialization
+import io.getstream.android.core.api.serialization.StreamEventSerialization
 import io.mockk.*
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 
 class StreamCompositeEventSerializationImplTest {
 
-    private lateinit var internalSer: StreamClientEventSerialization
-    private lateinit var externalSer: StreamProductEventSerialization<String>
+    private lateinit var internalSer: StreamEventSerialization<StreamClientWsEvent>
+    private lateinit var externalSer: StreamEventSerialization<String>
     private lateinit var coreEvent: StreamClientWsEvent
 
     @Before