From 57acccf169207e99d91d36a0cf588fa48d5e3ee1 Mon Sep 17 00:00:00 2001 From: Lukasz Klich Date: Tue, 14 Jun 2022 15:12:46 +0200 Subject: [PATCH] Change package in pubnub-spaces module: entities -> space (#56) --- .../IntegrationTestConfiguration.kt | 2 +- .../MembershipIntegTest.kt | 20 +++++----- .../MembershipExtension.kt | 40 +++++++++---------- .../models/consumer/membership/Membership.kt | 8 ++-- .../consumer/membership/MembershipEvent.kt | 6 +-- .../consumer/membership/MembershipsResult.kt | 4 +- .../membership/MembershipsStatusResult.kt | 2 +- .../consumer/membership/SpaceDetailsLevel.kt | 2 +- .../membership/SpaceMembershipResultKey.kt | 2 +- .../consumer/membership/UserDetailsLevel.kt | 2 +- .../membership/UserMembershipsResultKey.kt | 2 +- .../MembershipExtensionKtTest.kt | 12 +++--- pubnub-spaces/gradle.properties | 2 +- .../IntegrationTestConfiguration.kt | 2 +- .../{entities => space}/SpaceIntegTest.kt | 12 +++--- .../{entities => space}/SpaceExtension.kt | 22 +++++----- .../models/consumer}/RemoveSpaceResult.kt | 2 +- .../space => space/models/consumer}/Space.kt | 2 +- .../models/consumer}/SpaceEvent.kt | 2 +- .../models/consumer}/SpaceKey.kt | 2 +- .../models/consumer}/SpacesResult.kt | 2 +- .../SpaceExtensionKtTest.kt | 10 ++--- 22 files changed, 80 insertions(+), 80 deletions(-) rename pubnub-memberships/src/integrationTest/kotlin/com/pubnub/{entities => space}/IntegrationTestConfiguration.kt (94%) rename pubnub-memberships/src/integrationTest/kotlin/com/pubnub/{entities => space}/MembershipIntegTest.kt (97%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/MembershipExtension.kt (90%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/Membership.kt (92%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/MembershipEvent.kt (92%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/MembershipsResult.kt (91%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/MembershipsStatusResult.kt (90%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/SpaceDetailsLevel.kt (88%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/SpaceMembershipResultKey.kt (89%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/UserDetailsLevel.kt (87%) rename pubnub-memberships/src/main/kotlin/com/pubnub/{entities => space}/models/consumer/membership/UserMembershipsResultKey.kt (90%) rename pubnub-memberships/src/test/kotlin/com/pubnub/{entities => space}/MembershipExtensionKtTest.kt (97%) rename pubnub-spaces/src/integrationTest/kotlin/com/pubnub/{entities => space}/IntegrationTestConfiguration.kt (94%) rename pubnub-spaces/src/integrationTest/kotlin/com/pubnub/{entities => space}/SpaceIntegTest.kt (95%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities => space}/SpaceExtension.kt (91%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities/models/consumer/space => space/models/consumer}/RemoveSpaceResult.kt (84%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities/models/consumer/space => space/models/consumer}/Space.kt (93%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities/models/consumer/space => space/models/consumer}/SpaceEvent.kt (97%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities/models/consumer/space => space/models/consumer}/SpaceKey.kt (87%) rename pubnub-spaces/src/main/kotlin/com/pubnub/{entities/models/consumer/space => space/models/consumer}/SpacesResult.kt (94%) rename pubnub-spaces/src/test/kotlin/com/pubnub/{entities => space}/SpaceExtensionKtTest.kt (96%) diff --git a/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt b/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt similarity index 94% rename from pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt rename to pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt index 2ddb55db1..7c95bdce5 100644 --- a/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt +++ b/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import org.aeonbits.owner.Config import org.aeonbits.owner.ConfigFactory diff --git a/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/MembershipIntegTest.kt b/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/MembershipIntegTest.kt similarity index 97% rename from pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/MembershipIntegTest.kt rename to pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/MembershipIntegTest.kt index 4d9926ca4..0e5fc3160 100644 --- a/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/entities/MembershipIntegTest.kt +++ b/pubnub-memberships/src/integrationTest/kotlin/com/pubnub/space/MembershipIntegTest.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PNConfiguration import com.pubnub.api.PubNub @@ -6,15 +6,15 @@ 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.membership.Membership -import com.pubnub.entities.models.consumer.membership.MembershipModified -import com.pubnub.entities.models.consumer.membership.MembershipsResult -import com.pubnub.entities.models.consumer.membership.SpaceDetailsLevel -import com.pubnub.entities.models.consumer.membership.SpaceMembershipResultKey -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.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.membership.Membership +import com.pubnub.space.models.consumer.membership.MembershipModified +import com.pubnub.space.models.consumer.membership.MembershipsResult +import com.pubnub.space.models.consumer.membership.SpaceDetailsLevel +import com.pubnub.space.models.consumer.membership.SpaceMembershipResultKey +import com.pubnub.space.models.consumer.membership.UserDetailsLevel +import com.pubnub.space.models.consumer.membership.UserMembershipsResultKey import com.pubnub.user.createUser import com.pubnub.user.models.consumer.User import com.pubnub.user.models.consumer.UserId diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/MembershipExtension.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/MembershipExtension.kt similarity index 90% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/MembershipExtension.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/MembershipExtension.kt index 17e98aeeb..507e47ca4 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/MembershipExtension.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/MembershipExtension.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PubNub import com.pubnub.api.callbacks.DisposableListener @@ -14,25 +14,25 @@ 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.membership.Membership -import com.pubnub.entities.models.consumer.membership.MembershipEvent -import com.pubnub.entities.models.consumer.membership.MembershipsResult -import com.pubnub.entities.models.consumer.membership.MembershipsStatusResult -import com.pubnub.entities.models.consumer.membership.SpaceDetailsLevel -import com.pubnub.entities.models.consumer.membership.SpaceMembershipResultKey -import com.pubnub.entities.models.consumer.membership.UserDetailsLevel -import com.pubnub.entities.models.consumer.membership.UserMembershipsResultKey -import com.pubnub.entities.models.consumer.membership.toMembershipEvent -import com.pubnub.entities.models.consumer.membership.toPNChannelDetailsLevel -import com.pubnub.entities.models.consumer.membership.toPNChannelMembershipPartialList -import com.pubnub.entities.models.consumer.membership.toPNMemberPartialList -import com.pubnub.entities.models.consumer.membership.toPNUUIDDetailsLevel -import com.pubnub.entities.models.consumer.membership.toSpaceFetchMembershipResult -import com.pubnub.entities.models.consumer.membership.toSpaceMembershipResult -import com.pubnub.entities.models.consumer.membership.toUserFetchMembershipsResult -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.space.models.consumer.ISpaceId +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.membership.Membership +import com.pubnub.space.models.consumer.membership.MembershipEvent +import com.pubnub.space.models.consumer.membership.MembershipsResult +import com.pubnub.space.models.consumer.membership.MembershipsStatusResult +import com.pubnub.space.models.consumer.membership.SpaceDetailsLevel +import com.pubnub.space.models.consumer.membership.SpaceMembershipResultKey +import com.pubnub.space.models.consumer.membership.UserDetailsLevel +import com.pubnub.space.models.consumer.membership.UserMembershipsResultKey +import com.pubnub.space.models.consumer.membership.toMembershipEvent +import com.pubnub.space.models.consumer.membership.toPNChannelDetailsLevel +import com.pubnub.space.models.consumer.membership.toPNChannelMembershipPartialList +import com.pubnub.space.models.consumer.membership.toPNMemberPartialList +import com.pubnub.space.models.consumer.membership.toPNUUIDDetailsLevel +import com.pubnub.space.models.consumer.membership.toSpaceFetchMembershipResult +import com.pubnub.space.models.consumer.membership.toSpaceMembershipResult +import com.pubnub.space.models.consumer.membership.toUserFetchMembershipsResult +import com.pubnub.space.models.consumer.membership.toUserMembershipsResult import com.pubnub.user.models.consumer.IUserId import com.pubnub.user.models.consumer.UserId diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/Membership.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/Membership.kt similarity index 92% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/Membership.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/Membership.kt index 3e34dfbeb..91e3c757e 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/Membership.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/Membership.kt @@ -1,10 +1,10 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.member.PNMember 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.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.toSpace import com.pubnub.user.models.consumer.User import com.pubnub.user.models.consumer.UserId import com.pubnub.user.models.consumer.toUser diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipEvent.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipEvent.kt similarity index 92% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipEvent.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipEvent.kt index 442121000..a7b8ae346 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipEvent.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipEvent.kt @@ -1,10 +1,10 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.pubsub.objects.PNDeleteMembershipEventMessage 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.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId import com.pubnub.user.models.consumer.User import com.pubnub.user.models.consumer.UserId diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsResult.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsResult.kt similarity index 91% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsResult.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsResult.kt index 269c62067..f97b0bbcd 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsResult.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsResult.kt @@ -1,9 +1,9 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership 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.space.models.consumer.SpaceId import com.pubnub.user.models.consumer.UserId data class MembershipsResult( diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsStatusResult.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsStatusResult.kt similarity index 90% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsStatusResult.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsStatusResult.kt index e4c97147a..43e0eecba 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/MembershipsStatusResult.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/MembershipsStatusResult.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.member.PNMemberArrayResult import com.pubnub.api.models.consumer.objects.membership.PNChannelMembershipArrayResult diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceDetailsLevel.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceDetailsLevel.kt similarity index 88% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceDetailsLevel.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceDetailsLevel.kt index 46d87196d..fee487fd3 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceDetailsLevel.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceDetailsLevel.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.membership.PNChannelDetailsLevel diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceMembershipResultKey.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceMembershipResultKey.kt similarity index 89% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceMembershipResultKey.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceMembershipResultKey.kt index 57acd8de6..db0de715a 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/SpaceMembershipResultKey.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/SpaceMembershipResultKey.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.PNMemberKey import com.pubnub.api.models.consumer.objects.SortableKey diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserDetailsLevel.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserDetailsLevel.kt similarity index 87% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserDetailsLevel.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserDetailsLevel.kt index c6d1ab776..ea7ff5995 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserDetailsLevel.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserDetailsLevel.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.member.PNUUIDDetailsLevel diff --git a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserMembershipsResultKey.kt b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserMembershipsResultKey.kt similarity index 90% rename from pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserMembershipsResultKey.kt rename to pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserMembershipsResultKey.kt index 7038ee5f2..15fd17946 100644 --- a/pubnub-memberships/src/main/kotlin/com/pubnub/entities/models/consumer/membership/UserMembershipsResultKey.kt +++ b/pubnub-memberships/src/main/kotlin/com/pubnub/space/models/consumer/membership/UserMembershipsResultKey.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.membership +package com.pubnub.space.models.consumer.membership import com.pubnub.api.models.consumer.objects.PNMembershipKey import com.pubnub.api.models.consumer.objects.SortableKey diff --git a/pubnub-memberships/src/test/kotlin/com/pubnub/entities/MembershipExtensionKtTest.kt b/pubnub-memberships/src/test/kotlin/com/pubnub/space/MembershipExtensionKtTest.kt similarity index 97% rename from pubnub-memberships/src/test/kotlin/com/pubnub/entities/MembershipExtensionKtTest.kt rename to pubnub-memberships/src/test/kotlin/com/pubnub/space/MembershipExtensionKtTest.kt index e903c544b..518bd2ebb 100644 --- a/pubnub-memberships/src/test/kotlin/com/pubnub/entities/MembershipExtensionKtTest.kt +++ b/pubnub-memberships/src/test/kotlin/com/pubnub/space/MembershipExtensionKtTest.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PNConfiguration import com.pubnub.api.PubNub @@ -13,11 +13,11 @@ import com.pubnub.api.models.consumer.objects.member.PNMemberArrayResult import com.pubnub.api.models.consumer.objects.membership.PNChannelMembership import com.pubnub.api.models.consumer.objects.membership.PNChannelMembershipArrayResult import com.pubnub.api.models.consumer.objects.uuid.PNUUIDMetadata -import com.pubnub.entities.models.consumer.membership.Membership -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.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.membership.Membership +import com.pubnub.space.models.consumer.membership.MembershipsResult +import com.pubnub.space.models.consumer.membership.MembershipsStatusResult import com.pubnub.user.models.consumer.User import com.pubnub.user.models.consumer.UserId import io.mockk.MockKAnnotations diff --git a/pubnub-spaces/gradle.properties b/pubnub-spaces/gradle.properties index e4fc52a1d..4d5432def 100644 --- a/pubnub-spaces/gradle.properties +++ b/pubnub-spaces/gradle.properties @@ -1,4 +1,4 @@ POM_ARTIFACT_ID=pubnub-spaces POM_NAME=pubnub-spaces POM_PACKAGING=jar -VERSION_NAME=0.1.0 +VERSION_NAME=0.2.0 diff --git a/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt b/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt similarity index 94% rename from pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt rename to pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt index 2ddb55db1..7c95bdce5 100644 --- a/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/IntegrationTestConfiguration.kt +++ b/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/IntegrationTestConfiguration.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import org.aeonbits.owner.Config import org.aeonbits.owner.ConfigFactory diff --git a/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/SpaceIntegTest.kt b/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/SpaceIntegTest.kt similarity index 95% rename from pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/SpaceIntegTest.kt rename to pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/SpaceIntegTest.kt index 885568a37..550802c60 100644 --- a/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/entities/SpaceIntegTest.kt +++ b/pubnub-spaces/src/integrationTest/kotlin/com/pubnub/space/SpaceIntegTest.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PNConfiguration import com.pubnub.api.PubNub @@ -8,11 +8,11 @@ import com.pubnub.api.enums.PNLogVerbosity 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.space.Space -import com.pubnub.entities.models.consumer.space.SpaceId -import com.pubnub.entities.models.consumer.space.SpaceKey -import com.pubnub.entities.models.consumer.space.SpaceModified -import com.pubnub.entities.models.consumer.space.SpacesResult +import com.pubnub.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.SpaceKey +import com.pubnub.space.models.consumer.SpaceModified +import com.pubnub.space.models.consumer.SpacesResult import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/SpaceExtension.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/SpaceExtension.kt similarity index 91% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/SpaceExtension.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/SpaceExtension.kt index 0093663f0..305c150e5 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/SpaceExtension.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/SpaceExtension.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PubNub import com.pubnub.api.callbacks.DisposableListener @@ -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.space.RemoveSpaceResult -import com.pubnub.entities.models.consumer.space.Space -import com.pubnub.entities.models.consumer.space.SpaceEvent -import com.pubnub.entities.models.consumer.space.SpaceId -import com.pubnub.entities.models.consumer.space.SpaceKey -import com.pubnub.entities.models.consumer.space.SpacesResult -import com.pubnub.entities.models.consumer.space.toRemoveSpaceResult -import com.pubnub.entities.models.consumer.space.toSpace -import com.pubnub.entities.models.consumer.space.toSpaceEvent -import com.pubnub.entities.models.consumer.space.toSpacesResult +import com.pubnub.space.models.consumer.RemoveSpaceResult +import com.pubnub.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceEvent +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.SpaceKey +import com.pubnub.space.models.consumer.SpacesResult +import com.pubnub.space.models.consumer.toRemoveSpaceResult +import com.pubnub.space.models.consumer.toSpace +import com.pubnub.space.models.consumer.toSpaceEvent +import com.pubnub.space.models.consumer.toSpacesResult /** * Returns a paginated list of Spaces metadata, optionally including the custom data object for each. diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/RemoveSpaceResult.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/RemoveSpaceResult.kt similarity index 84% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/RemoveSpaceResult.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/RemoveSpaceResult.kt index eaa8acafe..e34d79314 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/RemoveSpaceResult.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/RemoveSpaceResult.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.space +package com.pubnub.space.models.consumer import com.pubnub.api.models.consumer.objects.PNRemoveMetadataResult diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/Space.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/Space.kt similarity index 93% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/Space.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/Space.kt index a697d8884..1d295d818 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/Space.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/Space.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.space +package com.pubnub.space.models.consumer import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadata diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceEvent.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceEvent.kt similarity index 97% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceEvent.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceEvent.kt index c64100163..140f371bf 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceEvent.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceEvent.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.space +package com.pubnub.space.models.consumer import com.pubnub.api.models.consumer.pubsub.objects.PNDeleteChannelMetadataEventMessage import com.pubnub.api.models.consumer.pubsub.objects.PNObjectEventResult diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceKey.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceKey.kt similarity index 87% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceKey.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceKey.kt index ea500969f..ac6edde1b 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpaceKey.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpaceKey.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.space +package com.pubnub.space.models.consumer import com.pubnub.api.models.consumer.objects.PNKey import com.pubnub.api.models.consumer.objects.SortableKey diff --git a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpacesResult.kt b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpacesResult.kt similarity index 94% rename from pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpacesResult.kt rename to pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpacesResult.kt index f2053966a..0535a57aa 100644 --- a/pubnub-spaces/src/main/kotlin/com/pubnub/entities/models/consumer/space/SpacesResult.kt +++ b/pubnub-spaces/src/main/kotlin/com/pubnub/space/models/consumer/SpacesResult.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities.models.consumer.space +package com.pubnub.space.models.consumer import com.pubnub.api.models.consumer.objects.PNPage import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadataArrayResult diff --git a/pubnub-spaces/src/test/kotlin/com/pubnub/entities/SpaceExtensionKtTest.kt b/pubnub-spaces/src/test/kotlin/com/pubnub/space/SpaceExtensionKtTest.kt similarity index 96% rename from pubnub-spaces/src/test/kotlin/com/pubnub/entities/SpaceExtensionKtTest.kt rename to pubnub-spaces/src/test/kotlin/com/pubnub/space/SpaceExtensionKtTest.kt index 8055df9b6..2ed4d183e 100644 --- a/pubnub-spaces/src/test/kotlin/com/pubnub/entities/SpaceExtensionKtTest.kt +++ b/pubnub-spaces/src/test/kotlin/com/pubnub/space/SpaceExtensionKtTest.kt @@ -1,4 +1,4 @@ -package com.pubnub.entities +package com.pubnub.space import com.pubnub.api.PNConfiguration import com.pubnub.api.PubNub @@ -11,10 +11,10 @@ import com.pubnub.api.models.consumer.objects.PNRemoveMetadataResult import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadata import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadataArrayResult import com.pubnub.api.models.consumer.objects.channel.PNChannelMetadataResult -import com.pubnub.entities.models.consumer.space.RemoveSpaceResult -import com.pubnub.entities.models.consumer.space.Space -import com.pubnub.entities.models.consumer.space.SpaceId -import com.pubnub.entities.models.consumer.space.SpacesResult +import com.pubnub.space.models.consumer.RemoveSpaceResult +import com.pubnub.space.models.consumer.Space +import com.pubnub.space.models.consumer.SpaceId +import com.pubnub.space.models.consumer.SpacesResult import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK