Skip to content

Commit

Permalink
Change package in pubnub-users module: entities -> user
Browse files Browse the repository at this point in the history
  • Loading branch information
@kleewho
kleewho authored Jun 14, 2022
1 parent c514d0a commit 7ffb6df
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 41 deletions.
6 changes: 4 additions & 2 deletions pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/MembershipIntegTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import com.pubnub.entities.models.consumer.membership.UserDetailsLevel
import com.pubnub.entities.models.consumer.membership.UserMembershipsResultKey
import com.pubnub.entities.models.consumer.space.Space
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.user.createUser
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId
import com.pubnub.user.removeUser
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue
Expand Down
4 changes: 2 additions & 2 deletions pubnub-memberships/src/main/kotlin/com/pubnub/entities/MembershipExtension.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import com.pubnub.entities.models.consumer.membership.toUserFetchMembershipsResu
import com.pubnub.entities.models.consumer.membership.toUserMembershipsResult
import com.pubnub.entities.models.consumer.space.ISpaceId
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.user.IUserId
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.user.models.consumer.IUserId
import com.pubnub.user.models.consumer.UserId

/**
* Add memberships of user i.e. assign spaces to user, add user to spaces
Expand Down
6 changes: 3 additions & 3 deletions ...-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/Membership.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import com.pubnub.api.models.consumer.objects.membership.PNChannelMembership
import com.pubnub.entities.models.consumer.space.Space
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.space.toSpace
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.entities.models.consumer.user.toUser
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId
import com.pubnub.user.models.consumer.toUser

data class Membership(
val user: User?,
Expand Down
4 changes: 2 additions & 2 deletions ...erships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipEvent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult
import com.pubnub.api.models.consumer.pubsub.objects.PNSetMembershipEventMessage
import com.pubnub.entities.models.consumer.space.Space
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId

sealed class MembershipEvent {
abstract val spaceId: SpaceId
Expand Down
2 changes: 1 addition & 1 deletion ...ships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsResult.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.pubnub.api.models.consumer.objects.PNPage
import com.pubnub.api.models.consumer.objects.member.PNMemberArrayResult
import com.pubnub.api.models.consumer.objects.membership.PNChannelMembershipArrayResult
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.user.models.consumer.UserId

data class MembershipsResult(
val data: Collection<Membership>,
Expand Down
4 changes: 2 additions & 2 deletions pubnub-memberships/src/test/kotlin/com/pubnub/entities/MembershipExtensionKtTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import com.pubnub.entities.models.consumer.membership.MembershipsResult
import com.pubnub.entities.models.consumer.membership.MembershipsStatusResult
import com.pubnub.entities.models.consumer.space.Space
import com.pubnub.entities.models.consumer.space.SpaceId
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
Expand Down
2 changes: 1 addition & 1 deletion pubnub-users/gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
POM_ARTIFACT_ID=pubnub-users
POM_NAME=pubnub-users
POM_PACKAGING=jar
VERSION_NAME=0.1.0
VERSION_NAME=0.2.0
2 changes: 1 addition & 1 deletion .../entities/IntegrationTestConfiguration.kt → ...bnub/user/IntegrationTestConfiguration.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities
package com.pubnub.user

import org.aeonbits.owner.Config
import org.aeonbits.owner.ConfigFactory
Expand Down
12 changes: 6 additions & 6 deletions ...tlin/com/pubnub/entities/UserIntegTest.kt → ...t/kotlin/com/pubnub/user/UserIntegTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities
package com.pubnub.user

import com.pubnub.api.PNConfiguration
import com.pubnub.api.PubNub
Expand All @@ -7,11 +7,11 @@ import com.pubnub.api.callbacks.SubscribeCallback
import com.pubnub.api.enums.PNStatusCategory
import com.pubnub.api.models.consumer.PNStatus
import com.pubnub.api.models.consumer.objects.ResultSortKey
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.entities.models.consumer.user.UserKey
import com.pubnub.entities.models.consumer.user.UserModified
import com.pubnub.entities.models.consumer.user.UsersResult
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId
import com.pubnub.user.models.consumer.UserKey
import com.pubnub.user.models.consumer.UserModified
import com.pubnub.user.models.consumer.UsersResult
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue
Expand Down
22 changes: 11 additions & 11 deletions ...tlin/com/pubnub/entities/UserExtension.kt → ...n/kotlin/com/pubnub/user/UserExtension.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities
package com.pubnub.user

import com.pubnub.api.PubNub
import com.pubnub.api.callbacks.DisposableListener
Expand All @@ -13,16 +13,16 @@ import com.pubnub.api.models.consumer.objects.PNPage
import com.pubnub.api.models.consumer.objects.PNSortKey
import com.pubnub.api.models.consumer.objects.ResultSortKey
import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult
import com.pubnub.entities.models.consumer.user.RemoveUserResult
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserEvent
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.entities.models.consumer.user.UserKey
import com.pubnub.entities.models.consumer.user.UsersResult
import com.pubnub.entities.models.consumer.user.toRemoveUserResult
import com.pubnub.entities.models.consumer.user.toUser
import com.pubnub.entities.models.consumer.user.toUserEvent
import com.pubnub.entities.models.consumer.user.toUsersResult
import com.pubnub.user.models.consumer.RemoveUserResult
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserEvent
import com.pubnub.user.models.consumer.UserId
import com.pubnub.user.models.consumer.UserKey
import com.pubnub.user.models.consumer.UsersResult
import com.pubnub.user.models.consumer.toRemoveUserResult
import com.pubnub.user.models.consumer.toUser
import com.pubnub.user.models.consumer.toUserEvent
import com.pubnub.user.models.consumer.toUsersResult

/**
* Returns a paginated list of User metadata, optionally including the custom data object for each.
Expand Down
2 changes: 1 addition & 1 deletion .../models/consumer/user/RemoveUserResult.kt → .../user/models/consumer/RemoveUserResult.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities.models.consumer.user
package com.pubnub.user.models.consumer

import com.pubnub.api.models.consumer.objects.PNRemoveMetadataResult

Expand Down
2 changes: 1 addition & 1 deletion ...nub/entities/models/consumer/user/User.kt → ...n/com/pubnub/user/models/consumer/User.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities.models.consumer.user
package com.pubnub.user.models.consumer

import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadata

Expand Down
2 changes: 1 addition & 1 deletion ...ntities/models/consumer/user/UserEvent.kt → .../pubnub/user/models/consumer/UserEvent.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities.models.consumer.user
package com.pubnub.user.models.consumer

import com.pubnub.api.models.consumer.pubsub.objects.PNDeleteUUIDMetadataEventMessage
import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult
Expand Down
2 changes: 1 addition & 1 deletion .../entities/models/consumer/user/UserKey.kt → ...om/pubnub/user/models/consumer/UserKey.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities.models.consumer.user
package com.pubnub.user.models.consumer

import com.pubnub.api.models.consumer.objects.PNKey
import com.pubnub.api.models.consumer.objects.SortableKey
Expand Down
2 changes: 1 addition & 1 deletion ...ities/models/consumer/user/UsersResult.kt → ...ubnub/user/models/consumer/UsersResult.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities.models.consumer.user
package com.pubnub.user.models.consumer

import com.pubnub.api.models.consumer.objects.PNPage
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadataArrayResult
Expand Down
10 changes: 5 additions & 5 deletions ...om/pubnub/entities/UserExtensionKtTest.kt → ...in/com/pubnub/user/UserExtensionKtTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.pubnub.entities
package com.pubnub.user

import com.pubnub.api.PNConfiguration
import com.pubnub.api.PubNub
Expand All @@ -11,10 +11,10 @@ import com.pubnub.api.models.consumer.objects.PNRemoveMetadataResult
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadata
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadataArrayResult
import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadataResult
import com.pubnub.entities.models.consumer.user.RemoveUserResult
import com.pubnub.entities.models.consumer.user.User
import com.pubnub.entities.models.consumer.user.UserId
import com.pubnub.entities.models.consumer.user.UsersResult
import com.pubnub.user.models.consumer.RemoveUserResult
import com.pubnub.user.models.consumer.User
import com.pubnub.user.models.consumer.UserId
import com.pubnub.user.models.consumer.UsersResult
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
Expand Down

0 comments on commit 7ffb6df

Please sign in to comment.