[core] redesign service server api

ecal/core/CMakeLists.txt

@@ -388,6 +388,9 @@ if(ECAL_CORE_SERVICE)
       src/service/ecal_service_server.cpp
       src/service/ecal_service_server_impl.cpp
       src/service/ecal_service_server_impl.h
+      src/service/ecal_service_server_v5.cpp
+      src/service/ecal_service_server_v5_impl.cpp
+      src/service/ecal_service_server_v5_impl.h
       src/service/ecal_service_singleton_manager.cpp
       src/service/ecal_service_singleton_manager.h
   )
@@ -536,6 +539,7 @@ set(ecal_header_cmn
     include/ecal/ecal_registration.h
     include/ecal/ecal_publisher.h
     include/ecal/ecal_server.h
+    include/ecal/ecal_server_v5.h
     include/ecal/ecal_service_info.h
     include/ecal/ecal_subscriber.h
     include/ecal/ecal_time.h

ecal/core/include/ecal/ecal_server.h

@@ -18,8 +18,8 @@
 */
 
 /**
- * @file   ecal_server.h
- * @brief  eCAL service interface
+ * @file   ecal_server_v5.h
+ * @brief  eCAL server interface (deprecated eCAL5 version)
 **/
 
 #pragma once
@@ -44,66 +44,26 @@ namespace eCAL
   {
   public:
     /**
-     * @brief Constructor. 
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      CServiceServer();
-
-    /**
-     * @brief Constructor. 
+     * @brief Constructor.
      *
      * @param service_name_   Unique service name.
     **/
     ECAL_API_EXPORTED_MEMBER
-      explicit CServiceServer(const std::string& service_name_);
+      explicit CServiceServer(const std::string& service_name_, const ServerEventIDCallbackT event_callback_ = ServerEventIDCallbackT());
 
     /**
-     * @brief Destructor. 
+     * @brief Destructor.
     **/
     ECAL_API_EXPORTED_MEMBER
       virtual ~CServiceServer();
 
-    /**
-     * @brief CServiceServers are non-copyable
-    **/
+    // Deleted copy constructor and copy assignment operator
     CServiceServer(const CServiceServer&) = delete;
-
-    /**
-     * @brief CServiceServers are non-copyable
-    **/
     CServiceServer& operator=(const CServiceServer&) = delete;
 
-    /**
-     * @brief Creates this object. 
-     *
-     * @param service_name_   Unique service name.
-     *
-     * @return  True if successful. 
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      bool Create(const std::string& service_name_);
-
-    /**
-     * @brief Destroys this object. 
-     *
-     * @return  True if successful. 
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      bool Destroy();
-
-    /**
-     * @brief Add method type descriptions.
-     *
-     * @param method_     Service method name.
-     * @param req_type_   Service method request type.
-     * @param req_desc_   Service method request description.
-     * @param resp_type_  Service method response type.
-     * @param resp_desc_  Service method response description.
-     *
-     * @return  True if successful.
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      bool AddDescription(const std::string& method_, const std::string& req_type_, const std::string& req_desc_, const std::string& resp_type_, const std::string& resp_desc_);
+    // Move constructor and move assignment operator
+    ECAL_API_EXPORTED_MEMBER CServiceServer(CServiceServer&& rhs) noexcept;
+    ECAL_API_EXPORTED_MEMBER CServiceServer& operator=(CServiceServer&& rhs) noexcept;
 
     /**
      * @brief Add method callback.
@@ -116,7 +76,7 @@ namespace eCAL
      * @return  True if successful.
     **/
     ECAL_API_EXPORTED_MEMBER
-      bool AddMethodCallback(const std::string& method_, const std::string& req_type_, const std::string& resp_type_, const MethodCallbackT& callback_);
+      bool AddMethodCallback(const std::string& method_, const SServiceMethodInformation& method_info_, const MethodCallbackT& callback_);
 
     /**
      * @brief Remove method callback.
@@ -128,27 +88,6 @@ namespace eCAL
     ECAL_API_EXPORTED_MEMBER
       bool RemMethodCallback(const std::string& method_);
 
-    /**
-     * @brief Add server event callback function.
-     *
-     * @param type_      The event type to react on.
-     * @param callback_  The callback function to add.
-     *
-     * @return  True if succeeded, false if not.
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      bool AddEventCallback(eCAL_Server_Event type_, ServerEventCallbackT callback_);
-
-    /**
-     * @brief Remove server event callback function.
-     *
-     * @param type_  The event type to remove.
-     *
-     * @return  True if succeeded, false if not.
-    **/
-    ECAL_API_EXPORTED_MEMBER
-      bool RemEventCallback(eCAL_Server_Event type_);
-
     /**
      * @brief Retrieve service name.
      *
@@ -167,6 +106,5 @@ namespace eCAL
 
   private:
     std::shared_ptr<CServiceServerImpl> m_service_server_impl;
-    bool                                m_created;
   };
 } 

ecal/core/include/ecal/ecal_server_v5.h

@@ -0,0 +1,174 @@
+/* ========================= eCAL LICENSE =================================
+ *
+ * Copyright (C) 2016 - 2024 Continental Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================= eCAL LICENSE =================================
+*/
+
+/**
+ * @file   ecal_server_v5.h
+ * @brief  eCAL server interface (deprecated eCAL5 version)
+**/
+
+#pragma once
+
+#include <ecal/ecal_deprecate.h>
+#include <ecal/ecal_os.h>
+#include <ecal/ecal_callback.h>
+#include <ecal/ecal_service_info.h>
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace eCAL
+{
+  namespace v5
+  {
+    class CServiceServerImpl;
+
+    /**
+     * @brief Service Server wrapper class.
+    **/
+    class ECAL_API_CLASS CServiceServer
+    {
+    public:
+      /**
+       * @brief Constructor. 
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        CServiceServer();
+
+      /**
+       * @brief Constructor. 
+       *
+       * @param service_name_   Unique service name.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        explicit CServiceServer(const std::string& service_name_);
+
+      /**
+       * @brief Destructor. 
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        virtual ~CServiceServer();
+
+      /**
+       * @brief CServiceServers are non-copyable
+      **/
+      CServiceServer(const CServiceServer&) = delete;
+
+      /**
+       * @brief CServiceServers are non-copyable
+      **/
+      CServiceServer& operator=(const CServiceServer&) = delete;
+
+      /**
+       * @brief Creates this object. 
+       *
+       * @param service_name_   Unique service name.
+       *
+       * @return  True if successful. 
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool Create(const std::string& service_name_);
+
+      /**
+       * @brief Destroys this object. 
+       *
+       * @return  True if successful. 
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool Destroy();
+
+      /**
+       * @brief Add method type descriptions.
+       *
+       * @param method_     Service method name.
+       * @param req_type_   Service method request type.
+       * @param req_desc_   Service method request description.
+       * @param resp_type_  Service method response type.
+       * @param resp_desc_  Service method response description.
+       *
+       * @return  True if successful.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool AddDescription(const std::string& method_, const std::string& req_type_, const std::string& req_desc_, const std::string& resp_type_, const std::string& resp_desc_);
+
+      /**
+       * @brief Add method callback.
+       *
+       * @param method_     Service method name.
+       * @param req_type_   Service method request type.
+       * @param resp_type_  Service method response type.
+       * @param callback_   Callback function for client request.
+       *
+       * @return  True if successful.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool AddMethodCallback(const std::string& method_, const std::string& req_type_, const std::string& resp_type_, const MethodCallbackT& callback_);
+
+      /**
+       * @brief Remove method callback.
+       *
+       * @param method_  Service method name.
+       *
+       * @return  True if successful.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool RemMethodCallback(const std::string& method_);
+
+      /**
+       * @brief Add server event callback function.
+       *
+       * @param type_      The event type to react on.
+       * @param callback_  The callback function to add.
+       *
+       * @return  True if succeeded, false if not.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool AddEventCallback(eCAL_Server_Event type_, ServerEventCallbackT callback_);
+
+      /**
+       * @brief Remove server event callback function.
+       *
+       * @param type_  The event type to remove.
+       *
+       * @return  True if succeeded, false if not.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool RemEventCallback(eCAL_Server_Event type_);
+
+      /**
+       * @brief Retrieve service name.
+       *
+       * @return  The service name.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        std::string GetServiceName();
+
+      /**
+       * @brief Check connection state.
+       *
+       * @return  True if connected, false if not.
+      **/
+      ECAL_API_EXPORTED_MEMBER
+        bool IsConnected();
+
+    private:
+      std::shared_ptr<CServiceServerImpl> m_service_server_impl;
+    };
+  }
+} 

ecal/core/include/ecal/msg/protobuf/server.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <ecal/ecal_server.h>
+#include <ecal/ecal_server_v5.h>
 #include <ecal/msg/protobuf/ecal_proto_dyn.h>
 #include <functional>
 
@@ -51,7 +51,7 @@ namespace eCAL
      * @brief Google Protobuf Server wrapper class.
     **/
     template <typename T>
-    class CServiceServer : public eCAL::CServiceServer
+    class CServiceServer : public eCAL::v5::CServiceServer
     {
     public:
       /**
@@ -179,7 +179,7 @@ namespace eCAL
         return true;
       }
 
-      using eCAL::CServiceServer::Create;
+      using eCAL::v5::CServiceServer::Create;
 
     protected:
       int RequestCallback(const std::string& method_, const std::string& /*req_type_*/, const std::string& /*resp_type_*/, const std::string& request_, std::string& response_)
@@ -217,9 +217,9 @@ namespace eCAL
       std::map<std::string, const google::protobuf::MethodDescriptor*>  m_methods;
 
       private:
-        using eCAL::CServiceServer::AddMethodCallback;
-        using eCAL::CServiceServer::RemMethodCallback;
-        using eCAL::CServiceServer::GetServiceName;
+        using eCAL::v5::CServiceServer::AddMethodCallback;
+        using eCAL::v5::CServiceServer::RemMethodCallback;
+        using eCAL::v5::CServiceServer::GetServiceName;
     };
   }
 }