This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-osgi-defines in repository https://gitbox.apache.org/repos/asf/celix.git
commit 84ea39f336863f3a1f66d549ad3879fecf0a36dd Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Oct 29 14:11:44 2023 +0100 #509: Update usage of CELIX_FRAMEWORK_UUID in C++ sources --- .../gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc | 12 ++++++------ .../gtest/src/DiscoveryZeroconfWatcherTestSuite.cc | 2 +- .../gtest/src/RsaShmExportRegistrationUnitTestSuite.cc | 2 +- .../gtest/src/RsaShmImportRegistrationUnitTestSuite.cc | 2 +- .../rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc | 2 +- .../bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc index a15a4c79..66caf1fb 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfAnnouncerTestSuite.cc @@ -188,7 +188,7 @@ static void OnServiceBrowseCallback(DNSServiceRef sdRef, DNSServiceFlags flags, static void OnUseServiceCallback(void *handle, void *svc) { DiscoveryZeroconfAnnouncerTestSuite *t = (DiscoveryZeroconfAnnouncerTestSuite *)handle; endpoint_listener_t *epl = (endpoint_listener_t *)svc; - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); if (t->ifIndex == kDNSServiceInterfaceIndexAny) { celix_properties_set(properties, CELIX_RSA_NETWORK_INTERFACES, "all"); @@ -249,7 +249,7 @@ TEST_F(DiscoveryZeroconfAnnouncerTestSuite, AddAndRemoveLocalOnlyEndpoint) { static void OnUseServiceCallbackForRegisterServiceFailure(void *handle, void *svc) { DiscoveryZeroconfAnnouncerTestSuite *t = (DiscoveryZeroconfAnnouncerTestSuite *)handle; endpoint_listener_t *epl = (endpoint_listener_t *)svc; - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, fwUuid); celix_properties_set(properties, CELIX_FRAMEWORK_SERVICE_NAME, "dzc_test_service"); @@ -291,7 +291,7 @@ TEST_F(DiscoveryZeroconfAnnouncerTestSuite, FailedToRegisterService) { static void OnUseServiceCallbackForNameConflict(void *handle, void *svc) { DiscoveryZeroconfAnnouncerTestSuite *t = (DiscoveryZeroconfAnnouncerTestSuite *)handle; endpoint_listener_t *epl = (endpoint_listener_t *)svc; - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); if (t->ifIndex == kDNSServiceInterfaceIndexAny) { celix_properties_set(properties, CELIX_RSA_NETWORK_INTERFACES, "all"); @@ -396,7 +396,7 @@ TEST_F(DiscoveryZeroconfAnnouncerTestSuite, AddAndRemoveLoopBackEndpoint) { static void OnUseServiceWithJumboEndpointCallback(void *handle, void *svc) { DiscoveryZeroconfAnnouncerTestSuite *t = (DiscoveryZeroconfAnnouncerTestSuite *)handle; endpoint_listener_t *epl = (endpoint_listener_t *)svc; - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); if (t->ifIndex == kDNSServiceInterfaceIndexAny) { celix_properties_set(properties, CELIX_RSA_NETWORK_INTERFACES, "all"); @@ -462,7 +462,7 @@ static void OnUseServiceWithInvalidEndpointCallback(void *handle, void *svc) { status = epl->endpointRemoved(epl->handle, nullptr, nullptr); EXPECT_EQ(status, CELIX_ILLEGAL_ARGUMENT); - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, fwUuid); celix_properties_set(properties, CELIX_FRAMEWORK_SERVICE_NAME, "dzc_test_service"); @@ -500,7 +500,7 @@ TEST_F(DiscoveryZeroconfAnnouncerTestSuite, AddInvalidEndpoint) { static void OnUseServiceForAddEndpointENOMEM(void *handle, void *svc) { DiscoveryZeroconfAnnouncerTestSuite *t = (DiscoveryZeroconfAnnouncerTestSuite *)handle; endpoint_listener_t *epl = (endpoint_listener_t *)svc; - const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(t->ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_t *properties = celix_properties_create(); if (t->ifIndex == kDNSServiceInterfaceIndexAny) { celix_properties_set(properties, CELIX_RSA_NETWORK_INTERFACES, "all"); diff --git a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc index 4d6d67be..677d7c8b 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc +++ b/bundles/remote_services/discovery_zeroconf/gtest/src/DiscoveryZeroconfWatcherTestSuite.cc @@ -293,7 +293,7 @@ TEST_F(DiscoveryZeroconfWatcherTestSuite, AddAndRemoveSelfFrameworkEndpoint) { char txtBuf[1300] = {0}; TXTRecordRef txtRecord; TXTRecordCreate(&txtRecord, sizeof(txtBuf), txtBuf); - const char *fwUuid = celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *fwUuid = celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); TXTRecordSetValue(&txtRecord, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, fwUuid == nullptr ? 0 : strlen(fwUuid), fwUuid); TXTRecordSetValue(&txtRecord, CELIX_FRAMEWORK_SERVICE_NAME, strlen("dzc_test_self_fw_service"), "dzc_test_self_fw_service"); TXTRecordSetValue(&txtRecord, OSGI_RSA_ENDPOINT_ID, strlen("60f49d89-d105-430c-b12b-93fbb54b1d19"), "60f49d89-d105-430c-b12b-93fbb54b1d19"); diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc index 565f50d9..a8569190 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmExportRegistrationUnitTestSuite.cc @@ -132,7 +132,7 @@ public: celix_properties_set(properties, OSGI_RSA_ENDPOINT_ID, "7f7efba5-500f-4ee9-b733-68de012091da"); celix_properties_setLong(properties, OSGI_RSA_ENDPOINT_SERVICE_ID, calcSvcId); celix_properties_set(properties, OSGI_RSA_SERVICE_IMPORTED, "true"); - celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, "")); + celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_UUID, "")); celix_properties_set(properties, RSA_SHM_SERVER_NAME_KEY, "ShmServ-dummy"); endpoint_description_t *endpoint = nullptr; auto status = endpointDescription_create(properties, &endpoint); diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc index c4982d6d..93d8a744 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/src/RsaShmImportRegistrationUnitTestSuite.cc @@ -111,7 +111,7 @@ public: celix_properties_set(properties, OSGI_RSA_ENDPOINT_ID, "7f7efba5-500f-4ee9-b733-68de012091da"); celix_properties_setLong(properties, OSGI_RSA_ENDPOINT_SERVICE_ID, 100);//Set a dummy service id celix_properties_set(properties, OSGI_RSA_SERVICE_IMPORTED, "true"); - celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, "")); + celix_properties_set(properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_UUID, "")); celix_properties_set(properties, RSA_SHM_SERVER_NAME_KEY, "ShmServ-dummy"); endpoint_description_t *endpoint = nullptr; auto status = endpointDescription_create(properties, &endpoint); diff --git a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc index 87a8f281..47f906fb 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc +++ b/bundles/remote_services/rsa_rpc_json/gtest/src/RsaJsonRpcUnitTestSuite.cc @@ -86,7 +86,7 @@ public: EXPECT_NE(endpointDesc, nullptr); endpointDesc->properties = celix_properties_create(); EXPECT_TRUE(endpointDesc->properties != nullptr); - const char *uuid = celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + const char *uuid = celix_bundleContext_getProperty(ctx.get(), CELIX_FRAMEWORK_UUID, nullptr); celix_properties_set(endpointDesc->properties, OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid); celix_properties_set(endpointDesc->properties, CELIX_FRAMEWORK_SERVICE_NAME, RSA_RPC_JSON_TEST_SERVICE); celix_properties_set(endpointDesc->properties, CELIX_FRAMEWORK_SERVICE_VERSION, "1.0.0"); diff --git a/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc index 09fa1902..064f3e73 100644 --- a/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc +++ b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc @@ -43,7 +43,7 @@ pubsub_nanomsg_admin::pubsub_nanomsg_admin(celix_bundle_context_t *_ctx): ctx{_ctx}, L{ctx, "pubsub_nanomsg_admin"} { verbose = celix_bundleContext_getPropertyAsBool(ctx, PUBSUB_NANOMSG_VERBOSE_KEY, PUBSUB_NANOMSG_VERBOSE_DEFAULT); - fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_FRAMEWORK_UUID, nullptr); + fwUUID = celix_bundleContext_getProperty(ctx, CELIX_FRAMEWORK_UUID, nullptr); char *ip = nullptr; const char *confIp = celix_bundleContext_getProperty(ctx, PUBSUB_NANOMSG_PSA_IP_KEY , nullptr);
