From 95e851d61b6d8d46dd07434489b316885a5d1102 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 12 Sep 2013 14:06:18 +0200 Subject: * corrected registerDomain Signed-off-by: Christian Linke --- PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl | 3 +-- PluginRoutingInterfaceCAPI/include/CAmRoutingService.h | 2 +- .../org/genivi/am/RoutingControlObserverDBusProxy.cpp | 16 ++++++++-------- .../org/genivi/am/RoutingControlObserverDBusProxy.h | 4 ++-- .../genivi/am/RoutingControlObserverDBusStubAdapter.cpp | 7 +++---- .../src-gen/org/genivi/am/RoutingControlObserverProxy.h | 12 ++++++------ .../org/genivi/am/RoutingControlObserverProxyBase.h | 4 ++-- .../src-gen/org/genivi/am/RoutingControlObserverStub.h | 2 +- .../org/genivi/am/RoutingControlObserverStubDefault.cpp | 2 +- .../org/genivi/am/RoutingControlObserverStubDefault.h | 2 +- PluginRoutingInterfaceCAPI/src/CAmRoutingService.cpp | 2 +- .../test/CAmRoutingInterfaceCAPITests.cpp | 5 +---- .../test/CAmRoutingSenderService.cpp | 1 - 13 files changed, 28 insertions(+), 34 deletions(-) (limited to 'PluginRoutingInterfaceCAPI') diff --git a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl index 0a6e700..4c47707 100644 --- a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl +++ b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl @@ -411,9 +411,8 @@ A client should notify himself to this attribute in order to know the current st @description : domainID in am_Domain_s must be 0! **> am_Domain_s domainData - String returnInterface - String returnPath String returnBusname + String returnInterface } out { am_domainID_t domainID diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h index 1018708..0c7d449 100644 --- a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h @@ -75,7 +75,7 @@ public: void peekDomain(std::string name, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error); - void registerDomain(org::genivi::am::am_Domain_s domainData, std::string returnBusname, std::string, std::string returnInterface, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error); + void registerDomain(org::genivi::am::am_Domain_s domainData, std::string returnBusname, std::string returnInterface, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error); void deregisterDomain(org::genivi::am::am_domainID_t domainID, org::genivi::am::am_Error_e& returnError); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp index 38cf3c3..637b174 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp @@ -306,23 +306,23 @@ std::future RoutingControlObserverDBusProxy::peekDomainAs name, std::move(callback)); } -void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { - CommonAPI::DBus::DBusProxyHelper, +void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { + CommonAPI::DBus::DBusProxyHelper, CommonAPI::DBus::DBusSerializableArguments >::callMethodWithReply( *this, "registerDomain", - "(qsssbbi)sss", - domainData, returnInterface, returnPath, returnBusname, + "(qsssbbi)ss", + domainData, returnBusname, returnInterface, callStatus , domainID, error); } -std::future RoutingControlObserverDBusProxy::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper, +std::future RoutingControlObserverDBusProxy::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) { + return CommonAPI::DBus::DBusProxyHelper, CommonAPI::DBus::DBusSerializableArguments >::callMethodAsync( *this, "registerDomain", - "(qsssbbi)sss", - domainData, returnInterface, returnPath, returnBusname, + "(qsssbbi)ss", + domainData, returnBusname, returnInterface, std::move(callback)); } void RoutingControlObserverDBusProxy::deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error) { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h index 42e0828..35afdb9 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h @@ -96,8 +96,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); virtual std::future peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback); - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); - virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback); + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); + virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback); virtual void deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error); virtual std::future deregisterDomainAsync(const am_domainID_t& domainID, DeregisterDomainAsyncCallback callback); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp index 5f55964..d1cef2e 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp @@ -129,9 +129,8 @@ const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXm "\n" "\n" "\n" - "\n" - "\n" "\n" + "\n" "\n" "\n" "\n" @@ -354,7 +353,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< > peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, - std::tuple, + std::tuple, std::tuple > registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< @@ -536,7 +535,7 @@ const org::genivi::am::RoutingControlObserverDBusStubAdapterHelper::StubDispatch { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::ackSourceVolumeTickStubDispatcher }, { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::ackSinkVolumeTickStubDispatcher }, { { "peekDomain", "s" }, &org::genivi::am::peekDomainStubDispatcher }, - { { "registerDomain", "(qsssbbi)sss" }, &org::genivi::am::registerDomainStubDispatcher }, + { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::registerDomainStubDispatcher }, { { "deregisterDomain", "q" }, &org::genivi::am::deregisterDomainStubDispatcher }, { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::registerGatewayStubDispatcher }, { { "deregisterGateway", "q" }, &org::genivi::am::deregisterGatewayStubDispatcher }, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h index 421912f..7a22e9d 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h @@ -350,7 +350,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua * will be set. * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); /** * Calls registerDomain with asynchronous semantics. * @@ -361,7 +361,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua * The std::future returned by this method will be fulfilled at arrival of the reply. * It will provide the same value for CallStatus as will be handed to the callback. */ - virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback); + virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback); /** * Calls deregisterDomain with synchronous semantics. @@ -1214,13 +1214,13 @@ std::future RoutingControlObserverProxy<_AttributeExtensi } template -void RoutingControlObserverProxy<_AttributeExtensions...>::registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { - delegate_->registerDomain(domainData, returnInterface, returnPath, returnBusname, callStatus, domainID, error); +void RoutingControlObserverProxy<_AttributeExtensions...>::registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { + delegate_->registerDomain(domainData, returnBusname, returnInterface, callStatus, domainID, error); } template -std::future RoutingControlObserverProxy<_AttributeExtensions...>::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) { - return delegate_->registerDomainAsync(domainData, returnInterface, returnPath, returnBusname, callback); +std::future RoutingControlObserverProxy<_AttributeExtensions...>::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) { + return delegate_->registerDomainAsync(domainData, returnBusname, returnInterface, callback); } template diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h index 7325057..dd47b17 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h @@ -141,8 +141,8 @@ virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; virtual std::future peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback) = 0; - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; - virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) = 0; + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; + virtual std::future registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) = 0; virtual void deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; virtual std::future deregisterDomainAsync(const am_domainID_t& domainID, DeregisterDomainAsyncCallback callback) = 0; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h index bc767cf..0c27b29 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h @@ -127,7 +127,7 @@ class RoutingControlObserverStub : public CommonAPI::Stub(mpIAmRoutingReceive->peekDomain(name, domainID)); } -void CAmRoutingService::registerDomain(org::genivi::am::am_Domain_s domainData, std::string returnBusname, std::string, std::string returnInterface, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error) { +void CAmRoutingService::registerDomain(org::genivi::am::am_Domain_s domainData, std::string returnBusname, std::string returnInterface, org::genivi::am::am_domainID_t& domainID, org::genivi::am::am_Error_e& error) { assert(mpIAmRoutingReceive); assert(mpLookpData); assert(mpCAmCAPIWrapper); diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp index 5b75f7d..22c7705 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp @@ -622,7 +622,6 @@ TEST_F(CAmRoutingInterfaceCAPITests, registerDomain) //example: [local:org.genivi.audiomanger.testdomaininterface:org.genivi.audiomanger] env->mProxy->registerDomain(domainData, "org.genivi.audiomanger", //(last part) - "", "org.genivi.audiomanger.testdomaininterface", //(middle part) callStatus, domainID, @@ -1537,7 +1536,7 @@ TEST_F(CAmRoutingInterfaceCAPITests, confirmRoutingRundown) org::genivi::am::am_Domain_s domainData(0, name, busname, nodename, false, false, org::genivi::am::am_DomainState_e::DS_CONTROLLED); ON_CALL(*env->mpRoutingReceive, registerDomain(_,_)).WillByDefault(Return(E_OK)); EXPECT_CALL(*env->mpRoutingReceive, registerDomain(_, _)); - env->mProxy->registerDomain(domainData,"sd","sds","sd",domainstatus,domainID,CAPIError); + env->mProxy->registerDomain(domainData,"sd","sd",domainstatus,domainID,CAPIError); ASSERT_EQ( domainstatus, CallStatus::SUCCESS ); env->mpPlugin->setRoutingRundown(5); EXPECT_CALL(*env->mpRoutingReceive, confirmRoutingRundown(5,E_OK)).Times(1); @@ -1583,7 +1582,6 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_registerDomain) EXPECT_CALL(*env->mpRoutingReceive, registerDomain(IsDomainDataEqualTo(amDomainData), _)).WillOnce(DoAll(actionRegister(), Return(E_OK))); env->mProxy->registerDomain(domainData, CAPI_SENDER_INSTANCE, - CAPI_SENDER_PATH, CAPI_SENDER_INTERFACE, callStatus, domainID, @@ -1602,7 +1600,6 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_registerDomain) EXPECT_CALL(*env->mpRoutingReceive, registerDomain(IsDomainDataEqualTo(amDomainData), _)).WillOnce(DoAll(actionRegister2(), Return(E_OK))); env->mProxy->registerDomain(domainData, CAPI_SENDER_INSTANCE, - CAPI_SENDER_PATH, CAPI_SENDER_INTERFACE, callStatus, domainID, diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp index bce9aef..2cf3641 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.cpp @@ -115,7 +115,6 @@ void CAmRoutingSenderService::registerDomain() CommonAPI::CallStatus callStatus; mRoutingInterfaceProxy->registerDomain(mDomainData, CAPI_SENDER_INSTANCE, - CAPI_SENDER_PATH, CAPI_SENDER_INTERFACE, callStatus, mDomainData.domainID, -- cgit v1.2.1