Skip to content

Commit a639478

Browse files
kleewhokleewho
authored
Remove warnings, improve the build
 * To address deprecation in most places not deprecated has been used. In those specific areas where we actually want to verify that our deprecated methods are working I added SUPPRESS annotations. * ktlint debug has been disabled to reduce the amount of information produced * .editorconfig file used the suggested by ktlint value * Compile integration tests when compiling project
1 parent fabcacb commit a639478

File tree

73 files changed

+221
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+221
-174
lines changed

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ allprojects {
4545
ktlint {
4646
outputToConsole = true
4747
verbose = true
48-
debug = true
4948
additionalEditorconfigFile = file("check/.editorconfig")
5049
kotlinScriptAdditionalPaths {
5150
include fileTree("src/integrationTest/")
@@ -67,6 +66,8 @@ allprojects {
6766
compileTestKotlin {
6867
kotlinOptions.jvmTarget = "1.8"
6968
}
69+
70+
compileKotlin.finalizedBy(task("compileIntegrationTest"))
7071
}
7172
sourceCompatibility = 1.8
7273
targetCompatibility = 1.8

‎check/.editorconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
root = true
22

33
[*.{kt, kts}]
4-
disabled_rules = import-ordering
5-
kotlin_imports_layout = idea
4+
ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
65
indent_size = 4
76
ij_kotlin_keep_blank_lines_in_declarations = 1
87
ij_kotlin_keep_blank_lines_in_code = 1

‎pubnub-memberships/src/integrationTest/kotlin/com/pubnub/membership/MembershipIntegTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.pubnub.membership
22

3-
import com.pubnub.api.PNConfiguration
43
import com.pubnub.api.PubNub
54
import com.pubnub.api.SpaceId
65
import com.pubnub.api.UserId
@@ -57,7 +56,7 @@ class MembershipIntegTest {
5756

5857
@BeforeEach
5958
fun setUp() {
60-
val config = PNConfiguration(USER_ID).apply {
59+
val config = PNConfiguration(userId = UserId(uuid)).apply {
6160
subscribeKey = IntegTestConf.subscribeKey
6261
publishKey = IntegTestConf.publishKey
6362
IntegTestConf.origin?.let {

‎pubnub-memberships/src/main/kotlin/com/pubnub/membership/models/consumer/Membership.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ data class Membership(
5050
}
5151

5252
internal fun PNChannelMembership.toUserMembership(userId: UserId): Membership {
53+
@Suppress("UNCHECKED_CAST")
5354
return Membership(
5455
user = User(id = userId),
5556
space = channel?.toSpace(),
@@ -61,6 +62,7 @@ internal fun PNChannelMembership.toUserMembership(userId: UserId): Membership {
6162
}
6263

6364
internal fun PNMember.toSpaceMembership(spaceId: SpaceId): Membership {
65+
@Suppress("UNCHECKED_CAST")
6466
return Membership(
6567
user = uuid?.toUser(),
6668
space = Space(id = spaceId),

‎pubnub-memberships/src/main/kotlin/com/pubnub/membership/models/consumer/MembershipEvent.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ data class MembershipRemoved(
4040
fun PNObjectEventResult.toMembershipEvent(): MembershipEvent? {
4141
return when (val m = extractedMessage) {
4242
is PNSetMembershipEventMessage -> {
43+
@Suppress("UNCHECKED_CAST")
4344
MembershipModified(
4445
data = MembershipModified.Data(
4546
space = Space(id = SpaceId(m.data.channel)),

‎pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/SpaceIntegTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package com.pubnub.space
33
import com.pubnub.api.PNConfiguration
44
import com.pubnub.api.PubNub
55
import com.pubnub.api.PubNubException
6+
import com.pubnub.api.SpaceId
67
import com.pubnub.api.UserId
78
import com.pubnub.api.callbacks.SubscribeCallback
89
import com.pubnub.api.enums.PNLogVerbosity
910
import com.pubnub.api.enums.PNStatusCategory
1011
import com.pubnub.api.models.consumer.PNStatus
1112
import com.pubnub.api.models.consumer.objects.ResultSortKey
1213
import com.pubnub.space.models.consumer.Space
13-
import com.pubnub.space.models.consumer.SpaceId
1414
import com.pubnub.space.models.consumer.SpaceKey
1515
import com.pubnub.space.models.consumer.SpaceModified
1616
import com.pubnub.space.models.consumer.SpacesResult
@@ -38,7 +38,7 @@ class SpaceIntegTest {
3838

3939
@BeforeEach
4040
fun setUp() {
41-
val config = PNConfiguration(UserId("kotlin")).apply {
41+
val config = PNConfiguration(userId = UserId("kotlin")).apply {
4242
subscribeKey = IntegTestConf.subscribeKey
4343
publishKey = IntegTestConf.publishKey
4444
IntegTestConf.origin?.let {

‎pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/Space.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ data class Space(
1515
)
1616

1717
fun PNChannelMetadata.toSpace(): Space {
18+
@Suppress("UNCHECKED_CAST")
1819
return Space(
1920
id = SpaceId(id),
2021
name = name,

‎pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceEvent.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ data class SpaceRemoved(
3636
fun PNObjectEventResult.toSpaceEvent(): SpaceEvent? {
3737
return when (val m = extractedMessage) {
3838
is PNSetChannelMetadataEventMessage -> {
39+
@Suppress("UNCHECKED_CAST")
3940
SpaceModified(
4041
spaceId = SpaceId(channel), timetoken = timetoken ?: 0,
4142
data = SpaceModified.Data(

‎pubnub-users/src/integrationTest/kotlin/com/pubnub/user/UserIntegTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class UserIntegTest {
3939

4040
@BeforeEach
4141
fun setUp() {
42-
val config = PNConfiguration(UserId("kotlin")).apply {
42+
val config = PNConfiguration(userId = UserId("kotlin")).apply {
4343
subscribeKey = IntegTestConf.subscribeKey
4444
publishKey = IntegTestConf.publishKey
4545
IntegTestConf.origin?.let {

‎pubnub-users/src/main/kotlin/com/pubnub/user/models/consumer/User.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ data class User(
1717
)
1818

1919
fun PNUUIDMetadata.toUser(): User {
20+
@Suppress("UNCHECKED_CAST")
2021
return User(
2122
id = UserId(id),
2223
name = name,

‎pubnub-users/src/main/kotlin/com/pubnub/user/models/consumer/UserEvent.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ data class UserRemoved(
3939
fun PNObjectEventResult.toUserEvent(): UserEvent? {
4040
return when (val m = extractedMessage) {
4141
is PNSetUUIDMetadataEventMessage -> {
42+
@Suppress("UNCHECKED_CAST")
4243
UserModified(
4344
spaceId = channel,
4445
timetoken = timetoken ?: 0,

‎src/integrationTest/kotlin/com/pubnub/api/integration/AppTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.pubnub.api.integration
22

33
import com.pubnub.api.Keys
4-
import com.pubnub.api.PNConfiguration
54
import com.pubnub.api.PubNub
5+
import com.pubnub.api.UserId
66
import com.pubnub.api.callbacks.SubscribeCallback
77
import com.pubnub.api.enums.PNLogVerbosity
88
import com.pubnub.api.enums.PNOperationType
@@ -31,7 +31,7 @@ class AppTest {
3131
@Before
3232
fun initPubnub() {
3333
pubnub = PubNub(
34-
PNConfiguration(PubNub.generateUUID()).apply {
34+
PNConfiguration(userId = UserId(PubNub.generateUUID())).apply {
3535
subscribeKey = Keys.subKey
3636
publishKey = Keys.pubKey
3737
logVerbosity = PNLogVerbosity.BODY
@@ -128,7 +128,7 @@ class AppTest {
128128
.with()
129129
.until {
130130
pubnub.whereNow(
131-
uuid = pubnub.configuration.uuid
131+
uuid = pubnub.configuration.userId.value
132132
).sync()!!
133133
.channels
134134
.containsAll(expectedChannels)

‎src/integrationTest/kotlin/com/pubnub/api/integration/BaseIntegrationTest.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.pubnub.api.CommonUtils.createInterceptor
44
import com.pubnub.api.Keys
55
import com.pubnub.api.PNConfiguration
66
import com.pubnub.api.PubNub
7+
import com.pubnub.api.UserId
78
import com.pubnub.api.enums.PNLogVerbosity
89
import org.junit.After
910
import org.junit.Before
@@ -55,7 +56,7 @@ abstract class BaseIntegrationTest {
5556
}
5657

5758
protected open fun getBasicPnConfiguration(): PNConfiguration {
58-
val pnConfiguration = PNConfiguration(PubNub.generateUUID())
59+
val pnConfiguration = PNConfiguration(userId = UserId(PubNub.generateUUID()))
5960
if (!needsServer()) {
6061
pnConfiguration.subscribeKey = Keys.subKey
6162
pnConfiguration.publishKey = Keys.pubKey
@@ -67,19 +68,19 @@ abstract class BaseIntegrationTest {
6768
pnConfiguration.logVerbosity = PNLogVerbosity.NONE
6869
pnConfiguration.httpLoggingInterceptor = createInterceptor(logger)
6970

70-
pnConfiguration.uuid = "client-${UUID.randomUUID()}"
71+
pnConfiguration.userId = UserId("client-${UUID.randomUUID()}")
7172
return pnConfiguration
7273
}
7374

7475
private fun getServerPnConfiguration(): PNConfiguration {
75-
val pnConfiguration = PNConfiguration(PubNub.generateUUID())
76+
val pnConfiguration = PNConfiguration(userId = UserId(PubNub.generateUUID()))
7677
pnConfiguration.subscribeKey = Keys.pamSubKey
7778
pnConfiguration.publishKey = Keys.pamPubKey
7879
pnConfiguration.secretKey = Keys.pamSecKey
7980
pnConfiguration.logVerbosity = PNLogVerbosity.NONE
8081
pnConfiguration.httpLoggingInterceptor = createInterceptor(logger)
8182

82-
pnConfiguration.uuid = "server-${UUID.randomUUID()}"
83+
pnConfiguration.userId = UserId("server-${UUID.randomUUID()}")
8384
return pnConfiguration
8485
}
8586

‎src/integrationTest/kotlin/com/pubnub/api/integration/HeartbeatIntegrationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class HeartbeatIntegrationTest : BaseIntegrationTest() {
3131
val expectedStatePayload = generatePayload()
3232

3333
val observer = createPubNub().apply {
34-
configuration.uuid = "observer_${System.currentTimeMillis()}"
34+
configuration.userId.value = "observer_${System.currentTimeMillis()}"
3535
}
3636

3737
pubnub.configuration.presenceTimeout = 20
@@ -51,7 +51,7 @@ class HeartbeatIntegrationTest : BaseIntegrationTest() {
5151
}
5252

5353
override fun presence(p: PubNub, pnPresenceEventResult: PNPresenceEventResult) {
54-
if (pnPresenceEventResult.uuid.equals(pubnub.configuration.uuid) &&
54+
if (pnPresenceEventResult.uuid.equals(pubnub.configuration.userId.value) &&
5555
pnPresenceEventResult.channel.equals(expectedChannel)
5656
) {
5757
when (pnPresenceEventResult.event) {

‎src/integrationTest/kotlin/com/pubnub/api/integration/PresenceEventsIntegrationTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class PresenceEventsIntegrationTests : BaseIntegrationTest() {
140140

141141
override fun presence(pubnub: PubNub, pnPresenceEventResult: PNPresenceEventResult) {
142142
if (pnPresenceEventResult.event == "state-change") {
143-
assertEquals(pubnub.configuration.uuid, pnPresenceEventResult.uuid)
143+
assertEquals(pubnub.configuration.userId.value, pnPresenceEventResult.uuid)
144144
success.set(true)
145145
}
146146
}

‎src/integrationTest/kotlin/com/pubnub/api/integration/PresenceIntegrationTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class PresenceIntegrationTests : BaseIntegrationTest() {
7070
assertTrue(value.occupants.size >= expectedClientsCount)
7171

7272
assertEquals(
73-
clients.map { it.configuration.uuid }.toList(),
73+
clients.map { it.configuration.userId.value }.toList(),
7474
value.occupants.map { it.uuid }.toList()
7575
)
7676
}
@@ -113,7 +113,7 @@ class PresenceIntegrationTests : BaseIntegrationTest() {
113113
val uuid = occupant.uuid
114114
var contains = false
115115
for (client in clients) {
116-
if (client.configuration.uuid == uuid) {
116+
if (client.configuration.userId.value == uuid) {
117117
contains = true
118118
break
119119
}
@@ -136,7 +136,7 @@ class PresenceIntegrationTests : BaseIntegrationTest() {
136136
override fun presence(pubnub: PubNub, pnPresenceEventResult: PNPresenceEventResult) {
137137
if (pnPresenceEventResult.event == "state-change" &&
138138
pnPresenceEventResult.channel == expectedChannel &&
139-
pnPresenceEventResult.uuid == pubnub.configuration.uuid
139+
pnPresenceEventResult.uuid == pubnub.configuration.userId.value
140140
) {
141141
assertEquals(expectedStatePayload, pnPresenceEventResult.state)
142142
hits.incrementAndGet()

‎src/integrationTest/kotlin/com/pubnub/api/integration/PublishIntegrationTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class PublishIntegrationTests : BaseIntegrationTest() {
3838
message = generatePayload()
3939
).await { _, status ->
4040
assertFalse(status.error)
41-
assertEquals(status.uuid, pubnub.configuration.uuid)
41+
assertEquals(status.uuid, pubnub.configuration.userId.value)
4242
}
4343
}
4444

@@ -82,7 +82,7 @@ class PublishIntegrationTests : BaseIntegrationTest() {
8282
shouldStore = false
8383
).await { _, status ->
8484
assertFalse(status.error)
85-
assertEquals(status.uuid, pubnub.configuration.uuid)
85+
assertEquals(status.uuid, pubnub.configuration.userId.value)
8686
}
8787

8888
pubnub.history(
@@ -118,7 +118,7 @@ class PublishIntegrationTests : BaseIntegrationTest() {
118118

119119
override fun message(pubnub: PubNub, pnMessageResult: PNMessageResult) {
120120
assertEquals(expectedChannel, pnMessageResult.channel)
121-
assertEquals(observer.configuration.uuid, pnMessageResult.publisher)
121+
assertEquals(observer.configuration.userId.value, pnMessageResult.publisher)
122122
assertEquals(messagePayload, pnMessageResult.message)
123123
success.set(true)
124124
}

‎src/integrationTest/kotlin/com/pubnub/api/integration/PushIntegrationTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.junit.Assert.assertEquals
66
import org.junit.Assert.assertFalse
77
import org.junit.Assert.assertTrue
88
import org.junit.Test
9+
import java.util.Locale
910
import java.util.UUID
1011

1112
class PushIntegrationTest : BaseIntegrationTest() {
@@ -16,7 +17,7 @@ class PushIntegrationTest : BaseIntegrationTest() {
1617

1718
override fun onBefore() {
1819
expectedChannels =
19-
generateSequence { UUID.randomUUID().toString().substring(0, 8).toUpperCase() }.take(3).toList()
20+
generateSequence { UUID.randomUUID().toString().substring(0, 8).uppercase(Locale.getDefault()) }.take(3).toList()
2021
expectedDeviceId =
2122
generateSequence { (0..9).random() }.take(70).toList().shuffled().joinToString(separator = "")
2223
expectedTopic = UUID.randomUUID().toString()

‎src/integrationTest/kotlin/com/pubnub/api/integration/SignalIntegrationTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SignalIntegrationTests : BaseIntegrationTest() {
3636
).await { result, status ->
3737
assertFalse(status.error)
3838
assertEquals(PNOperationType.PNSignalOperation, status.operation)
39-
assertEquals(status.uuid, pubnub.configuration.uuid)
39+
assertEquals(status.uuid, pubnub.configuration.userId.value)
4040
assertNotNull(result)
4141
}
4242
}
@@ -66,14 +66,14 @@ class SignalIntegrationTests : BaseIntegrationTest() {
6666
).async { result, status ->
6767
assertFalse(status.error)
6868
assertEquals(PNOperationType.PNSignalOperation, status.operation)
69-
assertEquals(status.uuid, pubnub.configuration.uuid)
69+
assertEquals(status.uuid, pubnub.configuration.userId.value)
7070
assertNotNull(result)
7171
}
7272
}
7373
}
7474

7575
override fun signal(pubnub: PubNub, pnSignalResult: PNSignalResult) {
76-
assertEquals(pubnub.configuration.uuid, pnSignalResult.publisher)
76+
assertEquals(pubnub.configuration.userId.value, pnSignalResult.publisher)
7777
assertEquals(expectedChannel, pnSignalResult.channel)
7878
assertEquals(expectedPayload, Gson().fromJson(pnSignalResult.message, String::class.java))
7979
success.set(true)

0 commit comments

Comments
 (0)