diff options
Diffstat (limited to 'src/test/src-gen/dbus/v1_0')
54 files changed, 1769 insertions, 378 deletions
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..a267c64 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp @@ -0,0 +1,28 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "ExtendedInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace ExtendedInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace ExtendedInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..aa20be0 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp @@ -0,0 +1,43 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace ExtendedInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace ExtendedInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp index ea7cc5f..48758f3 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.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. @@ -35,27 +35,40 @@ ExtendedInterfaceDBusProxy::ExtendedInterfaceDBusProxy( - void ExtendedInterfaceDBusProxy::TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void ExtendedInterfaceDBusProxy::TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "TestIntMethodExtended", "u", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, - _status - ); + deploy_inInt, + _internalCallStatus); } std::future<CommonAPI::CallStatus> ExtendedInterfaceDBusProxy::TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "TestIntMethodExtended", "u", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, - std::move(_callback), - std::tuple<>()); + deploy_inInt, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp index 7d95904..a3358bf 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp @@ -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. @@ -41,7 +41,7 @@ public: - virtual void TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp index 3e3fdac..40578de 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.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. @@ -56,7 +56,10 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, uint32_t - > ExtendedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u"); + > ExtendedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher( + &ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute + , "u" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, uint32_t @@ -69,11 +72,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended - > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)"); + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t + > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher( + &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute + , "(sqi)" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher( &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute, &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute, @@ -83,11 +91,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 - > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute, "at"); + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t + > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher( + &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute + , "at" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher( &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute, &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute, @@ -97,58 +110,128 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ); #endif + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testIntMethodExtendedStubDispatcher(&ExtendedInterfaceStub::TestIntMethodExtended, "", std::tuple<uint32_t>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testIntMethodExtendedStubDispatcher( + &ExtendedInterfaceStub::TestIntMethodExtended, "", + std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr)), + std::make_tuple()); #ifdef WIN32 + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<>, + std::tuple<>, + std::tuple<>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher(&ExtendedInterfaceStub::testEmptyMethod, "", std::tuple<>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher( + &ExtendedInterfaceStub::testEmptyMethod, "", + std::make_tuple(), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t, std::string>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testVoidPredefinedTypeMethod, "", std::tuple<uint32_t, std::string>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher( + &ExtendedInterfaceStub::testVoidPredefinedTypeMethod, "", + std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t, std::string>, - std::tuple<uint32_t, std::string> - > ExtendedInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher(&ExtendedInterfaceStub::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> + + > ExtendedInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher( + &ExtendedInterfaceStub::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< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testVoidDerivedTypeMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher( + &ExtendedInterfaceStub::testVoidDerivedTypeMethod, "", + std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap> - > ExtendedInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher(&ExtendedInterfaceStub::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> + + > ExtendedInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher( + &ExtendedInterfaceStub::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< ExtendedInterfaceStub, 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<> - > ExtendedInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher(&ExtendedInterfaceStub::TestArrayOfPolymorphicStructMethod, "", std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher( + &ExtendedInterfaceStub::TestArrayOfPolymorphicStructMethod, "", + std::make_tuple(static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr)), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher(&ExtendedInterfaceStub::TestMapOfPolymorphicStructMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher( + &ExtendedInterfaceStub::TestMapOfPolymorphicStructMethod, "", + std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr)), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher(&ExtendedInterfaceStub::TestStructWithPolymorphicMemberMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher( + &ExtendedInterfaceStub::TestStructWithPolymorphicMemberMethod, "", + std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr)), + std::make_tuple()); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>, std::tuple<> - > ExtendedInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher(&ExtendedInterfaceStub::TestStructWithEnumKeyMapMember, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>()); + + > ExtendedInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher( + &ExtendedInterfaceStub::TestStructWithEnumKeyMapMember, "", + std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr)), + std::make_tuple()); #endif diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp index ff1545c..acbce43 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp @@ -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. @@ -12,6 +12,7 @@ #include <v1_0/commonapi/tests/ExtendedInterfaceStub.hpp> #include <v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp> +#include "v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -20,6 +21,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -81,81 +83,125 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< #ifdef WIN32 static CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, - uint32_t + uint32_t > getTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, - uint32_t + uint32_t > setTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > getTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > setTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > getTestDerivedArrayAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ExtendedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > setTestDerivedArrayAttributeAttributeStubDispatcher; #endif + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment>, std::tuple<> + > testIntMethodExtendedStubDispatcher; #ifdef WIN32 + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<>, + std::tuple<>, + std::tuple<>, std::tuple<> + > testEmptyMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t, std::string>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, std::tuple<> + > testVoidPredefinedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<uint32_t, std::string>, - std::tuple<uint32_t, std::string> + std::tuple<uint32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + > testPredefinedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>, std::tuple<> + > testVoidDerivedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - std::tuple<::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> + > testDerivedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, 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<> + > testArrayOfPolymorphicStructMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>, std::tuple<> + > testMapOfPolymorphicStructMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>, std::tuple<> + > testStructWithPolymorphicMemberMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< ExtendedInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>, std::tuple<> + > testStructWithEnumKeyMapMemberStubDispatcher; #endif diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..c96b62e --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp @@ -0,0 +1,28 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "TestFreedesktopDerivedInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestFreedesktopDerivedInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace TestFreedesktopDerivedInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..bdb1c56 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp @@ -0,0 +1,43 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestFreedesktopDerivedInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace TestFreedesktopDerivedInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp index ada72a5..d46a6cc 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.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. @@ -30,7 +30,7 @@ TestFreedesktopDerivedInterfaceDBusProxy::TestFreedesktopDerivedInterfaceDBusPro const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) : CommonAPI::DBus::DBusProxy(_address, _connection), TestFreedesktopInterfaceDBusProxy(_address, _connection) -, testAttributedFromDerivedInterface_(*this, "onTestAttributedFromDerivedInterfaceAttributeChanged", "setTestAttributedFromDerivedInterfaceAttribute", "u", "getTestAttributedFromDerivedInterfaceAttribute") +, testAttributedFromDerivedInterface_(*this, "onTestAttributedFromDerivedInterfaceAttributeChanged", "setTestAttributedFromDerivedInterfaceAttribute", "u", "getTestAttributedFromDerivedInterfaceAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)) { } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp index 34f0472..24cfb5c 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp @@ -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. diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp index e301425..75505eb 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.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. @@ -61,7 +61,10 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, uint32_t - > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute, "u"); + > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher( + &TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute + , "u" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, uint32_t @@ -77,7 +80,10 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, uint32_t - > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u"); + > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher( + &TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute + , "u" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, uint32_t @@ -91,14 +97,22 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, uint32_t - > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute, "u"); + > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher( + &TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute + , "u" + ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended - > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)"); + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t + > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher( + &TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute + , "(sqi)" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher( &TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute, &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute, @@ -108,11 +122,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 - > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute, "at"); + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t + > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher( + &TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute + , "at" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher( &TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute, &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute, @@ -127,12 +146,15 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< #endif void TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::fireTestAttributedFromDerivedInterfaceAttributeChanged(const uint32_t& value) { - CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>> + CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments< + uint32_t + >> ::sendSignal( *this, "onTestAttributedFromDerivedInterfaceAttributeChanged", "u", value + ); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp index 05fd337..7b940ef 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp @@ -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. @@ -12,6 +12,7 @@ #include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp> #include <v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp> +#include "v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -20,6 +21,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -80,41 +82,45 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - uint32_t + uint32_t > getTestAttributedFromDerivedInterfaceAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - uint32_t + uint32_t > setTestAttributedFromDerivedInterfaceAttributeStubDispatcher; #ifdef WIN32 static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - uint32_t + uint32_t > getTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - uint32_t + uint32_t > setTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - uint32_t + uint32_t > getTestReadonlyAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > getTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > setTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > getTestDerivedArrayAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopDerivedInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > setTestDerivedArrayAttributeAttributeStubDispatcher; #endif diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..f2f2a15 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp @@ -0,0 +1,28 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "TestFreedesktopInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestFreedesktopInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace TestFreedesktopInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..c5df423 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp @@ -0,0 +1,44 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ + + +#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp> + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestFreedesktopInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace TestFreedesktopInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp index 2fe18ce..82a772c 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.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. @@ -29,10 +29,10 @@ TestFreedesktopInterfaceDBusProxy::TestFreedesktopInterfaceDBusProxy( const CommonAPI::DBus::DBusAddress &_address, const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) : CommonAPI::DBus::DBusProxy(_address, _connection) -, testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute"), - testReadonlyAttribute_(*this, "onTestReadonlyAttributeAttributeChanged", "u", "getTestReadonlyAttributeAttribute"), - testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute"), - testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute") +, testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)), + testReadonlyAttribute_(*this, "onTestReadonlyAttributeAttributeChanged", "u", "getTestReadonlyAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)), + testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)), + testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr)) { } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp index d041c8f..d2a3aa2 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ #include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp> +#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp> #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -53,8 +54,8 @@ private: CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_; CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusReadonlyAttribute<TestReadonlyAttributeAttribute>> testReadonlyAttribute_; - CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute>> testDerivedStructAttribute_; - CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute>> testDerivedArrayAttribute_; + CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t>> testDerivedStructAttribute_; + CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t>> testDerivedArrayAttribute_; }; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp index 2f1258c..11b53d4 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.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. @@ -89,7 +89,10 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, uint32_t - > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u"); + > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher( + &TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute + , "u" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, uint32_t @@ -103,14 +106,22 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, uint32_t - > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute, "u"); + > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher( + &TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute + , "u" + ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended - > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)"); + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t + > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher( + &TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute + , "(sqi)" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher( &TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute, &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute, @@ -120,11 +131,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< ); CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 - > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute, "at"); + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t + > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher( + &TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute + , "at" + ); CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher( &TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute, &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute, @@ -137,39 +153,59 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< void TestFreedesktopInterfaceDBusStubAdapterInternal::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 TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestReadonlyAttributeAttributeChanged(const uint32_t& value) { - CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>> + CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments< + uint32_t + >> ::sendSignal( *this, "onTestReadonlyAttributeAttributeChanged", "u", value + ); } void TestFreedesktopInterfaceDBusStubAdapterInternal::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 TestFreedesktopInterfaceDBusStubAdapterInternal::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 + ); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp index 5c165b3..0705da8 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp> +#include "v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -19,6 +20,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -62,31 +64,35 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - uint32_t + uint32_t > getTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, - uint32_t + uint32_t > setTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - uint32_t + uint32_t > getTestReadonlyAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > getTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > setTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > getTestDerivedArrayAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestFreedesktopInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > setTestDerivedArrayAttributeAttributeStubDispatcher; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..e9d2049 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.cpp @@ -0,0 +1,28 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "TestInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace TestInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..a857619 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp @@ -0,0 +1,44 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ + + +#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp> + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace TestInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace TestInterface_ +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp index b202588..94240f6 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.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. @@ -29,12 +29,12 @@ TestInterfaceDBusProxy::TestInterfaceDBusProxy( const CommonAPI::DBus::DBusAddress &_address, const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) : CommonAPI::DBus::DBusProxy(_address, _connection) -, testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute"), - testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute"), - testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute") -, testPredefinedTypeBroadcast_(*this, "TestPredefinedTypeBroadcast", "us", std::tuple<uint32_t, std::string>()), - testSelectiveBroadcastSelective_(*this, "TestSelectiveBroadcast", "", std::tuple<>()), - testBroadcastWithOutArgsSelective_(*this, "TestBroadcastWithOutArgs", "us", std::tuple<uint32_t, std::string>()) +, testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)), + testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)), + testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr)) +, testPredefinedTypeBroadcast_(*this, "TestPredefinedTypeBroadcast", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))), + testSelectiveBroadcastSelective_(*this, "TestSelectiveBroadcast", "", std::make_tuple()), + testBroadcastWithOutArgsSelective_(*this, "TestBroadcastWithOutArgs", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))) { } @@ -58,201 +58,352 @@ TestInterfaceDBusProxy::TestInterfaceDBusProxy( return testBroadcastWithOutArgsSelective_; } - void TestInterfaceDBusProxy::testEmptyMethod(CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::testEmptyMethod(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "testEmptyMethod", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _status - ); + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "testEmptyMethod", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - std::move(_callback), - std::tuple<>()); + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "testVoidPredefinedTypeMethod", "us", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _uint32Value, _stringValue, - _status - ); + deploy_uint32Value, deploy_stringValue, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "testVoidPredefinedTypeMethod", "us", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _uint32Value, _stringValue, - std::move(_callback), - std::tuple<>()); + deploy_uint32Value, deploy_stringValue, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_status, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string> >::callMethodWithReply( + void TestInterfaceDBusProxy::testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_internalCallStatus, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodWithReply( *this, "testPredefinedTypeMethod", "us", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _uint32InValue, _stringInValue, - _status - , _uint32OutValue, _stringOutValue); + deploy_uint32InValue, deploy_stringInValue, + _internalCallStatus, + deploy_uint32OutValue, deploy_stringOutValue); + _uint32OutValue = deploy_uint32OutValue.getValue(); + _stringOutValue = deploy_stringOutValue.getValue(); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<uint32_t, std::string> >::callMethodAsync( + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodAsync( *this, "testPredefinedTypeMethod", "us", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _uint32InValue, _stringInValue, - std::move(_callback), - std::tuple<uint32_t, std::string>()); + deploy_uint32InValue, deploy_stringInValue, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> _uint32OutValue, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _stringOutValue) { + _callback(_status, _uint32OutValue.getValue(), _stringOutValue.getValue()); + }, + std::make_tuple(deploy_uint32OutValue, deploy_stringOutValue)); } - void TestInterfaceDBusProxy::testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "testVoidDerivedTypeMethod", "ia{ua(sq)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _testEnumExtended2Value, _testMapValue, - _status - ); + deploy_testEnumExtended2Value, deploy_testMapValue, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "testVoidDerivedTypeMethod", "ia{ua(sq)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _testEnumExtended2Value, _testMapValue, - std::move(_callback), - std::tuple<>()); + deploy_testEnumExtended2Value, deploy_testMapValue, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_status, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap> >::callMethodWithReply( + void TestInterfaceDBusProxy::testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> + > + >::callMethodWithReply( *this, "testDerivedTypeMethod", "ia{ua(sq)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _testEnumExtended2InValue, _testMapInValue, - _status - , _testEnumExtended2OutValue, _testMapOutValue); + deploy_testEnumExtended2InValue, deploy_testMapInValue, + _internalCallStatus, + deploy_testEnumExtended2OutValue, deploy_testMapOutValue); + _testEnumExtended2OutValue = deploy_testEnumExtended2OutValue.getValue(); + _testMapOutValue = deploy_testMapOutValue.getValue(); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap> >::callMethodAsync( + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> + > + >::callMethodAsync( *this, "testDerivedTypeMethod", "ia{ua(sq)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _testEnumExtended2InValue, _testMapInValue, - std::move(_callback), - std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>()); + deploy_testEnumExtended2InValue, deploy_testMapInValue, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> _testEnumExtended2OutValue, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> _testMapOutValue) { + _callback(_status, _testEnumExtended2OutValue.getValue(), _testMapOutValue.getValue()); + }, + std::make_tuple(deploy_testEnumExtended2OutValue, deploy_testMapOutValue)); } - void TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "TestArrayOfPolymorphicStructMethod", "a(uv)", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inArray, - _status - ); + deploy_inArray, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "TestArrayOfPolymorphicStructMethod", "a(uv)", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inArray, - std::move(_callback), - std::tuple<>()); + deploy_inArray, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "TestMapOfPolymorphicStructMethod", "a{y(uv)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inMap, - _status - ); + deploy_inMap, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "TestMapOfPolymorphicStructMethod", "a{y(uv)}", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inMap, - std::move(_callback), - std::tuple<>()); + deploy_inMap, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "TestStructWithPolymorphicMemberMethod", "(u(uv))", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inStruct, - _status - ); + deploy_inStruct, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "TestStructWithPolymorphicMemberMethod", "(u(uv))", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inStruct, - std::move(_callback), - std::tuple<>()); + deploy_inStruct, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } - void TestInterfaceDBusProxy::TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void TestInterfaceDBusProxy::TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "TestStructWithEnumKeyMapMember", "(a{is})", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inStruct, - _status - ); + deploy_inStruct, + _internalCallStatus); } std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t > + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "TestStructWithEnumKeyMapMember", "(a{is})", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inStruct, - std::move(_callback), - std::tuple<>()); + deploy_inStruct, + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp index 8ed6873..7ac21db 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ #include <v1_0/commonapi/tests/TestInterfaceProxyBase.hpp> +#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp> #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -50,23 +51,23 @@ public: virtual TestSelectiveBroadcastSelectiveEvent& getTestSelectiveBroadcastSelectiveEvent(); virtual TestBroadcastWithOutArgsSelectiveEvent& getTestBroadcastWithOutArgsSelectiveEvent(); - virtual void testEmptyMethod(CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void testEmptyMethod(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_status, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info); + virtual void testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_internalCallStatus, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_status, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info); + virtual void testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info); @@ -75,12 +76,12 @@ public: private: CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_; - CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute>> testDerivedStructAttribute_; - CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute>> testDerivedArrayAttribute_; + CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t>> testDerivedStructAttribute_; + CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t>> testDerivedArrayAttribute_; - CommonAPI::DBus::DBusEvent<TestPredefinedTypeBroadcastEvent, uint32_t, std::string> testPredefinedTypeBroadcast_; + CommonAPI::DBus::DBusEvent<TestPredefinedTypeBroadcastEvent, CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment>, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>> testPredefinedTypeBroadcast_; CommonAPI::DBus::DBusSelectiveEvent<TestSelectiveBroadcastSelectiveEvent> testSelectiveBroadcastSelective_; - CommonAPI::DBus::DBusSelectiveEvent<TestBroadcastWithOutArgsSelectiveEvent, uint32_t, std::string> testBroadcastWithOutArgsSelective_; + CommonAPI::DBus::DBusSelectiveEvent<TestBroadcastWithOutArgsSelectiveEvent, CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment>, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment>> testBroadcastWithOutArgsSelective_; }; 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_; } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp index 7f7d7b1..2a3ad56 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/TestInterfaceStub.hpp> +#include "v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -19,6 +20,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -72,74 +74,114 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestInterfaceStub, - uint32_t + uint32_t > getTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestInterfaceStub, - uint32_t + uint32_t > setTestPredefinedTypeAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > getTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestStructExtended + ::commonapi::tests::DerivedTypeCollection::TestStructExtended, + ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t > setTestDerivedStructAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusGetAttributeStubDispatcher< TestInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > getTestDerivedArrayAttributeAttributeStubDispatcher; static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher< TestInterfaceStub, - ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 + ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, + ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t > setTestDerivedArrayAttributeAttributeStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<>, + std::tuple<>, + std::tuple<>, std::tuple<> + > testEmptyMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<uint32_t, std::string>, + std::tuple<>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, std::tuple<> + > testVoidPredefinedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<uint32_t, std::string>, - std::tuple<uint32_t, std::string> + std::tuple<uint32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + > testPredefinedTypeMethodStubDispatcher; + static 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<> + > testVoidDerivedTypeMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>, - std::tuple<::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> + > testDerivedTypeMethodStubDispatcher; + static 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<> + > testArrayOfPolymorphicStructMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>, std::tuple<> + > testMapOfPolymorphicStructMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>, std::tuple<> + > testStructWithPolymorphicMemberMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< TestInterfaceStub, std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>, + std::tuple<>, + std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>, std::tuple<> + > testStructWithEnumKeyMapMemberStubDispatcher; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..f58b844 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "BranchInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace BranchInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace BranchInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..f87fdb9 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace BranchInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace BranchInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp index 25fa000..0c7c6ce 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.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. @@ -35,28 +35,61 @@ BranchInterfaceDBusProxy::BranchInterfaceDBusProxy( - void BranchInterfaceDBusProxy::testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<BranchInterface::testBranchMethodError, int32_t, std::string> >::callMethodWithReply( + void BranchInterfaceDBusProxy::testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodWithReply( *this, "testBranchMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - _status, - _error - , _outInt, _outString); + deploy_inInt, deploy_inString, + _internalCallStatus, + deploy_error, + deploy_outInt, deploy_outString); + _error = deploy_error.getValue(); + _outInt = deploy_outInt.getValue(); + _outString = deploy_outString.getValue(); } std::future<CommonAPI::CallStatus> BranchInterfaceDBusProxy::testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<BranchInterface::testBranchMethodError, int32_t, std::string> >::callMethodAsync( + CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodAsync( *this, "testBranchMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - std::move(_callback), - std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string>()); + deploy_inInt, deploy_inString, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) { + _callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue()); + }, + std::make_tuple(deploy_error, deploy_outInt, deploy_outString)); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp index 3738f3d..4f66233 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp @@ -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. @@ -41,7 +41,7 @@ public: - virtual void testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); + virtual void testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp index e833d10..ce8f413 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.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. @@ -60,11 +60,18 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< BranchInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string> - > BranchInterfaceDBusStubAdapterInternal::testBranchMethodStubDispatcher(&BranchInterfaceStub::testBranchMethod, "iis", std::tuple<int32_t, std::string, BranchInterface::testBranchMethodError, int32_t, std::string>()); + std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + + > BranchInterfaceDBusStubAdapterInternal::testBranchMethodStubDispatcher( + &BranchInterfaceStub::testBranchMethod, "iis", + 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::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp index ab1e41b..1da6539 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp> +#include "v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -19,6 +20,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -59,10 +61,14 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< BranchInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string> + std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + > testBranchMethodStubDispatcher; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..d28ab96 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "LeafInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace LeafInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace LeafInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..71e0f4c --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace LeafInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace LeafInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp index 6fe152e..6a26285 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.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. @@ -35,28 +35,61 @@ LeafInterfaceDBusProxy::LeafInterfaceDBusProxy( - void LeafInterfaceDBusProxy::testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<LeafInterface::testLeafMethodError, int32_t, std::string> >::callMethodWithReply( + void LeafInterfaceDBusProxy::testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodWithReply( *this, "testLeafMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - _status, - _error - , _outInt, _outString); + deploy_inInt, deploy_inString, + _internalCallStatus, + deploy_error, + deploy_outInt, deploy_outString); + _error = deploy_error.getValue(); + _outInt = deploy_outInt.getValue(); + _outString = deploy_outString.getValue(); } std::future<CommonAPI::CallStatus> LeafInterfaceDBusProxy::testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<LeafInterface::testLeafMethodError, int32_t, std::string> >::callMethodAsync( + CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodAsync( *this, "testLeafMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - std::move(_callback), - std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string>()); + deploy_inInt, deploy_inString, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) { + _callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue()); + }, + std::make_tuple(deploy_error, deploy_outInt, deploy_outString)); } diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp index 0dae7b3..8fec7ca 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp @@ -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. @@ -41,7 +41,7 @@ public: - virtual void testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); + virtual void testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp index 7e4473e..d622168 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.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. @@ -60,11 +60,18 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LeafInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string> - > LeafInterfaceDBusStubAdapterInternal::testLeafMethodStubDispatcher(&LeafInterfaceStub::testLeafMethod, "iis", std::tuple<int32_t, std::string, LeafInterface::testLeafMethodError, int32_t, std::string>()); + std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + + > LeafInterfaceDBusStubAdapterInternal::testLeafMethodStubDispatcher( + &LeafInterfaceStub::testLeafMethod, "iis", + 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::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp index e1b739c..853dbfb 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp> +#include "v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -19,6 +20,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -59,10 +61,14 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LeafInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string> + std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + > testLeafMethodStubDispatcher; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..c514b7e --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "RootInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace RootInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace RootInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..63a1fdf --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace RootInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace RootInterface_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp index c694796..4ad729e 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.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. @@ -37,28 +37,61 @@ RootInterfaceDBusProxy::RootInterfaceDBusProxy( - void RootInterfaceDBusProxy::testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<RootInterface::testRootMethodError, int32_t, std::string> >::callMethodWithReply( + void RootInterfaceDBusProxy::testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodWithReply( *this, "testRootMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - _status, - _error - , _outInt, _outString); + deploy_inInt, deploy_inString, + _internalCallStatus, + deploy_error, + deploy_outInt, deploy_outString); + _error = deploy_error.getValue(); + _outInt = deploy_outInt.getValue(); + _outString = deploy_outString.getValue(); } std::future<CommonAPI::CallStatus> RootInterfaceDBusProxy::testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t, std::string>, - CommonAPI::DBus::DBusSerializableArguments<RootInterface::testRootMethodError, int32_t, std::string> >::callMethodAsync( + CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >, + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment> + > + >::callMethodAsync( *this, "testRootMethod", "is", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _inInt, _inString, - std::move(_callback), - std::tuple<RootInterface::testRootMethodError, int32_t, std::string>()); + deploy_inInt, deploy_inString, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) { + _callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue()); + }, + std::make_tuple(deploy_error, deploy_outInt, deploy_outString)); } CommonAPI::ProxyManager& RootInterfaceDBusProxy::getProxyManagerLeafInterface() { diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp index 67920ba..a0c7443 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp @@ -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. @@ -42,7 +42,7 @@ public: - virtual void testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_status, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); + virtual void testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); virtual CommonAPI::ProxyManager& getProxyManagerLeafInterface(); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp index 06a6667..c414d4c 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.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. @@ -84,11 +84,18 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RootInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<RootInterface::testRootMethodError, int32_t, std::string> - > RootInterfaceDBusStubAdapterInternal::testRootMethodStubDispatcher(&RootInterfaceStub::testRootMethod, "iis", std::tuple<int32_t, std::string, RootInterface::testRootMethodError, int32_t, std::string>()); + std::tuple<RootInterface::testRootMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + + > RootInterfaceDBusStubAdapterInternal::testRootMethodStubDispatcher( + &RootInterfaceStub::testRootMethod, "iis", + 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::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))); diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp index d5828a3..d50ebe4 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/managed/RootInterfaceStub.hpp> +#include "v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -21,6 +22,7 @@ #include <CommonAPI/DBus/DBusObjectManager.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -67,10 +69,14 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RootInterfaceStub, std::tuple<int32_t, std::string>, - std::tuple<RootInterface::testRootMethodError, int32_t, std::string> + std::tuple<RootInterface::testRootMethodError, int32_t, std::string>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment> + > testRootMethodStubDispatcher; diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.cpp new file mode 100644 index 0000000..855d2af --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "SecondRootDBusDeployment.hpp" + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace SecondRoot_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace SecondRoot_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp new file mode 100644 index 0000000..d328176 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace commonapi { +namespace tests { +namespace managed { +namespace SecondRoot_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace SecondRoot_ +} // namespace managed +} // namespace tests +} // namespace commonapi +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp index ba66245..767912b 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.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. diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp index 80053ed..82e6e06 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp @@ -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. diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp index c42347e..36b8c10 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.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. diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp index ee4b556..eaf9944 100644 --- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/commonapi/tests/managed/SecondRootStub.hpp> +#include "v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -21,6 +22,7 @@ #include <CommonAPI/DBus/DBusObjectManager.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp new file mode 100644 index 0000000..19d9740 --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ +#include "LegacyInterfaceDBusDeployment.hpp" + +namespace v1_0 { +namespace fake { +namespace legacy { +namespace service { +namespace LegacyInterface_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace LegacyInterface_ +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1_0 diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp new file mode 100644 index 0000000..b06463d --- /dev/null +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* 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. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. +*/ + +#ifndef COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ +#define COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include <CommonAPI/DBus/DBusDeployment.hpp> +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1_0 { +namespace fake { +namespace legacy { +namespace service { +namespace LegacyInterface_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace LegacyInterface_ +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1_0 + +#endif // COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp index 2d93d6d..0a14ba3 100644 --- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.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. @@ -35,67 +35,120 @@ LegacyInterfaceDBusProxy::LegacyInterfaceDBusProxy( - void LegacyInterfaceDBusProxy::TestMethod(const int32_t &_input, CommonAPI::CallStatus &_status, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>, - CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply( + void LegacyInterfaceDBusProxy::TestMethod(const int32_t &_input, CommonAPI::CallStatus &_internalCallStatus, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment> + > + >::callMethodWithReply( *this, "TestMethod", "i", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _input, - _status - , _val1, _val2); + deploy_input, + _internalCallStatus, + deploy_val1, deploy_val2); + _val1 = deploy_val1.getValue(); + _val2 = deploy_val2.getValue(); } std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>, - CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync( + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment > + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment> + > + >::callMethodAsync( *this, "TestMethod", "i", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _input, - std::move(_callback), - std::tuple<int32_t, int32_t>()); + deploy_input, + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val1, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val2) { + _callback(_status, _val1.getValue(), _val2.getValue()); + }, + std::make_tuple(deploy_val1, deploy_val2)); } - void LegacyInterfaceDBusProxy::OtherTestMethod(CommonAPI::CallStatus &_status, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t> >::callMethodWithReply( + void LegacyInterfaceDBusProxy::OtherTestMethod(CommonAPI::CallStatus &_internalCallStatus, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info) { + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment> + > + >::callMethodWithReply( *this, "OtherTestMethod", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _status - , _greeting, _identifier); + _internalCallStatus, + deploy_greeting, deploy_identifier); + _greeting = deploy_greeting.getValue(); + _identifier = deploy_identifier.getValue(); } std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t> >::callMethodAsync( + CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)); + CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr)); + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>, + CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment> + > + >::callMethodAsync( *this, "OtherTestMethod", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - std::move(_callback), - std::tuple<std::string, int32_t>()); + [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _greeting, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _identifier) { + _callback(_status, _greeting.getValue(), _identifier.getValue()); + }, + std::make_tuple(deploy_greeting, deploy_identifier)); } - void LegacyInterfaceDBusProxy::finish(CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( + void LegacyInterfaceDBusProxy::finish(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) { + CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodWithReply( *this, "finish", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - _status - ); + _internalCallStatus); } std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, - CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( + return CommonAPI::DBus::DBusProxyHelper< + CommonAPI::DBus::DBusSerializableArguments< + >, + CommonAPI::DBus::DBusSerializableArguments< + > + >::callMethodAsync( *this, "finish", "", (_info ? _info : &CommonAPI::DBus::defaultCallInfo), - std::move(_callback), - std::tuple<>()); + [_callback] (CommonAPI::CallStatus _status) { + _callback(_status); + }, + std::make_tuple()); } diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp index b66df50..dbebd0f 100644 --- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp @@ -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. @@ -41,11 +41,11 @@ public: - virtual void TestMethod(const int32_t &_input, CommonAPI::CallStatus &_status, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info); + virtual void TestMethod(const int32_t &_input, CommonAPI::CallStatus &_internalCallStatus, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void OtherTestMethod(CommonAPI::CallStatus &_status, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info); + virtual void OtherTestMethod(CommonAPI::CallStatus &_internalCallStatus, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info); - virtual void finish(CommonAPI::CallStatus &_status, const CommonAPI::CallInfo *_info); + virtual void finish(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info); virtual std::future<CommonAPI::CallStatus> finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info); diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp index 7866ba7..6cae1e8 100644 --- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.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. @@ -64,21 +64,42 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<int32_t>, - std::tuple<int32_t, int32_t> - > LegacyInterfaceDBusStubAdapterInternal::testMethodStubDispatcher(&LegacyInterfaceStub::TestMethod, "ii", std::tuple<int32_t, int32_t, int32_t>()); + std::tuple<int32_t, int32_t>, + std::tuple<CommonAPI::EmptyDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment> + + > LegacyInterfaceDBusStubAdapterInternal::testMethodStubDispatcher( + &LegacyInterfaceStub::TestMethod, "ii", + std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr)), + std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr))); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<>, - std::tuple<std::string, int32_t> - > LegacyInterfaceDBusStubAdapterInternal::otherTestMethodStubDispatcher(&LegacyInterfaceStub::OtherTestMethod, "si", std::tuple<std::string, int32_t>()); + std::tuple<std::string, int32_t>, + std::tuple<>, + std::tuple<CommonAPI::DBus::StringDeployment, CommonAPI::EmptyDeployment> + + > LegacyInterfaceDBusStubAdapterInternal::otherTestMethodStubDispatcher( + &LegacyInterfaceStub::OtherTestMethod, "si", + std::make_tuple(), + std::make_tuple(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr))); + CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<>, + std::tuple<>, + std::tuple<>, std::tuple<> - > LegacyInterfaceDBusStubAdapterInternal::finishStubDispatcher(&LegacyInterfaceStub::finish, "", std::tuple<>()); + + > LegacyInterfaceDBusStubAdapterInternal::finishStubDispatcher( + &LegacyInterfaceStub::finish, "", + std::make_tuple(), + std::make_tuple()); diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp index 5041822..8aec0a1 100644 --- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp @@ -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. @@ -11,6 +11,7 @@ #define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ #include <v1_0/fake/legacy/service/LegacyInterfaceStub.hpp> +#include "v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp" #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION @@ -19,6 +20,7 @@ #include <CommonAPI/DBus/DBusFactory.hpp> #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp> #include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusDeployment.hpp> #undef COMMONAPI_INTERNAL_COMPILATION @@ -59,20 +61,32 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<int32_t>, - std::tuple<int32_t, int32_t> + std::tuple<int32_t, int32_t>, + std::tuple<CommonAPI::EmptyDeployment>, + std::tuple<CommonAPI::EmptyDeployment, CommonAPI::EmptyDeployment> + > testMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<>, - std::tuple<std::string, int32_t> + std::tuple<std::string, int32_t>, + std::tuple<>, + std::tuple<CommonAPI::DBus::StringDeployment, CommonAPI::EmptyDeployment> + > otherTestMethodStubDispatcher; + static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< LegacyInterfaceStub, std::tuple<>, + std::tuple<>, + std::tuple<>, std::tuple<> + > finishStubDispatcher; |