You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/06/01 20:01:40 UTC
[celix] branch feature/add_intent_to_cxx_rsa updated: Fixes wrong
rename issue for OSX
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/add_intent_to_cxx_rsa
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/add_intent_to_cxx_rsa by this push:
new 0aacbf9 Fixes wrong rename issue for OSX
0aacbf9 is described below
commit 0aacbf9371b640480b5beecdae3128bdc5e38fb3
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Jun 1 22:01:22 2021 +0200
Fixes wrong rename issue for OSX
---
bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h | 4 ++--
.../rsa_spi/include/celix/rsa/EndpointDescription.h | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h
index 408bac7..6101799 100644
--- a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h
+++ b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h
@@ -81,8 +81,8 @@ namespace celix::rsa {
#else
std::multimap<std::string, std::shared_ptr<celix::rsa::IExportServiceFactory>> exportServiceFactories{}; //key = service name
std::multimap<std::string, std::shared_ptr<celix::rsa::IImportServiceFactory>> importServiceFactories{}; //key = service name
- std::unordered_map<std::string, std::unique_ptr<celix::rsa::IImportServiceGuard>> importedServices{}; //key = endpoint id
- std::unordered_map<long, std::unique_ptr<celix::rsa::IExportServiceGuard>> exportedServices{}; //key = service id
+ std::unordered_map<std::string, std::unique_ptr<celix::rsa::IImportRegistration>> importedServices{}; //key = endpoint id
+ std::unordered_map<long, std::unique_ptr<celix::rsa::IExportRegistration>> exportedServices{}; //key = service id
#endif
std::vector<std::shared_ptr<celix::rsa::EndpointDescription>> toBeImportedServices{};
std::vector<std::shared_ptr<const celix::Properties>> toBeExportedServices{};
diff --git a/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/EndpointDescription.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/EndpointDescription.h
index 6408c9d..a747deb 100644
--- a/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/EndpointDescription.h
+++ b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/EndpointDescription.h
@@ -58,7 +58,7 @@ namespace celix::rsa {
configurationTypes{celix::split(endpointProperties.get(celix::rsa::SERVICE_IMPORTED_CONFIGS))},
frameworkUUID{endpointProperties.get(celix::rsa::ENDPOINT_FRAMEWORK_UUID)},
intents{celix::split(endpointProperties.get(celix::rsa::SERVICE_INTENTS))},
- interface{endpointProperties.get(celix::SERVICE_NAME)} {
+ serviceName{endpointProperties.get(celix::SERVICE_NAME)} {
checkValidEndpoint();
}
@@ -79,7 +79,7 @@ namespace celix::rsa {
configurationTypes{celix::split(endpointProperties.get(celix::rsa::SERVICE_IMPORTED_CONFIGS))},
frameworkUUID{endpointProperties.get(celix::rsa::ENDPOINT_FRAMEWORK_UUID)},
intents{celix::split(endpointProperties.get(celix::rsa::SERVICE_INTENTS))},
- interface{endpointProperties.get(celix::SERVICE_NAME)} {
+ serviceName{endpointProperties.get(celix::SERVICE_NAME)} {
checkValidEndpoint();
}
@@ -135,7 +135,7 @@ namespace celix::rsa {
* The value of the interface is derived from the objectClass property.
*/
[[nodiscard]] const std::string& getInterface() const {
- return interface;
+ return serviceName;
}
/**
@@ -181,13 +181,13 @@ namespace celix::rsa {
void checkValidEndpoint() const {
std::string baseMsg = "Invalid properties for EndpointDescription, missing mandatory property ";
- if (endpointProperties.get(celix::rsa::ENDPOINT_ID).empty()) {
+ if (endpointId.empty()) {
throw celix::rsa::RemoteServicesException{baseMsg.append(celix::rsa::ENDPOINT_ID)};
}
- if (endpointProperties.get(celix::rsa::ENDPOINT_ID).empty()) {
+ if (configurationTypes.empty()) {
throw celix::rsa::RemoteServicesException{baseMsg.append(celix::rsa::SERVICE_IMPORTED_CONFIGS)};
}
- if (endpointProperties.get(celix::SERVICE_NAME).empty()) {
+ if (serviceName.empty()) {
throw celix::rsa::RemoteServicesException{baseMsg.append(celix::SERVICE_NAME)};
}
}
@@ -197,6 +197,6 @@ namespace celix::rsa {
const std::vector<std::string> configurationTypes;
const std::string frameworkUUID;
const std::vector<std::string> intents;
- const std::string interface;
+ const std::string serviceName;
};
} // end namespace celix::rsa.