Skip to content

Commit c2049b1

Browse files
KGronek-PubnubKGronek-Pubnub
committed
Rework all methods except subscribe to have correct sync and async implementations.
1 parent 05f1a2b commit c2049b1

20 files changed

+2294
-856
lines changed

‎Source/PubnubLibrary/Private/Entities/PubnubChannelEntity.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ UPubnubChannelEntity::UPubnubChannelEntity()
99
EntityType = EPubnubEntityType::PEnT_Channel;
1010
}
1111

12-
void UPubnubChannelEntity::PublishMessage(FString Message, FOnPubnubPublishMessageResponse OnPublishMessageResponse, FPubnubPublishSettings PublishSettings)
12+
void UPubnubChannelEntity::PublishMessageAsync(FString Message, FOnPubnubPublishMessageResponse OnPublishMessageResponse, FPubnubPublishSettings PublishSettings)
1313
{
1414
if (!PubnubClient)
1515
{
@@ -21,75 +21,75 @@ void UPubnubChannelEntity::PublishMessage(FString Message, FOnPubnubPublishMessa
2121
UE_LOG(PubnubLog, Error, TEXT("Cannot publish message - EntityID is empty."));
2222
return;
2323
}
24-
PubnubClient->PublishMessage(EntityID, Message, OnPublishMessageResponse, PublishSettings);
24+
PubnubClient->PublishMessageAsync(EntityID, Message, OnPublishMessageResponse, PublishSettings);
2525
}
2626

27-
void UPubnubChannelEntity::PublishMessage(FString Message, FOnPubnubPublishMessageResponseNative NativeCallback, FPubnubPublishSettings PublishSettings)
27+
void UPubnubChannelEntity::PublishMessageAsync(FString Message, FOnPubnubPublishMessageResponseNative NativeCallback, FPubnubPublishSettings PublishSettings)
2828
{
2929
if (!PubnubClient)
3030
{
3131
UE_LOG(PubnubLog, Error, TEXT("Cannot publish message - PubnubClient is null. Entity not properly initialized."));
3232
return;
3333
}
34-
PubnubClient->PublishMessage(EntityID, Message, NativeCallback, PublishSettings);
34+
PubnubClient->PublishMessageAsync(EntityID, Message, NativeCallback, PublishSettings);
3535
}
3636

37-
void UPubnubChannelEntity::PublishMessage(FString Message, FPubnubPublishSettings PublishSettings)
37+
void UPubnubChannelEntity::PublishMessageAsync(FString Message, FPubnubPublishSettings PublishSettings)
3838
{
3939
if (!PubnubClient)
4040
{
4141
UE_LOG(PubnubLog, Error, TEXT("Cannot publish message - PubnubClient is null. Entity not properly initialized."));
4242
return;
4343
}
44-
PubnubClient->PublishMessage(EntityID, Message, PublishSettings);
44+
PubnubClient->PublishMessageAsync(EntityID, Message, PublishSettings);
4545
}
4646

47-
void UPubnubChannelEntity::Signal(FString Message, FOnPubnubSignalResponse OnSignalResponse, FPubnubSignalSettings SignalSettings)
47+
void UPubnubChannelEntity::SignalAsync(FString Message, FOnPubnubSignalResponse OnSignalResponse, FPubnubSignalSettings SignalSettings)
4848
{
4949
if (!PubnubClient)
5050
{
5151
UE_LOG(PubnubLog, Error, TEXT("Cannot send signal - PubnubClient is null. Entity not properly initialized."));
5252
return;
5353
}
54-
PubnubClient->Signal(EntityID, Message, OnSignalResponse, SignalSettings);
54+
PubnubClient->SignalAsync(EntityID, Message, OnSignalResponse, SignalSettings);
5555
}
5656

57-
void UPubnubChannelEntity::Signal(FString Message, FOnPubnubSignalResponseNative NativeCallback, FPubnubSignalSettings SignalSettings)
57+
void UPubnubChannelEntity::SignalAsync(FString Message, FOnPubnubSignalResponseNative NativeCallback, FPubnubSignalSettings SignalSettings)
5858
{
5959
if (!PubnubClient)
6060
{
6161
UE_LOG(PubnubLog, Error, TEXT("Cannot send signal - PubnubClient is null. Entity not properly initialized."));
6262
return;
6363
}
64-
PubnubClient->Signal(EntityID, Message, NativeCallback, SignalSettings);
64+
PubnubClient->SignalAsync(EntityID, Message, NativeCallback, SignalSettings);
6565
}
6666

67-
void UPubnubChannelEntity::Signal(FString Message, FPubnubSignalSettings SignalSettings)
67+
void UPubnubChannelEntity::SignalAsync(FString Message, FPubnubSignalSettings SignalSettings)
6868
{
6969
if (!PubnubClient)
7070
{
7171
UE_LOG(PubnubLog, Error, TEXT("Cannot send signal - PubnubClient is null. Entity not properly initialized."));
7272
return;
7373
}
74-
PubnubClient->Signal(EntityID, Message, SignalSettings);
74+
PubnubClient->SignalAsync(EntityID, Message, SignalSettings);
7575
}
7676

77-
void UPubnubChannelEntity::ListUsersFromChannel(FOnPubnubListUsersFromChannelResponse ListUsersFromChannelResponse, FPubnubListUsersFromChannelSettings ListUsersFromChannelSettings)
77+
void UPubnubChannelEntity::ListUsersFromChannelAsync(FOnPubnubListUsersFromChannelResponse ListUsersFromChannelResponse, FPubnubListUsersFromChannelSettings ListUsersFromChannelSettings)
7878
{
7979
if (!PubnubClient)
8080
{
8181
UE_LOG(PubnubLog, Error, TEXT("Cannot list users from channel - PubnubClient is null. Entity not properly initialized."));
8282
return;
8383
}
84-
PubnubClient->ListUsersFromChannel(EntityID, ListUsersFromChannelResponse, ListUsersFromChannelSettings);
84+
PubnubClient->ListUsersFromChannelAsync(EntityID, ListUsersFromChannelResponse, ListUsersFromChannelSettings);
8585
}
8686

87-
void UPubnubChannelEntity::ListUsersFromChannel(FOnPubnubListUsersFromChannelResponseNative NativeCallback, FPubnubListUsersFromChannelSettings ListUsersFromChannelSettings)
87+
void UPubnubChannelEntity::ListUsersFromChannelAsync(FOnPubnubListUsersFromChannelResponseNative NativeCallback, FPubnubListUsersFromChannelSettings ListUsersFromChannelSettings)
8888
{
8989
if (!PubnubClient)
9090
{
9191
UE_LOG(PubnubLog, Error, TEXT("Cannot list users from channel - PubnubClient is null. Entity not properly initialized."));
9292
return;
9393
}
94-
PubnubClient->ListUsersFromChannel(EntityID, NativeCallback, ListUsersFromChannelSettings);
94+
PubnubClient->ListUsersFromChannelAsync(EntityID, NativeCallback, ListUsersFromChannelSettings);
9595
}

‎Source/PubnubLibrary/Private/Entities/PubnubChannelGroupEntity.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,83 +9,83 @@ UPubnubChannelGroupEntity::UPubnubChannelGroupEntity()
99
EntityType = EPubnubEntityType::PEnT_ChannelGroup;
1010
}
1111

12-
void UPubnubChannelGroupEntity::AddChannelToGroup(FString Channel, FOnPubnubAddChannelToGroupResponse OnAddChannelToGroupResponse)
12+
void UPubnubChannelGroupEntity::AddChannelToGroupAsync(FString Channel, FOnPubnubAddChannelToGroupResponse OnAddChannelToGroupResponse)
1313
{
1414
if (!PubnubClient)
1515
{
1616
UE_LOG(PubnubLog, Error, TEXT("Cannot add channel to group - PubnubClient is null. Entity not properly initialized."));
1717
return;
1818
}
19-
PubnubClient->AddChannelToGroup(Channel, EntityID, OnAddChannelToGroupResponse);
19+
PubnubClient->AddChannelToGroupAsync(Channel, EntityID, OnAddChannelToGroupResponse);
2020
}
2121

22-
void UPubnubChannelGroupEntity::AddChannelToGroup(FString Channel, FOnPubnubAddChannelToGroupResponseNative NativeCallback)
22+
void UPubnubChannelGroupEntity::AddChannelToGroupAsync(FString Channel, FOnPubnubAddChannelToGroupResponseNative NativeCallback)
2323
{
2424
if (!PubnubClient)
2525
{
2626
UE_LOG(PubnubLog, Error, TEXT("Cannot add channel to group - PubnubClient is null. Entity not properly initialized."));
2727
return;
2828
}
29-
PubnubClient->AddChannelToGroup(Channel, EntityID, NativeCallback);
29+
PubnubClient->AddChannelToGroupAsync(Channel, EntityID, NativeCallback);
3030
}
3131

32-
void UPubnubChannelGroupEntity::RemoveChannelFromGroup(FString Channel, FOnPubnubRemoveChannelFromGroupResponse OnRemoveChannelFromGroupResponse)
32+
void UPubnubChannelGroupEntity::RemoveChannelFromGroupAsync(FString Channel, FOnPubnubRemoveChannelFromGroupResponse OnRemoveChannelFromGroupResponse)
3333
{
3434
if (!PubnubClient)
3535
{
3636
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel from group - PubnubClient is null. Entity not properly initialized."));
3737
return;
3838
}
39-
PubnubClient->RemoveChannelFromGroup(Channel, EntityID, OnRemoveChannelFromGroupResponse);
39+
PubnubClient->RemoveChannelFromGroupAsync(Channel, EntityID, OnRemoveChannelFromGroupResponse);
4040
}
4141

42-
void UPubnubChannelGroupEntity::RemoveChannelFromGroup(FString Channel, FOnPubnubRemoveChannelFromGroupResponseNative NativeCallback)
42+
void UPubnubChannelGroupEntity::RemoveChannelFromGroupAsync(FString Channel, FOnPubnubRemoveChannelFromGroupResponseNative NativeCallback)
4343
{
4444
if (!PubnubClient)
4545
{
4646
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel from group - PubnubClient is null. Entity not properly initialized."));
4747
return;
4848
}
49-
PubnubClient->RemoveChannelFromGroup(Channel, EntityID, NativeCallback);
49+
PubnubClient->RemoveChannelFromGroupAsync(Channel, EntityID, NativeCallback);
5050
}
5151

52-
void UPubnubChannelGroupEntity::ListChannelsFromGroup(FOnPubnubListChannelsFromGroupResponse OnListChannelsResponse)
52+
void UPubnubChannelGroupEntity::ListChannelsFromGroupAsync(FOnPubnubListChannelsFromGroupResponse OnListChannelsResponse)
5353
{
5454
if (!PubnubClient)
5555
{
5656
UE_LOG(PubnubLog, Error, TEXT("Cannot list channels from group - PubnubClient is null. Entity not properly initialized."));
5757
return;
5858
}
59-
PubnubClient->ListChannelsFromGroup(EntityID, OnListChannelsResponse);
59+
PubnubClient->ListChannelsFromGroupAsync(EntityID, OnListChannelsResponse);
6060
}
6161

62-
void UPubnubChannelGroupEntity::ListChannelsFromGroup(FOnPubnubListChannelsFromGroupResponseNative NativeCallback)
62+
void UPubnubChannelGroupEntity::ListChannelsFromGroupAsync(FOnPubnubListChannelsFromGroupResponseNative NativeCallback)
6363
{
6464
if (!PubnubClient)
6565
{
6666
UE_LOG(PubnubLog, Error, TEXT("Cannot list channels from group - PubnubClient is null. Entity not properly initialized."));
6767
return;
6868
}
69-
PubnubClient->ListChannelsFromGroup(EntityID, NativeCallback);
69+
PubnubClient->ListChannelsFromGroupAsync(EntityID, NativeCallback);
7070
}
7171

72-
void UPubnubChannelGroupEntity::RemoveChannelGroup(FOnPubnubRemoveChannelGroupResponse OnRemoveChannelGroupResponse)
72+
void UPubnubChannelGroupEntity::RemoveChannelGroupAsync(FOnPubnubRemoveChannelGroupResponse OnRemoveChannelGroupResponse)
7373
{
7474
if (!PubnubClient)
7575
{
7676
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel group - PubnubClient is null. Entity not properly initialized."));
7777
return;
7878
}
79-
PubnubClient->RemoveChannelGroup(EntityID, OnRemoveChannelGroupResponse);
79+
PubnubClient->RemoveChannelGroupAsync(EntityID, OnRemoveChannelGroupResponse);
8080
}
8181

82-
void UPubnubChannelGroupEntity::RemoveChannelGroup(FOnPubnubRemoveChannelGroupResponseNative NativeCallback)
82+
void UPubnubChannelGroupEntity::RemoveChannelGroupAsync(FOnPubnubRemoveChannelGroupResponseNative NativeCallback)
8383
{
8484
if (!PubnubClient)
8585
{
8686
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel group - PubnubClient is null. Entity not properly initialized."));
8787
return;
8888
}
89-
PubnubClient->RemoveChannelGroup(EntityID, NativeCallback);
89+
PubnubClient->RemoveChannelGroupAsync(EntityID, NativeCallback);
9090
}
9191

‎Source/PubnubLibrary/Private/Entities/PubnubChannelMetadataEntity.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,63 +9,63 @@ UPubnubChannelMetadataEntity::UPubnubChannelMetadataEntity()
99
EntityType = EPubnubEntityType::PEnT_ChannelMetadata;
1010
}
1111

12-
void UPubnubChannelMetadataEntity::SetChannelMetadata(FPubnubChannelData ChannelMetadata, FOnPubnubSetChannelMetadataResponse OnSetChannelMetadataResponse, FPubnubGetMetadataInclude Include)
12+
void UPubnubChannelMetadataEntity::SetChannelMetadataAsync(FPubnubChannelData ChannelMetadata, FOnPubnubSetChannelMetadataResponse OnSetChannelMetadataResponse, FPubnubGetMetadataInclude Include)
1313
{
1414
if (!PubnubClient)
1515
{
1616
UE_LOG(PubnubLog, Error, TEXT("Cannot set channel metadata - PubnubClient is null. Entity not properly initialized."));
1717
return;
1818
}
19-
PubnubClient->SetChannelMetadata(EntityID, ChannelMetadata, OnSetChannelMetadataResponse, Include);
19+
PubnubClient->SetChannelMetadataAsync(EntityID, ChannelMetadata, OnSetChannelMetadataResponse, Include);
2020
}
2121

22-
void UPubnubChannelMetadataEntity::SetChannelMetadata(FPubnubChannelData ChannelMetadata, FOnPubnubSetChannelMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
22+
void UPubnubChannelMetadataEntity::SetChannelMetadataAsync(FPubnubChannelData ChannelMetadata, FOnPubnubSetChannelMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
2323
{
2424
if (!PubnubClient)
2525
{
2626
UE_LOG(PubnubLog, Error, TEXT("Cannot set channel metadata - PubnubClient is null. Entity not properly initialized."));
2727
return;
2828
}
29-
PubnubClient->SetChannelMetadata(EntityID, ChannelMetadata, NativeCallback, Include);
29+
PubnubClient->SetChannelMetadataAsync(EntityID, ChannelMetadata, NativeCallback, Include);
3030
}
3131

32-
void UPubnubChannelMetadataEntity::GetChannelMetadata(FOnPubnubGetChannelMetadataResponse OnGetChannelMetadataResponse, FPubnubGetMetadataInclude Include)
32+
void UPubnubChannelMetadataEntity::GetChannelMetadataAsync(FOnPubnubGetChannelMetadataResponse OnGetChannelMetadataResponse, FPubnubGetMetadataInclude Include)
3333
{
3434
if (!PubnubClient)
3535
{
3636
UE_LOG(PubnubLog, Error, TEXT("Cannot get channel metadata - PubnubClient is null. Entity not properly initialized."));
3737
return;
3838
}
39-
PubnubClient->GetChannelMetadata(EntityID, OnGetChannelMetadataResponse, Include);
39+
PubnubClient->GetChannelMetadataAsync(EntityID, OnGetChannelMetadataResponse, Include);
4040
}
4141

42-
void UPubnubChannelMetadataEntity::GetChannelMetadata(FOnPubnubGetChannelMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
42+
void UPubnubChannelMetadataEntity::GetChannelMetadataAsync(FOnPubnubGetChannelMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
4343
{
4444
if (!PubnubClient)
4545
{
4646
UE_LOG(PubnubLog, Error, TEXT("Cannot get channel metadata - PubnubClient is null. Entity not properly initialized."));
4747
return;
4848
}
49-
PubnubClient->GetChannelMetadata(EntityID, NativeCallback, Include);
49+
PubnubClient->GetChannelMetadataAsync(EntityID, NativeCallback, Include);
5050
}
5151

52-
void UPubnubChannelMetadataEntity::RemoveChannelMetadata(FOnPubnubRemoveChannelMetadataResponse OnRemoveChannelMetadataResponse)
52+
void UPubnubChannelMetadataEntity::RemoveChannelMetadataAsync(FOnPubnubRemoveChannelMetadataResponse OnRemoveChannelMetadataResponse)
5353
{
5454
if (!PubnubClient)
5555
{
5656
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel metadata - PubnubClient is null. Entity not properly initialized."));
5757
return;
5858
}
59-
PubnubClient->RemoveChannelMetadata(EntityID, OnRemoveChannelMetadataResponse);
59+
PubnubClient->RemoveChannelMetadataAsync(EntityID, OnRemoveChannelMetadataResponse);
6060
}
6161

62-
void UPubnubChannelMetadataEntity::RemoveChannelMetadata(FOnPubnubRemoveChannelMetadataResponseNative NativeCallback)
62+
void UPubnubChannelMetadataEntity::RemoveChannelMetadataAsync(FOnPubnubRemoveChannelMetadataResponseNative NativeCallback)
6363
{
6464
if (!PubnubClient)
6565
{
6666
UE_LOG(PubnubLog, Error, TEXT("Cannot remove channel metadata - PubnubClient is null. Entity not properly initialized."));
6767
return;
6868
}
69-
PubnubClient->RemoveChannelMetadata(EntityID, NativeCallback);
69+
PubnubClient->RemoveChannelMetadataAsync(EntityID, NativeCallback);
7070
}
7171

‎Source/PubnubLibrary/Private/Entities/PubnubUserMetadataEntity.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,63 +9,63 @@ UPubnubUserMetadataEntity::UPubnubUserMetadataEntity()
99
EntityType = EPubnubEntityType::PEnT_UserMetadata;
1010
}
1111

12-
void UPubnubUserMetadataEntity::SetUserMetadata(FPubnubUserData UserMetadata, FOnPubnubSetUserMetadataResponse OnSetUserMetadataResponse, FPubnubGetMetadataInclude Include)
12+
void UPubnubUserMetadataEntity::SetUserMetadataAsync(FPubnubUserData UserMetadata, FOnPubnubSetUserMetadataResponse OnSetUserMetadataResponse, FPubnubGetMetadataInclude Include)
1313
{
1414
if (!PubnubClient)
1515
{
1616
UE_LOG(PubnubLog, Error, TEXT("Cannot set user metadata - PubnubClient is null. Entity not properly initialized."));
1717
return;
1818
}
19-
PubnubClient->SetUserMetadata(EntityID, UserMetadata, OnSetUserMetadataResponse, Include);
19+
PubnubClient->SetUserMetadataAsync(EntityID, UserMetadata, OnSetUserMetadataResponse, Include);
2020
}
2121

22-
void UPubnubUserMetadataEntity::SetUserMetadata(FPubnubUserData UserMetadata, FOnPubnubSetUserMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
22+
void UPubnubUserMetadataEntity::SetUserMetadataAsync(FPubnubUserData UserMetadata, FOnPubnubSetUserMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
2323
{
2424
if (!PubnubClient)
2525
{
2626
UE_LOG(PubnubLog, Error, TEXT("Cannot set user metadata - PubnubClient is null. Entity not properly initialized."));
2727
return;
2828
}
29-
PubnubClient->SetUserMetadata(EntityID, UserMetadata, NativeCallback, Include);
29+
PubnubClient->SetUserMetadataAsync(EntityID, UserMetadata, NativeCallback, Include);
3030
}
3131

32-
void UPubnubUserMetadataEntity::GetUserMetadata(FOnPubnubGetUserMetadataResponse OnGetUserMetadataResponse, FPubnubGetMetadataInclude Include)
32+
void UPubnubUserMetadataEntity::GetUserMetadataAsync(FOnPubnubGetUserMetadataResponse OnGetUserMetadataResponse, FPubnubGetMetadataInclude Include)
3333
{
3434
if (!PubnubClient)
3535
{
3636
UE_LOG(PubnubLog, Error, TEXT("Cannot get user metadata - PubnubClient is null. Entity not properly initialized."));
3737
return;
3838
}
39-
PubnubClient->GetUserMetadata(EntityID, OnGetUserMetadataResponse, Include);
39+
PubnubClient->GetUserMetadataAsync(EntityID, OnGetUserMetadataResponse, Include);
4040
}
4141

42-
void UPubnubUserMetadataEntity::GetUserMetadata(FOnPubnubGetUserMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
42+
void UPubnubUserMetadataEntity::GetUserMetadataAsync(FOnPubnubGetUserMetadataResponseNative NativeCallback, FPubnubGetMetadataInclude Include)
4343
{
4444
if (!PubnubClient)
4545
{
4646
UE_LOG(PubnubLog, Error, TEXT("Cannot get user metadata - PubnubClient is null. Entity not properly initialized."));
4747
return;
4848
}
49-
PubnubClient->GetUserMetadata(EntityID, NativeCallback, Include);
49+
PubnubClient->GetUserMetadataAsync(EntityID, NativeCallback, Include);
5050
}
5151

52-
void UPubnubUserMetadataEntity::RemoveUserMetadata(FOnPubnubRemoveUserMetadataResponse OnRemoveUserMetadataResponse)
52+
void UPubnubUserMetadataEntity::RemoveUserMetadataAsync(FOnPubnubRemoveUserMetadataResponse OnRemoveUserMetadataResponse)
5353
{
5454
if (!PubnubClient)
5555
{
5656
UE_LOG(PubnubLog, Error, TEXT("Cannot remove user metadata - PubnubClient is null. Entity not properly initialized."));
5757
return;
5858
}
59-
PubnubClient->RemoveUserMetadata(EntityID, OnRemoveUserMetadataResponse);
59+
PubnubClient->RemoveUserMetadataAsync(EntityID, OnRemoveUserMetadataResponse);
6060
}
6161

62-
void UPubnubUserMetadataEntity::RemoveUserMetadata(FOnPubnubRemoveUserMetadataResponseNative NativeCallback)
62+
void UPubnubUserMetadataEntity::RemoveUserMetadataAsync(FOnPubnubRemoveUserMetadataResponseNative NativeCallback)
6363
{
6464
if (!PubnubClient)
6565
{
6666
UE_LOG(PubnubLog, Error, TEXT("Cannot remove user metadata - PubnubClient is null. Entity not properly initialized."));
6767
return;
6868
}
69-
PubnubClient->RemoveUserMetadata(EntityID, NativeCallback);
69+
PubnubClient->RemoveUserMetadataAsync(EntityID, NativeCallback);
7070
}
7171

0 commit comments

Comments
 (0)