Skip to content

Commit 4667484

Browse files
VelikovPetarVelikovPetar
authored
Remove unused UpstreamChannelDto and rename BaseChatModule (#6007)
* Remove unused UpstreamChannelDto and rename BaseChatModule. * Remove unused UpstreamChannelDto and rename BaseChatModule.
1 parent 3e55993 commit 4667484

8 files changed

Lines changed: 5 additions & 254 deletions

File tree

‎stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import io.getstream.chat.android.client.clientstate.UserStateService
7878
import io.getstream.chat.android.client.debugger.ChatClientDebugger
7979
import io.getstream.chat.android.client.debugger.SendMessageDebugger
8080
import io.getstream.chat.android.client.debugger.StubChatClientDebugger
81-
import io.getstream.chat.android.client.di.BaseChatModule
81+
import io.getstream.chat.android.client.di.ChatModule
8282
import io.getstream.chat.android.client.errorhandler.ErrorHandler
8383
import io.getstream.chat.android.client.errorhandler.onCreateChannelError
8484
import io.getstream.chat.android.client.errorhandler.onMessageError
@@ -4744,7 +4744,7 @@ internal constructor(
47444744
}
47454745

47464746
val module =
4747-
BaseChatModule(
4747+
ChatModule(
47484748
appContext = appContext,
47494749
clientScope = clientScope,
47504750
userScope = userScope,

‎stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/ChannelDtos.kt‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,8 @@
1717
package io.getstream.chat.android.client.api2.model.dto
1818

1919
import com.squareup.moshi.JsonClass
20-
import io.getstream.chat.android.core.internal.StreamHandsOff
2120
import java.util.Date
2221

23-
@StreamHandsOff(
24-
reason = "Field names can't be changed because [CustomObjectDtoAdapter] class uses reflections to add/remove " +
25-
"content of [extraData] map",
26-
)
27-
@JsonClass(generateAdapter = true)
28-
internal data class UpstreamChannelDto(
29-
val cid: String,
30-
val id: String,
31-
val type: String,
32-
val name: String,
33-
val image: String,
34-
val watcher_count: Int,
35-
val frozen: Boolean,
36-
val last_message_at: Date?,
37-
val created_at: Date?,
38-
val deleted_at: Date?,
39-
val updated_at: Date?,
40-
val member_count: Int,
41-
val messages: List<UpstreamMessageDto>,
42-
val members: List<UpstreamMemberDto>,
43-
val watchers: List<UpstreamUserDto>,
44-
val read: List<UpstreamChannelUserRead>,
45-
val config: ConfigDto,
46-
val created_by: UpstreamUserDto,
47-
val team: String,
48-
val cooldown: Int,
49-
val pinned_messages: List<UpstreamMessageDto>,
50-
51-
val extraData: Map<String, Any>,
52-
) : ExtraDataDto
53-
5422
@JsonClass(generateAdapter = true)
5523
internal data class DownstreamChannelDto(
5624
val cid: String,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/di/BaseChatModule.kt renamed to stream-chat-android-client/src/main/java/io/getstream/chat/android/client/di/ChatModule.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ import java.util.concurrent.TimeUnit
117117
* @param appVersion Optional app version added to default headers for tracking.
118118
*/
119119
@Suppress("TooManyFunctions")
120-
internal open class BaseChatModule
120+
internal class ChatModule
121121
@Suppress("LongParameterList")
122122
constructor(
123123
private val appContext: Context,
@@ -261,7 +261,7 @@ constructor(
261261
}
262262
}
263263

264-
protected open fun clientBuilder(
264+
private fun clientBuilder(
265265
timeout: Long,
266266
config: ChatClientConfig,
267267
parser: ChatParser,
@@ -404,6 +404,6 @@ constructor(
404404

405405
private companion object {
406406
private const val BASE_TIMEOUT = 30_000L
407-
private var CDN_TIMEOUT = 30_000L
407+
private const val CDN_TIMEOUT = 30_000L
408408
}
409409
}

‎stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadInfoDto
4242
import io.getstream.chat.android.client.parser2.adapters.DownstreamUserDtoAdapter
4343
import io.getstream.chat.android.client.parser2.adapters.EventAdapterFactory
4444
import io.getstream.chat.android.client.parser2.adapters.ExactDateAdapter
45-
import io.getstream.chat.android.client.parser2.adapters.UpstreamChannelDtoAdapter
4645
import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDataDtoAdapter
4746
import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDtoAdapter
4847
import io.getstream.chat.android.client.parser2.adapters.UpstreamMessageDtoAdapter
@@ -67,7 +66,6 @@ internal class MoshiChatParser(
6766
.add(DownstreamModerationDetailsDtoAdapter)
6867
.add(UpstreamMessageDtoAdapter)
6968
.add(DownstreamChannelDtoAdapter)
70-
.add(UpstreamChannelDtoAdapter)
7169
.add(AttachmentDtoAdapter)
7270
.add(DownstreamReactionDtoAdapter)
7371
.add(UpstreamReactionDtoAdapter)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/ChannelDtoAdapters.kt renamed to stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/DownstreamChannelDtoAdapter.kt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.squareup.moshi.JsonReader
2222
import com.squareup.moshi.JsonWriter
2323
import com.squareup.moshi.ToJson
2424
import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
25-
import io.getstream.chat.android.client.api2.model.dto.UpstreamChannelDto
2625

2726
internal object DownstreamChannelDtoAdapter :
2827
CustomObjectDtoAdapter<DownstreamChannelDto>(DownstreamChannelDto::class) {
@@ -38,19 +37,3 @@ internal object DownstreamChannelDtoAdapter :
3837
@Suppress("UNUSED_PARAMETER")
3938
fun toJson(jsonWriter: JsonWriter, value: DownstreamChannelDto): Unit = error("Can't convert this to Json")
4039
}
41-
42-
internal object UpstreamChannelDtoAdapter :
43-
CustomObjectDtoAdapter<UpstreamChannelDto>(UpstreamChannelDto::class) {
44-
45-
@FromJson
46-
@Suppress("UNUSED_PARAMETER")
47-
fun fromJson(jsonReader: JsonReader): UpstreamChannelDto = error("Can't parse this from Json")
48-
49-
@ToJson
50-
fun toJson(
51-
jsonWriter: JsonWriter,
52-
message: UpstreamChannelDto?,
53-
mapAdapter: JsonAdapter<MutableMap<String, Any?>>,
54-
messageAdapter: JsonAdapter<UpstreamChannelDto>,
55-
) = serializeWithExtraData(jsonWriter, message, mapAdapter, messageAdapter)
56-
}

‎stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/UpstreamChannelDtoAdapterTest.kt‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/ChannelDtoTestData.kt‎

Lines changed: 0 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ import io.getstream.chat.android.client.api2.model.dto.ConfigDto
2121
import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
2222
import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelUserRead
2323
import io.getstream.chat.android.client.api2.model.dto.DownstreamMemberDto
24-
import io.getstream.chat.android.client.api2.model.dto.UpstreamChannelDto
25-
import io.getstream.chat.android.client.api2.model.dto.UpstreamChannelUserRead
26-
import io.getstream.chat.android.client.api2.model.dto.UpstreamMemberDto
2724
import io.getstream.chat.android.models.ChannelCapabilities
2825
import org.intellij.lang.annotations.Language
2926
import java.util.Date
@@ -311,149 +308,4 @@ internal object ChannelDtoTestData {
311308
membership = null,
312309
extraData = emptyMap(),
313310
)
314-
315-
@Language("JSON")
316-
val upstreamJson =
317-
"""{
318-
"cid": "channelType:channelId",
319-
"id": "channelId",
320-
"type": "channelType",
321-
"name": "channelName",
322-
"image": "channelImage",
323-
"watcher_count": 1,
324-
"frozen": false,
325-
"last_message_at": "2020-06-10T11:04:31.588Z",
326-
"created_at": "2020-06-10T11:04:31.000Z",
327-
"deleted_at": "2020-06-10T11:04:31.588Z",
328-
"updated_at": "2020-06-10T11:04:31.588Z",
329-
"member_count": 2,
330-
"messages": [${MessageDtoTestData.upstreamJson}],
331-
"members": [
332-
{
333-
"user": ${UserDtoTestData.upstreamJson},
334-
"created_at": "2020-06-10T11:04:31.000Z",
335-
"updated_at": "2020-06-10T11:04:31.588Z",
336-
"invited": true,
337-
"invite_accepted_at": "2020-06-10T11:04:31.588Z",
338-
"shadow_banned": false,
339-
"banned": false,
340-
"channel_role": "member",
341-
"notifications_muted": false,
342-
"status": "member",
343-
"ban_expires" : "2021-03-08T15:42:31.355Z",
344-
"pinned_at": "2020-06-10T11:04:31.588Z",
345-
"archived_at": "2020-06-10T11:04:31.588Z"
346-
}
347-
],
348-
"watchers": [${UserDtoTestData.upstreamJson}],
349-
"read": [
350-
{
351-
"user": ${UserDtoTestData.upstreamJson},
352-
"last_read": "2020-06-10T11:04:31.000Z",
353-
"unread_messages": 1
354-
}
355-
],
356-
"config": $configJson,
357-
"created_by": ${UserDtoTestData.upstreamJson},
358-
"team": "team1",
359-
"cooldown": 1,
360-
"pinned_messages": [${MessageDtoTestData.upstreamJson}],
361-
"draft": true
362-
}
363-
""".withoutWhitespace()
364-
val upstreamChannel = UpstreamChannelDto(
365-
cid = "channelType:channelId",
366-
id = "channelId",
367-
type = "channelType",
368-
name = "channelName",
369-
image = "channelImage",
370-
watcher_count = 1,
371-
frozen = false,
372-
last_message_at = Date(1591787071588),
373-
created_at = Date(1591787071000),
374-
deleted_at = Date(1591787071588),
375-
updated_at = Date(1591787071588),
376-
member_count = 2,
377-
messages = listOf(MessageDtoTestData.upstreamMessage),
378-
members = listOf(
379-
UpstreamMemberDto(
380-
user = UserDtoTestData.upstreamUser,
381-
created_at = Date(1591787071000),
382-
updated_at = Date(1591787071588),
383-
invited = true,
384-
invite_accepted_at = Date(1591787071588),
385-
invite_rejected_at = null,
386-
shadow_banned = false,
387-
banned = false,
388-
channel_role = "member",
389-
notifications_muted = false,
390-
status = "member",
391-
ban_expires = Date(1615218151355),
392-
pinned_at = Date(1591787071588),
393-
archived_at = Date(1591787071588),
394-
extraData = emptyMap(),
395-
),
396-
),
397-
watchers = listOf(UserDtoTestData.upstreamUser),
398-
read = listOf(
399-
UpstreamChannelUserRead(
400-
user = UserDtoTestData.upstreamUser,
401-
last_read = Date(1591787071000),
402-
unread_messages = 1,
403-
),
404-
),
405-
config = configDto,
406-
created_by = UserDtoTestData.upstreamUser,
407-
team = "team1",
408-
cooldown = 1,
409-
pinned_messages = listOf(MessageDtoTestData.upstreamMessage),
410-
extraData = mapOf("draft" to true),
411-
)
412-
413-
@Language("JSON")
414-
val upstreamJsonWithoutExtraData =
415-
"""{
416-
"cid": "channelType:channelId",
417-
"id": "channelId",
418-
"type": "channelType",
419-
"name": "channelName",
420-
"image": "channelImage",
421-
"watcher_count": 0,
422-
"frozen": false,
423-
"member_count": 0,
424-
"messages": [],
425-
"members": [],
426-
"watchers": [],
427-
"read": [],
428-
"config": $configJson,
429-
"created_by": ${UserDtoTestData.upstreamJson},
430-
"team": "",
431-
"cooldown": 0,
432-
"pinned_messages": []
433-
}
434-
""".withoutWhitespace()
435-
val upstreamChannelWithoutExtraData = UpstreamChannelDto(
436-
cid = "channelType:channelId",
437-
id = "channelId",
438-
type = "channelType",
439-
name = "channelName",
440-
image = "channelImage",
441-
watcher_count = 0,
442-
frozen = false,
443-
last_message_at = null,
444-
created_at = null,
445-
deleted_at = null,
446-
updated_at = null,
447-
member_count = 0,
448-
messages = emptyList(),
449-
members = emptyList(),
450-
watchers = emptyList(),
451-
read = emptyList(),
452-
config = configDto,
453-
created_by = UserDtoTestData.upstreamUser,
454-
team = "",
455-
cooldown = 0,
456-
pinned_messages = emptyList(),
457-
extraData = emptyMap(),
458-
)
459311
}

‎stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/DtoTestDataTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ internal class DtoTestDataTest {
4444
anyAdapter.fromJson(ChannelDtoTestData.configJson)
4545
anyAdapter.fromJson(ChannelDtoTestData.downstreamJson)
4646
anyAdapter.fromJson(ChannelDtoTestData.downstreamJsonWithoutExtraData)
47-
anyAdapter.fromJson(ChannelDtoTestData.upstreamJson)
48-
anyAdapter.fromJson(ChannelDtoTestData.upstreamJsonWithoutExtraData)
4947

5048
anyAdapter.fromJson(AttachmentDtoTestData.json)
5149
anyAdapter.fromJson(AttachmentDtoTestData.jsonWithoutExtraData)

0 commit comments

Comments
 (0)