Reduce code duplication

Author: serges147

include/libcyphal/transport/can/rx_session_tree_node.hpp

@@ -34,38 +34,7 @@ struct RxSessionTreeNode
 {
     /// @brief Represents a service response RX session node.
     ///
-    class Response final : public transport::detail::SessionTree<Response>::NodeBase
-    {
-    public:
-        explicit Response(const ResponseRxParams& params, const std::tuple<>&)
-            : service_id_{params.service_id}
-            , server_node_id{params.server_node_id}
-            , delegate_{nullptr}
-        {
-        }
-
-        CETL_NODISCARD std::int32_t compareByParams(const ResponseRxParams& params) const
-        {
-            if (service_id_ != params.service_id)
-            {
-                return static_cast<std::int32_t>(service_id_) - static_cast<std::int32_t>(params.service_id);
-            }
-            return static_cast<std::int32_t>(server_node_id) - static_cast<std::int32_t>(params.server_node_id);
-        }
-
-        CETL_NODISCARD IRxSessionDelegate*& delegate() noexcept
-        {
-            return delegate_;
-        }
-
-    private:
-        // MARK: Data members:
-
-        const PortId        service_id_;
-        const NodeId        server_node_id;
-        IRxSessionDelegate* delegate_;
-
-    };  // Response
+    using Response = transport::detail::ResponseRxSessionNode<IRxSessionDelegate>;
 
 };  // RxSessionTreeNode
 

include/libcyphal/transport/session_tree.hpp

@@ -9,6 +9,7 @@
 #include "errors.hpp"
 #include "libcyphal/common/cavl/cavl.hpp"
 #include "libcyphal/types.hpp"
+#include "svc_sessions.hpp"
 
 #include <cetl/cetl.hpp>
 #include <cetl/pf17/cetlpf.hpp>
@@ -74,8 +75,8 @@ class SessionTree final
     }
 
     template <bool ShouldBeNew = false, typename Params, typename... Args>
-    CETL_NODISCARD auto ensureNodeFor(const Params& params,
-                                      Args&&... args) -> Expected<typename NodeBase::RefWrapper, AnyFailure>
+    CETL_NODISCARD auto ensureNodeFor(const Params& params, Args&&... args)
+        -> Expected<typename NodeBase::RefWrapper, AnyFailure>
     {
         auto args_tuple = std::make_tuple(std::forward<Args>(args)...);
 
@@ -158,6 +159,44 @@ class SessionTree final
 
 };  // SessionTree
 
+// MARK: -
+
+/// @brief Represents a service response RX session node.
+///
+template <typename RxSessionDelegate>
+class ResponseRxSessionNode final : public SessionTree<ResponseRxSessionNode<RxSessionDelegate>>::NodeBase
+{
+public:
+    explicit ResponseRxSessionNode(const ResponseRxParams& params, const std::tuple<>&)
+        : service_id_{params.service_id}
+        , server_node_id{params.server_node_id}
+        , delegate_{nullptr}
+    {
+    }
+
+    CETL_NODISCARD std::int32_t compareByParams(const ResponseRxParams& params) const
+    {
+        if (service_id_ != params.service_id)
+        {
+            return static_cast<std::int32_t>(service_id_) - static_cast<std::int32_t>(params.service_id);
+        }
+        return static_cast<std::int32_t>(server_node_id) - static_cast<std::int32_t>(params.server_node_id);
+    }
+
+    CETL_NODISCARD RxSessionDelegate*& delegate() noexcept
+    {
+        return delegate_;
+    }
+
+private:
+    // MARK: Data members:
+
+    const PortId       service_id_;
+    const NodeId       server_node_id;
+    RxSessionDelegate* delegate_;
+
+};  // ResponseRxSessionNode
+
 }  // namespace detail
 }  // namespace transport
 }  // namespace libcyphal

include/libcyphal/transport/udp/rx_session_tree_node.hpp

@@ -110,38 +110,7 @@ struct RxSessionTreeNode
 
     /// @brief Represents a service response RX session node.
     ///
-    class Response final : public transport::detail::SessionTree<Response>::NodeBase
-    {
-    public:
-        explicit Response(const ResponseRxParams& params, const std::tuple<>&)
-            : service_id_{params.service_id}
-            , server_node_id{params.server_node_id}
-            , delegate_{nullptr}
-        {
-        }
-
-        CETL_NODISCARD std::int32_t compareByParams(const ResponseRxParams& params) const
-        {
-            if (service_id_ != params.service_id)
-            {
-                return static_cast<std::int32_t>(service_id_) - static_cast<std::int32_t>(params.service_id);
-            }
-            return static_cast<std::int32_t>(server_node_id) - static_cast<std::int32_t>(params.server_node_id);
-        }
-
-        CETL_NODISCARD IRxSessionDelegate*& delegate() noexcept
-        {
-            return delegate_;
-        }
-
-    private:
-        // MARK: Data members:
-
-        const PortId        service_id_;
-        const NodeId        server_node_id;
-        IRxSessionDelegate* delegate_;
-
-    };  // Response
+    using Response = transport::detail::ResponseRxSessionNode<IRxSessionDelegate>;
 
 };  // RxSessionTreeNode