From 5b59601418432b61cf675f92de6d16b4e2d25ca4 Mon Sep 17 00:00:00 2001
From: kianwasabi <mehrretischgeschmack@gmail.com>
Date: Fri, 17 Nov 2023 19:27:33 +0000
Subject: [PATCH] check if automation still works 2

---
 car_control/fidl/carcontrol.fidl              |   2 +-
 .../src-gen/core/v0/commonapi/CarControl.hpp  |  58 -----
 .../core/v0/commonapi/CarControlProxy.hpp     | 228 ------------------
 .../core/v0/commonapi/CarControlProxyBase.hpp |  60 -----
 .../core/v0/commonapi/CarControlStub.hpp      | 165 -------------
 .../v0/commonapi/CarControlStubDefault.hpp    | 171 -------------
 .../commonapi/CarControlSomeIPDeployment.cpp  |  27 ---
 .../commonapi/CarControlSomeIPDeployment.hpp  |  44 ----
 .../v0/commonapi/CarControlSomeIPProxy.cpp    | 135 -----------
 .../v0/commonapi/CarControlSomeIPProxy.hpp    |  80 ------
 .../commonapi/CarControlSomeIPStubAdapter.cpp |  49 ----
 .../commonapi/CarControlSomeIPStubAdapter.hpp | 199 ---------------
 12 files changed, 1 insertion(+), 1217 deletions(-)
 delete mode 100644 car_control/src-gen/core/v0/commonapi/CarControl.hpp
 delete mode 100644 car_control/src-gen/core/v0/commonapi/CarControlProxy.hpp
 delete mode 100644 car_control/src-gen/core/v0/commonapi/CarControlProxyBase.hpp
 delete mode 100644 car_control/src-gen/core/v0/commonapi/CarControlStub.hpp
 delete mode 100644 car_control/src-gen/core/v0/commonapi/CarControlStubDefault.hpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.cpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.hpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.cpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.hpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.cpp
 delete mode 100644 car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.hpp

diff --git a/car_control/fidl/carcontrol.fidl b/car_control/fidl/carcontrol.fidl
index bf64a6f..41cfc18 100644
--- a/car_control/fidl/carcontrol.fidl
+++ b/car_control/fidl/carcontrol.fidl
@@ -14,4 +14,4 @@ interface CarControl {
             Boolean accepted
         }
     }
-}
+}
\ No newline at end of file
diff --git a/car_control/src-gen/core/v0/commonapi/CarControl.hpp b/car_control/src-gen/core/v0/commonapi/CarControl.hpp
deleted file mode 100644
index 342df62..0000000
--- a/car_control/src-gen/core/v0/commonapi/CarControl.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.2.0.v202012010850.
-* Used org.franca.core 0.13.1.201807231814.
-*
-* 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 V0_COMMONAPI_CAR_CONTROL_HPP_
-#define V0_COMMONAPI_CAR_CONTROL_HPP_
-
-
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/Types.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-class CarControl {
-public:
-    virtual ~CarControl() { }
-
-    static inline const char* getInterface();
-    static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* CarControl::getInterface() {
-    return ("commonapi.CarControl:v0_1");
-}
-
-CommonAPI::Version CarControl::getInterfaceVersion() {
-    return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace commonapi
-} // namespace v0
-
-namespace CommonAPI {
-}
-
-
-// Compatibility
-namespace v0_1 = v0;
-
-#endif // V0_COMMONAPI_CAR_CONTROL_HPP_
diff --git a/car_control/src-gen/core/v0/commonapi/CarControlProxy.hpp b/car_control/src-gen/core/v0/commonapi/CarControlProxy.hpp
deleted file mode 100644
index eb4c284..0000000
--- a/car_control/src-gen/core/v0/commonapi/CarControlProxy.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.2.0.v202012010850.
-* Used org.franca.core 0.13.1.201807231814.
-*
-* 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 V0_COMMONAPI_Car_Control_PROXY_HPP_
-#define V0_COMMONAPI_Car_Control_PROXY_HPP_
-
-#include <v0/commonapi/CarControlProxyBase.hpp>
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/AttributeExtension.hpp>
-#include <CommonAPI/Factory.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-template <typename ... _AttributeExtensions>
-class CarControlProxy
-    : virtual public CarControl,
-      virtual public CarControlProxyBase,
-      virtual public _AttributeExtensions... {
-public:
-    CarControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
-    ~CarControlProxy();
-
-    typedef CarControl InterfaceType;
-
-
-    /**
-     * Returns the CommonAPI address of the remote partner this proxy communicates with.
-     */
-    virtual const CommonAPI::Address &getAddress() const;
-
-    /**
-     * Returns true if the remote partner for this proxy is currently known to be available.
-     */
-    virtual bool isAvailable() const;
-
-    /**
-     * Returns true if the remote partner for this proxy is available.
-     */
-    virtual bool isAvailableBlocking() const;
-
-    /**
-     * Returns the wrapper class that is used to (de-)register for notifications about
-     * the availability of the remote partner of this proxy.
-     */
-    virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
-
-    /**
-     * Returns the wrapper class that is used to access version information of the remote
-     * partner of this proxy.
-     */
-    virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
-
-    virtual std::future<void> getCompletionFuture();
-
-    /**
-     * Returns the wrapper class that provides access to the attribute indicator.
-     */
-    virtual IndicatorAttribute& getIndicatorAttribute() {
-        return delegate_->getIndicatorAttribute();
-    }
-    /**
-     * Returns the wrapper class that provides access to the attribute gear.
-     */
-    virtual GearAttribute& getGearAttribute() {
-        return delegate_->getGearAttribute();
-    }
-    /**
-     * Calls gearSelectionHeadUnit with synchronous semantics.
-     *
-     * All const parameters are input parameters to this method.
-     * All non-const parameters will be filled with the returned values.
-     * The CallStatus will be filled when the method returns and indicate either
-     * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
-     * will be set.
-     */
-    virtual void gearSelectionHeadUnit(std::string _selectedGear, CommonAPI::CallStatus &_internalCallStatus, bool &_accepted, const CommonAPI::CallInfo *_info = nullptr);
-    /**
-     * Calls gearSelectionHeadUnit with asynchronous semantics.
-     *
-     * The provided callback will be called when the reply to this call arrives or
-     * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
-     * or which type of error has occurred. In case of any error, ONLY the CallStatus
-     * will have a defined value.
-     * The std::future returned by this method will be fulfilled at arrival of the reply.
-     * It will provide the same value for CallStatus as will be handed to the callback.
-     */
-    virtual std::future<CommonAPI::CallStatus> gearSelectionHeadUnitAsync(const std::string &_selectedGear, GearSelectionHeadUnitAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
-
-
-
- private:
-    std::shared_ptr< CarControlProxyBase> delegate_;
-};
-
-typedef CarControlProxy<> CarControlProxyDefault;
-
-namespace CarControlExtensions {
-    template <template <typename > class _ExtensionType>
-    class IndicatorAttributeExtension {
-     public:
-        typedef _ExtensionType< CarControlProxyBase::IndicatorAttribute> extension_type;
-    
-        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension< CarControlProxyBase::IndicatorAttribute>, extension_type>::value,
-                      "Not CommonAPI Attribute Extension!");
-    
-        IndicatorAttributeExtension(CarControlProxyBase& proxy): attributeExtension_(proxy.getIndicatorAttribute()) {
-        }
-    
-        inline extension_type& getIndicatorAttributeExtension() {
-            return attributeExtension_;
-        }
-    
-     private:
-        extension_type attributeExtension_;
-    };
-
-    template <template <typename > class _ExtensionType>
-    class GearAttributeExtension {
-     public:
-        typedef _ExtensionType< CarControlProxyBase::GearAttribute> extension_type;
-    
-        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension< CarControlProxyBase::GearAttribute>, extension_type>::value,
-                      "Not CommonAPI Attribute Extension!");
-    
-        GearAttributeExtension(CarControlProxyBase& proxy): attributeExtension_(proxy.getGearAttribute()) {
-        }
-    
-        inline extension_type& getGearAttributeExtension() {
-            return attributeExtension_;
-        }
-    
-     private:
-        extension_type attributeExtension_;
-    };
-
-} // namespace CarControlExtensions
-
-//
-// CarControlProxy Implementation
-//
-template <typename ... _AttributeExtensions>
-CarControlProxy<_AttributeExtensions...>::CarControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
-        _AttributeExtensions(*(std::dynamic_pointer_cast< CarControlProxyBase>(delegate)))...,
-        delegate_(std::dynamic_pointer_cast< CarControlProxyBase>(delegate)) {
-}
-
-template <typename ... _AttributeExtensions>
-CarControlProxy<_AttributeExtensions...>::~CarControlProxy() {
-}
-
-template <typename ... _AttributeExtensions>
-void CarControlProxy<_AttributeExtensions...>::gearSelectionHeadUnit(std::string _selectedGear, CommonAPI::CallStatus &_internalCallStatus, bool &_accepted, const CommonAPI::CallInfo *_info) {
-    delegate_->gearSelectionHeadUnit(_selectedGear, _internalCallStatus, _accepted, _info);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> CarControlProxy<_AttributeExtensions...>::gearSelectionHeadUnitAsync(const std::string &_selectedGear, GearSelectionHeadUnitAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-    return delegate_->gearSelectionHeadUnitAsync(_selectedGear, _callback, _info);
-}
-
-template <typename ... _AttributeExtensions>
-const CommonAPI::Address &CarControlProxy<_AttributeExtensions...>::getAddress() const {
-    return delegate_->getAddress();
-}
-
-template <typename ... _AttributeExtensions>
-bool CarControlProxy<_AttributeExtensions...>::isAvailable() const {
-    return delegate_->isAvailable();
-}
-
-template <typename ... _AttributeExtensions>
-bool CarControlProxy<_AttributeExtensions...>::isAvailableBlocking() const {
-    return delegate_->isAvailableBlocking();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::ProxyStatusEvent& CarControlProxy<_AttributeExtensions...>::getProxyStatusEvent() {
-    return delegate_->getProxyStatusEvent();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::InterfaceVersionAttribute& CarControlProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
-    return delegate_->getInterfaceVersionAttribute();
-}
-
-
-template <typename ... _AttributeExtensions>
-std::future<void> CarControlProxy<_AttributeExtensions...>::getCompletionFuture() {
-    return delegate_->getCompletionFuture();
-}
-
-} // namespace commonapi
-} // namespace v0
-
-namespace CommonAPI {
-template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyHelper< ::v0::commonapi::CarControlProxy,
-    _AttributeExtension> {
-    typedef typename ::v0::commonapi::CarControlProxy<
-            ::v0::commonapi::CarControlExtensions::IndicatorAttributeExtension<_AttributeExtension>, 
-            ::v0::commonapi::CarControlExtensions::GearAttributeExtension<_AttributeExtension>
-    > class_t;
-};
-}
-
-
-// Compatibility
-namespace v0_1 = v0;
-
-#endif // V0_COMMONAPI_Car_Control_PROXY_HPP_
diff --git a/car_control/src-gen/core/v0/commonapi/CarControlProxyBase.hpp b/car_control/src-gen/core/v0/commonapi/CarControlProxyBase.hpp
deleted file mode 100644
index f7fe646..0000000
--- a/car_control/src-gen/core/v0/commonapi/CarControlProxyBase.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.2.0.v202012010850.
-* Used org.franca.core 0.13.1.201807231814.
-*
-* 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 V0_COMMONAPI_Car_Control_PROXY_BASE_HPP_
-#define V0_COMMONAPI_Car_Control_PROXY_BASE_HPP_
-
-#include <v0/commonapi/CarControl.hpp>
-
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <vector>
-
-#include <CommonAPI/Attribute.hpp>
-#include <CommonAPI/Proxy.hpp>
-#include <functional>
-#include <future>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-class CarControlProxyBase
-    : virtual public CommonAPI::Proxy {
-public:
-    typedef CommonAPI::ObservableReadonlyAttribute<std::string> IndicatorAttribute;
-    typedef CommonAPI::ObservableReadonlyAttribute<std::string> GearAttribute;
-
-    typedef std::function<void(const CommonAPI::CallStatus&, const bool&)> GearSelectionHeadUnitAsyncCallback;
-
-    virtual IndicatorAttribute& getIndicatorAttribute() = 0;
-    virtual GearAttribute& getGearAttribute() = 0;
-    virtual void gearSelectionHeadUnit(std::string _selectedGear, CommonAPI::CallStatus &_internalCallStatus, bool &_accepted, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> gearSelectionHeadUnitAsync(const std::string &_selectedGear, GearSelectionHeadUnitAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
-
-    virtual std::future<void> getCompletionFuture() = 0;
-};
-
-} // namespace commonapi
-} // namespace v0
-
-
-// Compatibility
-namespace v0_1 = v0;
-
-#endif // V0_COMMONAPI_Car_Control_PROXY_BASE_HPP_
diff --git a/car_control/src-gen/core/v0/commonapi/CarControlStub.hpp b/car_control/src-gen/core/v0/commonapi/CarControlStub.hpp
deleted file mode 100644
index ec49a6b..0000000
--- a/car_control/src-gen/core/v0/commonapi/CarControlStub.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.2.0.v202012010850.
-* Used org.franca.core 0.13.1.201807231814.
-*
-* 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 V0_COMMONAPI_Car_Control_STUB_HPP_
-#define V0_COMMONAPI_Car_Control_STUB_HPP_
-
-#include <functional>
-#include <sstream>
-
-
-
-
-#include <v0/commonapi/CarControl.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <vector>
-
-#include <mutex>
-
-#include <CommonAPI/Stub.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-/**
- * Receives messages from remote and handles all dispatching of deserialized calls
- * to a stub for the service CarControl. Also provides means to send broadcasts
- * and attribute-changed-notifications of observable attributes as defined by this service.
- * An application developer should not need to bother with this class.
- */
-class CarControlStubAdapter
-    : public virtual CommonAPI::StubAdapter,
-      public virtual CarControl {
- public:
-    ///Notifies all remote listeners about a change of value of the attribute indicator.
-    virtual void fireIndicatorAttributeChanged(const std::string &indicator) = 0;
-    ///Notifies all remote listeners about a change of value of the attribute gear.
-    virtual void fireGearAttributeChanged(const std::string &gear) = 0;
-
-
-    virtual void deactivateManagedInstances() = 0;
-
-    void lockIndicatorAttribute(bool _lockAccess) {
-        if (_lockAccess) {
-            indicatorMutex_.lock();
-        } else {
-            indicatorMutex_.unlock();
-        }
-    }
-    void lockGearAttribute(bool _lockAccess) {
-        if (_lockAccess) {
-            gearMutex_.lock();
-        } else {
-            gearMutex_.unlock();
-        }
-    }
-
-protected:
-    /**
-     * Defines properties for storing the ClientIds of clients / proxies that have
-     * subscribed to the selective broadcasts
-     */
-    std::recursive_mutex indicatorMutex_;
-    std::recursive_mutex gearMutex_;
-
-};
-
-/**
- * Defines the necessary callbacks to handle remote set events related to the attributes
- * defined in the IDL description for CarControl.
- * For each attribute two callbacks are defined:
- * - a verification callback that allows to verify the requested value and to prevent setting
- *   e.g. an invalid value ("onRemoteSet<AttributeName>").
- * - an action callback to do local work after the attribute value has been changed
- *   ("onRemote<AttributeName>Changed").
- *
- * This class and the one below are the ones an application developer needs to have
- * a look at if he wants to implement a service.
- */
-class CarControlStubRemoteEvent
-{
-public:
-    virtual ~CarControlStubRemoteEvent() { }
-
-};
-
-/**
- * Defines the interface that must be implemented by any class that should provide
- * the service CarControl to remote clients.
- * This class and the one above are the ones an application developer needs to have
- * a look at if he wants to implement a service.
- */
-class CarControlStub
-    : public virtual CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>
-{
-public:
-    typedef std::function<void (bool _accepted)> gearSelectionHeadUnitReply_t;
-
-    virtual ~CarControlStub() {}
-    void lockInterfaceVersionAttribute(bool _lockAccess) { static_cast<void>(_lockAccess); }
-    bool hasElement(const uint32_t _id) const {
-        return (_id < 3);
-    }
-    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) = 0;
-
-    /// Provides getter access to the attribute indicator
-    virtual const std::string &getIndicatorAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
-    /// sets attribute with the given value and propagates it to the adapter
-    virtual void fireIndicatorAttributeChanged(std::string _value) {
-    auto stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-    if (stubAdapter)
-        stubAdapter->fireIndicatorAttributeChanged(_value);
-    }
-    void lockIndicatorAttribute(bool _lockAccess) {
-        auto stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-        if (stubAdapter)
-            stubAdapter->lockIndicatorAttribute(_lockAccess);
-    }
-    /// Provides getter access to the attribute gear
-    virtual const std::string &getGearAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
-    /// sets attribute with the given value and propagates it to the adapter
-    virtual void fireGearAttributeChanged(std::string _value) {
-    auto stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-    if (stubAdapter)
-        stubAdapter->fireGearAttributeChanged(_value);
-    }
-    void lockGearAttribute(bool _lockAccess) {
-        auto stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-        if (stubAdapter)
-            stubAdapter->lockGearAttribute(_lockAccess);
-    }
-    /// This is the method that will be called on remote calls on the method gearSelectionHeadUnit.
-    virtual void gearSelectionHeadUnit(const std::shared_ptr<CommonAPI::ClientId> _client, std::string _selectedGear, gearSelectionHeadUnitReply_t _reply) = 0;
-
-
-    using CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::initStubAdapter;
-    typedef CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::StubAdapterType StubAdapterType;
-    typedef CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
-    typedef CarControlStubRemoteEvent RemoteEventType;
-    typedef CarControl StubInterface;
-};
-
-} // namespace commonapi
-} // namespace v0
-
-
-// Compatibility
-namespace v0_1 = v0;
-
-#endif // V0_COMMONAPI_Car_Control_STUB_HPP_
diff --git a/car_control/src-gen/core/v0/commonapi/CarControlStubDefault.hpp b/car_control/src-gen/core/v0/commonapi/CarControlStubDefault.hpp
deleted file mode 100644
index 291d2cb..0000000
--- a/car_control/src-gen/core/v0/commonapi/CarControlStubDefault.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.2.0.v202012010850.
-* Used org.franca.core 0.13.1.201807231814.
-*
-* 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 V0_COMMONAPI_Car_Control_STUB_DEFAULT_HPP_
-#define V0_COMMONAPI_Car_Control_STUB_DEFAULT_HPP_
-
-
-#include <CommonAPI/Export.hpp>
-
-#include <v0/commonapi/CarControlStub.hpp>
-#include <cassert>
-#include <sstream>
-
-# if defined(_MSC_VER)
-#  if _MSC_VER >= 1300
-/*
- * Diamond inheritance is used for the CommonAPI::Proxy base class.
- * The Microsoft compiler put warning (C4250) using a desired c++ feature: "Delegating to a sister class"
- * A powerful technique that arises from using virtual inheritance is to delegate a method from a class in another class
- * by using a common abstract base class. This is also called cross delegation.
- */
-#    pragma warning( disable : 4250 )
-#  endif
-# endif
-
-namespace v0 {
-namespace commonapi {
-
-/**
- * Provides a default implementation for CarControlStubRemoteEvent and
- * CarControlStub. Method callbacks have an empty implementation,
- * remote set calls on attributes will always change the value of the attribute
- * to the one received.
- *
- * Override this stub if you only want to provide a subset of the functionality
- * that would be defined for this service, and/or if you do not need any non-default
- * behaviour.
- */
-class COMMONAPI_EXPORT_CLASS_EXPLICIT CarControlStubDefault
-    : public virtual CarControlStub {
-public:
-    COMMONAPI_EXPORT CarControlStubDefault()
-        : remoteEventHandler_(this),
-          interfaceVersion_(CarControl::getInterfaceVersion()) {
-    }
-
-    COMMONAPI_EXPORT const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
-        (void)_client;
-        return interfaceVersion_;
-    }
-
-    COMMONAPI_EXPORT CarControlStubRemoteEvent* initStubAdapter(const std::shared_ptr< CarControlStubAdapter> &_adapter) {
-        CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_ = _adapter;
-        return &remoteEventHandler_;
-    }
-
-    COMMONAPI_EXPORT virtual const std::string &getIndicatorAttribute() {
-        return indicatorAttributeValue_;
-    }
-    COMMONAPI_EXPORT virtual const std::string &getIndicatorAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
-        (void)_client;
-        return getIndicatorAttribute();
-    }
-    COMMONAPI_EXPORT virtual void setIndicatorAttribute(std::string _value) {
-        const bool valueChanged = trySetIndicatorAttribute(std::move(_value));
-        if (valueChanged) {
-            fireIndicatorAttributeChanged(indicatorAttributeValue_);
-        }
-    }
-    COMMONAPI_EXPORT virtual const std::string &getGearAttribute() {
-        return gearAttributeValue_;
-    }
-    COMMONAPI_EXPORT virtual const std::string &getGearAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
-        (void)_client;
-        return getGearAttribute();
-    }
-    COMMONAPI_EXPORT virtual void setGearAttribute(std::string _value) {
-        const bool valueChanged = trySetGearAttribute(std::move(_value));
-        if (valueChanged) {
-            fireGearAttributeChanged(gearAttributeValue_);
-        }
-    }
-    COMMONAPI_EXPORT virtual void gearSelectionHeadUnit(const std::shared_ptr<CommonAPI::ClientId> _client, std::string _selectedGear, gearSelectionHeadUnitReply_t _reply) {
-        (void)_client;
-        (void)_selectedGear;
-        bool accepted = false;
-        _reply(accepted);
-    }
-
-
-protected:
-    COMMONAPI_EXPORT virtual bool trySetIndicatorAttribute(std::string _value) {
-        if (!validateIndicatorAttributeRequestedValue(_value))
-            return false;
-
-        bool valueChanged;
-        std::shared_ptr<CarControlStubAdapter> stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-        if(stubAdapter) {
-            stubAdapter->lockIndicatorAttribute(true);
-            valueChanged = (indicatorAttributeValue_ != _value);
-            indicatorAttributeValue_ = std::move(_value);
-            stubAdapter->lockIndicatorAttribute(false);
-        } else {
-            valueChanged = (indicatorAttributeValue_ != _value);
-            indicatorAttributeValue_ = std::move(_value);
-        }
-
-       return valueChanged;
-    }
-    COMMONAPI_EXPORT virtual bool validateIndicatorAttributeRequestedValue(const std::string &_value) {
-        (void)_value;
-        return true;
-    }
-    COMMONAPI_EXPORT virtual bool trySetGearAttribute(std::string _value) {
-        if (!validateGearAttributeRequestedValue(_value))
-            return false;
-
-        bool valueChanged;
-        std::shared_ptr<CarControlStubAdapter> stubAdapter = CommonAPI::Stub<CarControlStubAdapter, CarControlStubRemoteEvent>::stubAdapter_.lock();
-        if(stubAdapter) {
-            stubAdapter->lockGearAttribute(true);
-            valueChanged = (gearAttributeValue_ != _value);
-            gearAttributeValue_ = std::move(_value);
-            stubAdapter->lockGearAttribute(false);
-        } else {
-            valueChanged = (gearAttributeValue_ != _value);
-            gearAttributeValue_ = std::move(_value);
-        }
-
-       return valueChanged;
-    }
-    COMMONAPI_EXPORT virtual bool validateGearAttributeRequestedValue(const std::string &_value) {
-        (void)_value;
-        return true;
-    }
-    class COMMONAPI_EXPORT_CLASS_EXPLICIT RemoteEventHandler: public virtual CarControlStubRemoteEvent {
-    public:
-        COMMONAPI_EXPORT RemoteEventHandler(CarControlStubDefault *_defaultStub)
-            : 
-              defaultStub_(_defaultStub) {
-        }
-
-
-    private:
-        CarControlStubDefault *defaultStub_;
-    };
-protected:
-    CarControlStubDefault::RemoteEventHandler remoteEventHandler_;
-
-private:
-
-    std::string indicatorAttributeValue_ {};
-    std::string gearAttributeValue_ {};
-
-    CommonAPI::Version interfaceVersion_;
-};
-
-} // namespace commonapi
-} // namespace v0
-
-
-// Compatibility
-namespace v0_1 = v0;
-
-#endif // V0_COMMONAPI_Car_Control_STUB_DEFAULT
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.cpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.cpp
deleted file mode 100644
index ac539c6..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 <v0/commonapi/CarControlSomeIPDeployment.hpp>
-
-namespace v0 {
-namespace commonapi {
-namespace CarControl_ {
-
-// Type-specific deployments
-
-// Attribute-specific deployments
-
-// Argument-specific deployment
-CommonAPI::SomeIP::StringDeployment gearSelectionHeadUnit_selectedGearDeployment(0, 4, CommonAPI::SomeIP::StringEncoding::UTF16LE);
-
-// Broadcast-specific deployments
-
-} // namespace CarControl_
-} // namespace commonapi
-} // namespace v0
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.hpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.hpp
deleted file mode 100644
index 1f5e39e..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPDeployment.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 V0_COMMONAPI_Car_Control_SOMEIP_DEPLOYMENT_HPP_
-#define V0_COMMONAPI_Car_Control_SOMEIP_DEPLOYMENT_HPP_
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-#include <CommonAPI/SomeIP/Deployment.hpp>
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-namespace CarControl_ {
-
-// Interface-specific deployment types
-
-// Type-specific deployments
-
-// Attribute-specific deployments
-
-// Argument-specific deployment
-COMMONAPI_EXPORT extern CommonAPI::SomeIP::StringDeployment gearSelectionHeadUnit_selectedGearDeployment;
-
-// Broadcast-specific deployments
-
-} // namespace CarControl_
-} // namespace commonapi
-} // namespace v0
-
-#endif // V0_COMMONAPI_Car_Control_SOMEIP_DEPLOYMENT_HPP_
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.cpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.cpp
deleted file mode 100644
index 56a0d66..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 <v0/commonapi/CarControlSomeIPProxy.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/SomeIP/AddressTranslator.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-std::shared_ptr<CommonAPI::SomeIP::Proxy> createCarControlSomeIPProxy(
-    const CommonAPI::SomeIP::Address &_address,
-    const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection) {
-    return std::make_shared< CarControlSomeIPProxy>(_address, _connection);
-}
-
-void initializeCarControlSomeIPProxy() {
-    CommonAPI::SomeIP::AddressTranslator::get()->insert(
-        "local:commonapi.CarControl:v0_1:commonapi.CarControl",
-        0xfa0, 0xfa1, 0, 1);
-    CommonAPI::SomeIP::Factory::get()->registerProxyCreateMethod(
-        "commonapi.CarControl:v0_1",
-        &createCarControlSomeIPProxy);
-}
-
-INITIALIZER(registerCarControlSomeIPProxy) {
-    CommonAPI::SomeIP::Factory::get()->registerInterface(initializeCarControlSomeIPProxy);
-}
-
-CarControlSomeIPProxy::CarControlSomeIPProxy(
-    const CommonAPI::SomeIP::Address &_address,
-    const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection)
-        : CommonAPI::SomeIP::Proxy(_address, _connection),
-          indicator_(*this, CommonAPI::SomeIP::eventgroup_id_t(0x1004), CommonAPI::SomeIP::event_id_t(0xa028), CommonAPI::SomeIP::method_id_t(0x1005), true, CommonAPI::SomeIP::reliability_type_e::RT_RELIABLE, false, static_cast< CommonAPI::SomeIP::StringDeployment* >(nullptr)),
-          gear_(*this, CommonAPI::SomeIP::eventgroup_id_t(0x1068), CommonAPI::SomeIP::event_id_t(0xa410), CommonAPI::SomeIP::method_id_t(0x1069), true, CommonAPI::SomeIP::reliability_type_e::RT_RELIABLE, false, static_cast< CommonAPI::SomeIP::StringDeployment* >(nullptr))
-{
-}
-
-CarControlSomeIPProxy::~CarControlSomeIPProxy() {
-    completed_.set_value();
-}
-
-CarControlSomeIPProxy::IndicatorAttribute& CarControlSomeIPProxy::getIndicatorAttribute() {
-    return indicator_;
-}
-CarControlSomeIPProxy::GearAttribute& CarControlSomeIPProxy::getGearAttribute() {
-    return gear_;
-}
-
-
-void CarControlSomeIPProxy::gearSelectionHeadUnit(std::string _selectedGear, CommonAPI::CallStatus &_internalCallStatus, bool &_accepted, const CommonAPI::CallInfo *_info) {
-    CommonAPI::Deployable< std::string, CommonAPI::SomeIP::StringDeployment> deploy_selectedGear(_selectedGear, &::v0::commonapi::CarControl_::gearSelectionHeadUnit_selectedGearDeployment);
-    CommonAPI::Deployable< bool, CommonAPI::EmptyDeployment> deploy_accepted(static_cast< CommonAPI::EmptyDeployment* >(nullptr));
-    CommonAPI::SomeIP::ProxyHelper<
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                std::string,
-                CommonAPI::SomeIP::StringDeployment
-            >
-        >,
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                bool,
-                CommonAPI::EmptyDeployment
-            >
-        >
-    >::callMethodWithReply(
-        *this,
-        CommonAPI::SomeIP::method_id_t(0x1068),
-        true,
-        false,
-        (_info ? _info : &CommonAPI::SomeIP::defaultCallInfo),
-        deploy_selectedGear,
-        _internalCallStatus,
-        deploy_accepted);
-    _accepted = deploy_accepted.getValue();
-}
-
-std::future<CommonAPI::CallStatus> CarControlSomeIPProxy::gearSelectionHeadUnitAsync(const std::string &_selectedGear, GearSelectionHeadUnitAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-    CommonAPI::Deployable< std::string, CommonAPI::SomeIP::StringDeployment> deploy_selectedGear(_selectedGear, &::v0::commonapi::CarControl_::gearSelectionHeadUnit_selectedGearDeployment);
-    CommonAPI::Deployable< bool, CommonAPI::EmptyDeployment> deploy_accepted(static_cast< CommonAPI::EmptyDeployment* >(nullptr));
-    return CommonAPI::SomeIP::ProxyHelper<
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                std::string,
-                CommonAPI::SomeIP::StringDeployment
-            >
-        >,
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                bool,
-                CommonAPI::EmptyDeployment
-            >
-        >
-    >::callMethodAsync(
-        *this,
-        CommonAPI::SomeIP::method_id_t(0x1068),
-        true,
-        false,
-        (_info ? _info : &CommonAPI::SomeIP::defaultCallInfo),
-        deploy_selectedGear,
-        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable< bool, CommonAPI::EmptyDeployment > _accepted) {
-            if (_callback)
-                _callback(_internalCallStatus, _accepted.getValue());
-        },
-        std::make_tuple(deploy_accepted));
-}
-
-void CarControlSomeIPProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-    ownVersionMajor = 0;
-    ownVersionMinor = 1;
-}
-
-std::future<void> CarControlSomeIPProxy::getCompletionFuture() {
-    return completed_.get_future();
-}
-
-} // namespace commonapi
-} // namespace v0
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.hpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.hpp
deleted file mode 100644
index 0c20770..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPProxy.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 V0_COMMONAPI_CAR_CONTROL_SOMEIP_PROXY_HPP_
-#define V0_COMMONAPI_CAR_CONTROL_SOMEIP_PROXY_HPP_
-
-#include <v0/commonapi/CarControlProxyBase.hpp>
-#include <v0/commonapi/CarControlSomeIPDeployment.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/SomeIP/Factory.hpp>
-#include <CommonAPI/SomeIP/Proxy.hpp>
-#include <CommonAPI/SomeIP/Types.hpp>
-#include <CommonAPI/SomeIP/Attribute.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <string>
-
-# if defined(_MSC_VER)
-#  if _MSC_VER >= 1300
-/*
- * Diamond inheritance is used for the CommonAPI::Proxy base class.
- * The Microsoft compiler put warning (C4250) using a desired c++ feature: "Delegating to a sister class"
- * A powerful technique that arises from using virtual inheritance is to delegate a method from a class in another class
- * by using a common abstract base class. This is also called cross delegation.
- */
-#    pragma warning( disable : 4250 )
-#  endif
-# endif
-
-namespace v0 {
-namespace commonapi {
-
-class CarControlSomeIPProxy
-    : virtual public CarControlProxyBase,
-      virtual public CommonAPI::SomeIP::Proxy {
-public:
-    CarControlSomeIPProxy(
-        const CommonAPI::SomeIP::Address &_address,
-        const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection);
-
-    virtual ~CarControlSomeIPProxy();
-
-    virtual IndicatorAttribute& getIndicatorAttribute();
-
-    virtual GearAttribute& getGearAttribute();
-
-    virtual void gearSelectionHeadUnit(std::string _selectedGear, CommonAPI::CallStatus &_internalCallStatus, bool &_accepted, const CommonAPI::CallInfo *_info);
-
-    virtual std::future<CommonAPI::CallStatus> gearSelectionHeadUnitAsync(const std::string &_selectedGear, GearSelectionHeadUnitAsyncCallback _callback, const CommonAPI::CallInfo *_info);
-
-    virtual void getOwnVersion(uint16_t &_major, uint16_t &_minor) const;
-
-    virtual std::future<void> getCompletionFuture();
-
-private:
-    CommonAPI::SomeIP::ObservableAttribute<CommonAPI::SomeIP::ReadonlyAttribute<IndicatorAttribute, CommonAPI::SomeIP::StringDeployment>> indicator_;
-    CommonAPI::SomeIP::ObservableAttribute<CommonAPI::SomeIP::ReadonlyAttribute<GearAttribute, CommonAPI::SomeIP::StringDeployment>> gear_;
-
-    std::promise<void> completed_;
-};
-
-} // namespace commonapi
-} // namespace v0
-
-#endif // V0_COMMONAPI_Car_Control_SOMEIP_PROXY_HPP_
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.cpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.cpp
deleted file mode 100644
index 7c75724..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 <v0/commonapi/CarControlSomeIPStubAdapter.hpp>
-#include <v0/commonapi/CarControl.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/SomeIP/AddressTranslator.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-std::shared_ptr<CommonAPI::SomeIP::StubAdapter> createCarControlSomeIPStubAdapter(
-                   const CommonAPI::SomeIP::Address &_address,
-                   const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection,
-                   const std::shared_ptr<CommonAPI::StubBase> &_stub) {
-    return std::make_shared< CarControlSomeIPStubAdapter<::v0::commonapi::CarControlStub>>(_address, _connection, _stub);
-}
-
-void initializeCarControlSomeIPStubAdapter() {
-    CommonAPI::SomeIP::AddressTranslator::get()->insert(
-        "local:commonapi.CarControl:v0_1:commonapi.CarControl",
-         0xfa0, 0xfa1, 0, 1);
-    CommonAPI::SomeIP::Factory::get()->registerStubAdapterCreateMethod(
-        "commonapi.CarControl:v0_1",
-        &createCarControlSomeIPStubAdapter);
-}
-
-INITIALIZER(registerCarControlSomeIPStubAdapter) {
-    CommonAPI::SomeIP::Factory::get()->registerInterface(initializeCarControlSomeIPStubAdapter);
-}
-
-} // namespace commonapi
-} // namespace v0
diff --git a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.hpp b/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.hpp
deleted file mode 100644
index 01544a3..0000000
--- a/car_control/src-gen/someip/v0/commonapi/CarControlSomeIPStubAdapter.hpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * This file was generated by the CommonAPI Generators.
- * Used org.genivi.commonapi.someip 3.2.0.v202012010944.
- * Used org.franca.core 0.13.1.201807231814.
- *
- * 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 V0_COMMONAPI_CAR_CONTROL_SOMEIP_STUB_ADAPTER_HPP_
-#define V0_COMMONAPI_CAR_CONTROL_SOMEIP_STUB_ADAPTER_HPP_
-
-#include <v0/commonapi/CarControlStub.hpp>
-#include <v0/commonapi/CarControlSomeIPDeployment.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#define HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-#include <CommonAPI/SomeIP/AddressTranslator.hpp>
-#include <CommonAPI/SomeIP/StubAdapterHelper.hpp>
-#include <CommonAPI/SomeIP/StubAdapter.hpp>
-#include <CommonAPI/SomeIP/Factory.hpp>
-#include <CommonAPI/SomeIP/Types.hpp>
-#include <CommonAPI/SomeIP/Constants.hpp>
-
-#if defined (HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE)
-#undef COMMONAPI_INTERNAL_COMPILATION
-#undef HAS_DEFINED_COMMONAPI_INTERNAL_COMPILATION_HERE
-#endif
-
-namespace v0 {
-namespace commonapi {
-
-template <typename _Stub = ::v0::commonapi::CarControlStub, typename... _Stubs>
-class CarControlSomeIPStubAdapterInternal
-    : public virtual CarControlStubAdapter,
-      public CommonAPI::SomeIP::StubAdapterHelper< _Stub, _Stubs...>,
-      public std::enable_shared_from_this< CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>>
-{
-public:
-    typedef CommonAPI::SomeIP::StubAdapterHelper< _Stub, _Stubs...> CarControlSomeIPStubAdapterHelper;
-
-    ~CarControlSomeIPStubAdapterInternal() {
-        deactivateManagedInstances();
-        CarControlSomeIPStubAdapterHelper::deinit();
-    }
-
-    void fireIndicatorAttributeChanged(const std::string &_value);
-    
-    void fireGearAttributeChanged(const std::string &_value);
-    
-    void deactivateManagedInstances() {}
-    
-    CommonAPI::SomeIP::GetAttributeStubDispatcher<
-        ::v0::commonapi::CarControlStub,
-        CommonAPI::Version
-    > getCarControlInterfaceVersionStubDispatcher;
-
-    CommonAPI::SomeIP::GetAttributeStubDispatcher<
-        ::v0::commonapi::CarControlStub,
-        std::string,
-        CommonAPI::SomeIP::StringDeployment
-    > getIndicatorAttributeStubDispatcher;
-    
-    CommonAPI::SomeIP::GetAttributeStubDispatcher<
-        ::v0::commonapi::CarControlStub,
-        std::string,
-        CommonAPI::SomeIP::StringDeployment
-    > getGearAttributeStubDispatcher;
-    
-    CommonAPI::SomeIP::MethodWithReplyStubDispatcher<
-        ::v0::commonapi::CarControlStub,
-        std::tuple< std::string>,
-        std::tuple< bool>,
-        std::tuple< CommonAPI::SomeIP::StringDeployment>,
-        std::tuple< CommonAPI::EmptyDeployment>
-    > gearSelectionHeadUnitStubDispatcher;
-    
-    CarControlSomeIPStubAdapterInternal(
-        const CommonAPI::SomeIP::Address &_address,
-        const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection,
-        const std::shared_ptr<CommonAPI::StubBase> &_stub):
-        CommonAPI::SomeIP::StubAdapter(_address, _connection),
-        CarControlSomeIPStubAdapterHelper(
-            _address,
-            _connection,
-            std::dynamic_pointer_cast< CarControlStub>(_stub)),
-        getCarControlInterfaceVersionStubDispatcher(&CarControlStub::lockInterfaceVersionAttribute, &CarControlStub::getInterfaceVersion, false, true),
-        getIndicatorAttributeStubDispatcher(
-            &::v0::commonapi::CarControlStub::lockIndicatorAttribute,
-            &::v0::commonapi::CarControlStub::getIndicatorAttribute,
-            false,
-            _stub->hasElement(0))
-        ,
-        getGearAttributeStubDispatcher(
-            &::v0::commonapi::CarControlStub::lockGearAttribute,
-            &::v0::commonapi::CarControlStub::getGearAttribute,
-            false,
-            _stub->hasElement(1))
-        ,
-        gearSelectionHeadUnitStubDispatcher(
-            &CarControlStub::gearSelectionHeadUnit,
-            false,
-            _stub->hasElement(2),
-            std::make_tuple(&::v0::commonapi::CarControl_::gearSelectionHeadUnit_selectedGearDeployment),
-            std::make_tuple(static_cast< CommonAPI::EmptyDeployment* >(nullptr)))
-        
-    {
-        CarControlSomeIPStubAdapterHelper::addStubDispatcher( { CommonAPI::SomeIP::method_id_t(0x1005) }, &getIndicatorAttributeStubDispatcher );
-        CarControlSomeIPStubAdapterHelper::addStubDispatcher( { CommonAPI::SomeIP::method_id_t(0x1069) }, &getGearAttributeStubDispatcher );
-        CarControlSomeIPStubAdapterHelper::addStubDispatcher( { CommonAPI::SomeIP::method_id_t(0x1068) }, &gearSelectionHeadUnitStubDispatcher );
-        std::shared_ptr<CommonAPI::SomeIP::ClientId> itsClient = std::make_shared<CommonAPI::SomeIP::ClientId>(0xFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
-
-        // Provided events/fields
-        if (_stub->hasElement(0)) {
-            std::set<CommonAPI::SomeIP::eventgroup_id_t> itsEventGroups;
-            itsEventGroups.insert(CommonAPI::SomeIP::eventgroup_id_t(CommonAPI::SomeIP::eventgroup_id_t(0x1004)));
-            CommonAPI::SomeIP::StubAdapter::registerEvent(CommonAPI::SomeIP::event_id_t(0xa028), itsEventGroups, CommonAPI::SomeIP::event_type_e::ET_FIELD, CommonAPI::SomeIP::reliability_type_e::RT_RELIABLE);
-            fireIndicatorAttributeChanged(std::dynamic_pointer_cast< ::v0::commonapi::CarControlStub>(_stub)->getIndicatorAttribute(itsClient));
-        }
-
-        if (_stub->hasElement(1)) {
-            std::set<CommonAPI::SomeIP::eventgroup_id_t> itsEventGroups;
-            itsEventGroups.insert(CommonAPI::SomeIP::eventgroup_id_t(CommonAPI::SomeIP::eventgroup_id_t(0x1068)));
-            CommonAPI::SomeIP::StubAdapter::registerEvent(CommonAPI::SomeIP::event_id_t(0xa410), itsEventGroups, CommonAPI::SomeIP::event_type_e::ET_FIELD, CommonAPI::SomeIP::reliability_type_e::RT_RELIABLE);
-            fireGearAttributeChanged(std::dynamic_pointer_cast< ::v0::commonapi::CarControlStub>(_stub)->getGearAttribute(itsClient));
-        }
-
-    }
-
-    // Register/Unregister event handlers for selective broadcasts
-    void registerSelectiveEventHandlers();
-    void unregisterSelectiveEventHandlers();
-
-};
-
-template <typename _Stub, typename... _Stubs>
-void CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>::fireIndicatorAttributeChanged(const std::string &_value) {
-    CommonAPI::Deployable< std::string, CommonAPI::SomeIP::StringDeployment> deployedValue(_value, static_cast< CommonAPI::SomeIP::StringDeployment* >(nullptr));
-    CommonAPI::SomeIP::StubEventHelper<
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                std::string,
-                CommonAPI::SomeIP::StringDeployment
-            >
-            >
-    >::sendEvent(
-        *this,
-        CommonAPI::SomeIP::event_id_t(0xa028),
-        false,
-        deployedValue
-    );
-}
-
-template <typename _Stub, typename... _Stubs>
-void CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>::fireGearAttributeChanged(const std::string &_value) {
-    CommonAPI::Deployable< std::string, CommonAPI::SomeIP::StringDeployment> deployedValue(_value, static_cast< CommonAPI::SomeIP::StringDeployment* >(nullptr));
-    CommonAPI::SomeIP::StubEventHelper<
-        CommonAPI::SomeIP::SerializableArguments<
-            CommonAPI::Deployable<
-                std::string,
-                CommonAPI::SomeIP::StringDeployment
-            >
-            >
-    >::sendEvent(
-        *this,
-        CommonAPI::SomeIP::event_id_t(0xa410),
-        false,
-        deployedValue
-    );
-}
-
-
-template <typename _Stub, typename... _Stubs>
-void CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>::registerSelectiveEventHandlers() {
-}
-
-template <typename _Stub, typename... _Stubs>
-void CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>::unregisterSelectiveEventHandlers() {
-}
-
-template <typename _Stub = ::v0::commonapi::CarControlStub, typename... _Stubs>
-class CarControlSomeIPStubAdapter
-    : public CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...> {
-public:
-    CarControlSomeIPStubAdapter(const CommonAPI::SomeIP::Address &_address,
-                                            const std::shared_ptr<CommonAPI::SomeIP::ProxyConnection> &_connection,
-                                            const std::shared_ptr<CommonAPI::StubBase> &_stub)
-        : CommonAPI::SomeIP::StubAdapter(_address, _connection),
-          CarControlSomeIPStubAdapterInternal<_Stub, _Stubs...>(_address, _connection, _stub) {
-    }
-};
-
-} // namespace commonapi
-} // namespace v0
-
-#endif // V0_COMMONAPI_Car_Control_SOMEIP_STUB_ADAPTER_HPP_