1 files changed, 141 insertions, 46 deletions
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index c237cd6..52eed4e 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* Used org.genivi.commonapi.core 3.1.2.v201507021046.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -127,7 +127,10 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         TestInterfaceStub,
         uint32_t
-        > TestInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u");
+        > TestInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
+            &TestInterfaceStub::getTestPredefinedTypeAttributeAttribute
+            , "u"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         TestInterfaceStub,
         uint32_t
@@ -140,11 +143,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         TestInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended
-        > TestInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)");
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+        > TestInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
+            &TestInterfaceStub::getTestDerivedStructAttributeAttribute
+            , "(sqi)"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         TestInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > TestInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
                 &TestInterfaceStub::getTestDerivedStructAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
@@ -154,11 +162,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         TestInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
-        > TestInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestInterfaceStub::getTestDerivedArrayAttributeAttribute, "at");
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+        > TestInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
+            &TestInterfaceStub::getTestDerivedArrayAttributeAttribute
+            , "at"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         TestInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > TestInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
                 &TestInterfaceStub::getTestDerivedArrayAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
@@ -168,89 +181,172 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 
 
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<>,
+    std::tuple<>,
+    std::tuple<>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher(&TestInterfaceStub::testEmptyMethod, "", std::tuple<>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher(
+    &TestInterfaceStub::testEmptyMethod, "",
+					std::make_tuple(),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
+    std::tuple<>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher(&TestInterfaceStub::testVoidPredefinedTypeMethod, "", std::tuple<uint32_t, std::string>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher(
+    &TestInterfaceStub::testVoidPredefinedTypeMethod, "",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
-    std::tuple<uint32_t, std::string>
-    > TestInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher(&TestInterfaceStub::testPredefinedTypeMethod, "us", std::tuple<uint32_t, std::string, uint32_t, std::string>());
+    std::tuple<uint32_t, std::string>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>
+    
+    > TestInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher(
+    &TestInterfaceStub::testPredefinedTypeMethod, "us",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)),
+                	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)));
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
+    std::tuple<>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher(&TestInterfaceStub::testVoidDerivedTypeMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher(
+    &TestInterfaceStub::testVoidDerivedTypeMethod, "",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
-    std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>
-    > TestInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher(&TestInterfaceStub::testDerivedTypeMethod, "ia{ua(sq)}", std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>());
+    std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
+    
+    > TestInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher(
+    &TestInterfaceStub::testDerivedTypeMethod, "ia{ua(sq)}",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)),
+                	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)));
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
+    std::tuple<>,
+    std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher(&TestInterfaceStub::TestArrayOfPolymorphicStructMethod, "", std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher(
+    &TestInterfaceStub::TestArrayOfPolymorphicStructMethod, "",
+					std::make_tuple(static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher(&TestInterfaceStub::TestMapOfPolymorphicStructMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher(
+    &TestInterfaceStub::TestMapOfPolymorphicStructMethod, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher(&TestInterfaceStub::TestStructWithPolymorphicMemberMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher(
+    &TestInterfaceStub::TestStructWithPolymorphicMemberMethod, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
     std::tuple<>
-    > TestInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher(&TestInterfaceStub::TestStructWithEnumKeyMapMember, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>());
+    
+    > TestInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher(
+    &TestInterfaceStub::TestStructWithEnumKeyMapMember, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr)),
+                	std::make_tuple());
 
 
 void TestInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+    uint32_t
+    >>
         ::sendSignal(
             *this,
             "onTestPredefinedTypeAttributeAttributeChanged",
             "u",
             value
+    
     );
 }
 void TestInterfaceDBusStubAdapterInternal::fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestStructExtended>>
+    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestStructExtended, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t> deployedValue(value, static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr));
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+    CommonAPI::Deployable<
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+    >
+    >>
         ::sendSignal(
             *this,
             "onTestDerivedStructAttributeAttributeChanged",
             "(sqi)",
-            value
+            deployedValue
+    
     );
 }
 void TestInterfaceDBusStubAdapterInternal::fireTestDerivedArrayAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64>>
+    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t> deployedValue(value, static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr));
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+    CommonAPI::Deployable<
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+    >
+    >>
         ::sendSignal(
             *this,
             "onTestDerivedArrayAttributeAttributeChanged",
             "at",
-            value
+            deployedValue
+    
     );
 }
 
 void TestInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeBroadcastEvent(const uint32_t& uint32Value, const std::string& stringValue) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>>
-            ::sendSignal(
-                *this,
-                "TestPredefinedTypeBroadcast",
-                "us",
-                uint32Value, stringValue
-        );
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+    uint32_t,
+    CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>
+    >>::sendSignal(
+            *this,
+            "TestPredefinedTypeBroadcast",
+            "us",
+    uint32Value,
+    CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>(stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))
+    );
 }
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
     TestInterfaceStub,
@@ -271,8 +367,8 @@ void TestInterfaceDBusStubAdapterInternal::fireTestSelectiveBroadcastSelective(c
 
     if(dbusClient)
     {
-        CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<>>
-            ::sendSignal(
+        CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+        >>::sendSignal(
                 dbusClient->getDBusId(),
                 *this,
                 "TestSelectiveBroadcast",
@@ -295,26 +391,24 @@ void TestInterfaceDBusStubAdapterInternal::sendTestSelectiveBroadcastSelective(c
 }
 
 void TestInterfaceDBusStubAdapterInternal::subscribeForTestSelectiveBroadcastSelective(const std::shared_ptr<CommonAPI::ClientId> clientId, bool& success) {
-    bool ok = stub_->onTestSelectiveBroadcastSelectiveSubscriptionRequested(clientId);
+    bool ok = TestInterfaceDBusStubAdapterHelper::stub_->onTestSelectiveBroadcastSelectiveSubscriptionRequested(clientId);
     if (ok) {
         subscribersForTestSelectiveBroadcastSelective_->insert(clientId);
-        stub_->onTestSelectiveBroadcastSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::SUBSCRIBED);
+        TestInterfaceDBusStubAdapterHelper::stub_->onTestSelectiveBroadcastSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::SUBSCRIBED);
         success = true;
     } else {
         success = false;
     }
 }
 
-
 void TestInterfaceDBusStubAdapterInternal::unsubscribeFromTestSelectiveBroadcastSelective(const std::shared_ptr<CommonAPI::ClientId> clientId) {
     subscribersForTestSelectiveBroadcastSelective_->erase(clientId);
-    stub_->onTestSelectiveBroadcastSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::UNSUBSCRIBED);
+    TestInterfaceDBusStubAdapterHelper::stub_->onTestSelectiveBroadcastSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::UNSUBSCRIBED);
 }
 
 std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceDBusStubAdapterInternal::getSubscribersForTestSelectiveBroadcastSelective() {
     return subscribersForTestSelectiveBroadcastSelective_;
 }
-
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
     TestInterfaceStub,
     TestInterfaceStubAdapter,
@@ -334,13 +428,16 @@ void TestInterfaceDBusStubAdapterInternal::fireTestBroadcastWithOutArgsSelective
 
     if(dbusClient)
     {
-        CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>>
-            ::sendSignal(
+        CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
+        uint32_t,
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>
+        >>::sendSignal(
                 dbusClient->getDBusId(),
                 *this,
                 "TestBroadcastWithOutArgs",
                 "us",
-                _uint32Value, _stringValue
+        _uint32Value,
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))
         );
     }
 }
@@ -359,20 +456,19 @@ void TestInterfaceDBusStubAdapterInternal::sendTestBroadcastWithOutArgsSelective
 }
 
 void TestInterfaceDBusStubAdapterInternal::subscribeForTestBroadcastWithOutArgsSelective(const std::shared_ptr<CommonAPI::ClientId> clientId, bool& success) {
-    bool ok = stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionRequested(clientId);
+    bool ok = TestInterfaceDBusStubAdapterHelper::stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionRequested(clientId);
     if (ok) {
         subscribersForTestBroadcastWithOutArgsSelective_->insert(clientId);
-        stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::SUBSCRIBED);
+        TestInterfaceDBusStubAdapterHelper::stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::SUBSCRIBED);
         success = true;
     } else {
         success = false;
     }
 }
 
-
 void TestInterfaceDBusStubAdapterInternal::unsubscribeFromTestBroadcastWithOutArgsSelective(const std::shared_ptr<CommonAPI::ClientId> clientId) {
     subscribersForTestBroadcastWithOutArgsSelective_->erase(clientId);
-    stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::UNSUBSCRIBED);
+    TestInterfaceDBusStubAdapterHelper::stub_->onTestBroadcastWithOutArgsSelectiveSubscriptionChanged(clientId, CommonAPI::SelectiveBroadcastSubscriptionEvent::UNSUBSCRIBED);
 }
 
 std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceDBusStubAdapterInternal::getSubscribersForTestBroadcastWithOutArgsSelective() {
@@ -380,7 +476,6 @@ std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceDBusStubAdapterInter
 }
 
 
-
 const TestInterfaceDBusStubAdapterHelper::StubDispatcherTable& TestInterfaceDBusStubAdapterInternal::getStubDispatcherTable() {
     return stubDispatcherTable_;
 }