summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlipci <lipci@ubuntu>2013-02-04 06:49:25 -0800
committerlipci <lipci@ubuntu>2013-02-04 06:49:25 -0800
commita2bbb0ca103dbd3bcae19ed0b287d874136a0147 (patch)
tree999c3fc8b1b6e23cd7aae6ee26d377a7a7071b1b
parent8af47f289c30239d9d154efea0bde382d20c86a4 (diff)
downloadgenivi-common-api-runtime-a2bbb0ca103dbd3bcae19ed0b287d874136a0147.tar.gz
Adaptions for support of config files
-rw-r--r--src/CommonAPI/Factory.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CommonAPI/Factory.h b/src/CommonAPI/Factory.h
index 82d8dcf..6eced62 100644
--- a/src/CommonAPI/Factory.h
+++ b/src/CommonAPI/Factory.h
@@ -52,7 +52,7 @@ class Factory {
const std::string& serviceName,
const std::string& domain) {
- std::shared_ptr<Proxy> abstractMiddlewareProxy = createProxy(_ProxyClass<_AttributeExtensions...>::getInterfaceName(), participantId, serviceName, domain);
+ std::shared_ptr<Proxy> abstractMiddlewareProxy = createProxy(_ProxyClass<_AttributeExtensions...>::getInterfaceId(), participantId, serviceName, domain);
return std::make_shared<_ProxyClass<_AttributeExtensions...>>(abstractMiddlewareProxy);
}
@@ -76,7 +76,7 @@ class Factory {
const std::string& serviceName,
const std::string& domain) {
- std::shared_ptr<Proxy> abstractMiddlewareProxy = createProxy(DefaultAttributeProxyFactoryHelper<_ProxyClass, _AttributeExtension>::class_t::getInterfaceName(), participantId, serviceName, domain);
+ std::shared_ptr<Proxy> abstractMiddlewareProxy = createProxy(DefaultAttributeProxyFactoryHelper<_ProxyClass, _AttributeExtension>::class_t::getInterfaceId(), participantId, serviceName, domain);
return std::make_shared<typename DefaultAttributeProxyFactoryHelper<_ProxyClass, _AttributeExtension>::class_t>(abstractMiddlewareProxy);
}
@@ -105,12 +105,12 @@ class Factory {
const std::string& domain) {
std::shared_ptr<StubBase> stubBase = std::dynamic_pointer_cast<StubBase>(stub);
- std::shared_ptr<CommonAPI::StubAdapter> stubAdapter = createAdapter(stubBase, _Stub::StubAdapterType::getInterfaceName(), participantId, serviceName, domain);
+ std::shared_ptr<CommonAPI::StubAdapter> stubAdapter = createAdapter(stubBase, _Stub::StubAdapterType::getInterfaceId(), participantId, serviceName, domain);
if(!stubAdapter) {
return false;
}
- std::string address = domain + ":" + _Stub::StubAdapterType::getInterfaceName() + ":" + participantId;
+ std::string address = domain + ":" + serviceName + ":" + participantId;
registeredServices_.insert( {std::move(address), stubAdapter} );
return true;
@@ -142,8 +142,8 @@ class Factory {
virtual bool isServiceInstanceAlive(const std::string& serviceInstanceID, const std::string& serviceName, const std::string& serviceDomainName = "local") = 0;
protected:
- virtual std::shared_ptr<Proxy> createProxy(const char* interfaceName, const std::string& participantId, const std::string& serviceName, const std::string& domain) = 0;
- virtual std::shared_ptr<StubAdapter> createAdapter(std::shared_ptr<StubBase> stubBase, const char* interfaceName, const std::string& participantId, const std::string& serivceName, const std::string& domain) = 0;
+ virtual std::shared_ptr<Proxy> createProxy(const char* interfaceId, const std::string& participantId, const std::string& serviceName, const std::string& domain) = 0;
+ virtual std::shared_ptr<StubAdapter> createAdapter(std::shared_ptr<StubBase> stubBase, const char* interfaceId, const std::string& participantId, const std::string& serivceName, const std::string& domain) = 0;
private:
std::shared_ptr<Runtime> runtime_;