Skip to content

core: supplemental data is encoded as JSON #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariusBgm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

core: supplemental data is encoded as JSON #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SilKit/source/core/participant/Participant_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ auto Participant<SilKitConnectionT>::CreateDataPublisher(const std::string& cano
supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherPubUUID] = network;
supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherMediaType] = configuredDataNodeSpec.MediaType();
supplementalData[SilKit::Core::Discovery::supplKeyDataPublisherPubLabels] =
SilKit::Config::Serialize(configuredDataNodeSpec.Labels());
SilKit::Config::SerializeAsJson(configuredDataNodeSpec.Labels());

auto controller = CreateController<Services::PubSub::DataPublisher>(
controllerConfig, network, std::move(supplementalData), true, true, &_timeProvider, configuredDataNodeSpec,
Expand Down Expand Up @@ -590,7 +590,7 @@ auto Participant<SilKitConnectionT>::CreateDataSubscriber(
supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberTopic] = configuredDataNodeSpec.Topic();
supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberMediaType] = configuredDataNodeSpec.MediaType();
supplementalData[SilKit::Core::Discovery::supplKeyDataSubscriberSubLabels] =
SilKit::Config::Serialize(configuredDataNodeSpec.Labels());
SilKit::Config::SerializeAsJson(configuredDataNodeSpec.Labels());

auto controller = CreateController<Services::PubSub::DataSubscriber>(
controllerConfig, network, std::move(supplementalData), true, true, controllerConfig, &_timeProvider,
Expand Down Expand Up @@ -683,7 +683,7 @@ auto Participant<SilKitConnectionT>::CreateRpcClient(
supplementalData[SilKit::Core::Discovery::supplKeyRpcClientFunctionName] = configuredRpcSpec.FunctionName();
supplementalData[SilKit::Core::Discovery::supplKeyRpcClientMediaType] = configuredRpcSpec.MediaType();
supplementalData[SilKit::Core::Discovery::supplKeyRpcClientLabels] =
SilKit::Config::Serialize(configuredRpcSpec.Labels());
SilKit::Config::SerializeAsJson(configuredRpcSpec.Labels());
supplementalData[SilKit::Core::Discovery::supplKeyRpcClientUUID] = network;

auto controller =
Expand Down Expand Up @@ -741,7 +741,7 @@ auto Participant<SilKitConnectionT>::CreateRpcServer(
supplementalData[SilKit::Core::Discovery::supplKeyRpcServerFunctionName] = configuredRpcSpec.FunctionName();
supplementalData[SilKit::Core::Discovery::supplKeyRpcServerMediaType] = configuredRpcSpec.MediaType();
supplementalData[SilKit::Core::Discovery::supplKeyRpcServerLabels] =
SilKit::Config::Serialize(configuredRpcSpec.Labels());
SilKit::Config::SerializeAsJson(configuredRpcSpec.Labels());

auto controller = CreateController<Services::Rpc::RpcServer>(controllerConfig, network, supplementalData, true,
true, &_timeProvider, configuredRpcSpec, handler);
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/service/Test_DashboardSilKitToOatppMapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ TEST_F(Test_DashboardSilKitToOatppMapper, CreateBulkDataServiceDto_MapNetworkNam
expectedLabel.value = "myValue";
expectedLabel.kind = Services::MatchingLabel::Kind::Mandatory;
auto labels = std::vector<Services::MatchingLabel>{expectedLabel};
descriptor.SetSupplementalDataItem(Core::Discovery::supplKeyDataSubscriberSubLabels, Config::Serialize(labels));
descriptor.SetSupplementalDataItem(Core::Discovery::supplKeyDataSubscriberSubLabels, Config::SerializeAsJson(labels));

// Act
const auto dataMapper = CreateService();
Expand Down Expand Up @@ -204,7 +204,7 @@ TEST_F(Test_DashboardSilKitToOatppMapper, CreateBulkRpcServiceDto_MapNetworkName
expectedLabel.value = "myValue";
expectedLabel.kind = Services::MatchingLabel::Kind::Mandatory;
auto labels = std::vector<Services::MatchingLabel>{expectedLabel};
descriptor.SetSupplementalDataItem(Core::Discovery::supplKeyRpcClientLabels, Config::Serialize(labels));
descriptor.SetSupplementalDataItem(Core::Discovery::supplKeyRpcClientLabels, Config::SerializeAsJson(labels));

// Act
const auto dataMapper = CreateService();
Expand Down
Loading