Fix DataStorm filter initialization (#3278)

zeroc-ice · Dec 17, 2024 · 684221b · 684221b
1 parent 47d5c39
commit 684221b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/cpp/include/DataStorm/InternalI.h b/cpp/include/DataStorm/InternalI.h
@@ -142,7 +142,6 @@ namespace DataStormI
         virtual ~FilterFactory() = default;
 
         virtual std::shared_ptr<Filter> get(std::int64_t) const = 0;
-        virtual std::shared_ptr<Filter> decode(const Ice::CommunicatorPtr&, const Ice::ByteSeq&) = 0;
     };
 
     class FilterManager

diff --git a/cpp/include/DataStorm/InternalT.h b/cpp/include/DataStorm/InternalT.h
@@ -425,8 +425,11 @@ namespace DataStormI
     template<typename C, typename V> class FilterT final : public Filter, public AbstractElementT<C>
     {
     public:
-        template<typename CC>
-        FilterT(CC&& criteria, std::int64_t id) : AbstractElementT<C>::AbstractElementT(std::forward<CC>(criteria), id)
+        template<typename CC, typename FF>
+        FilterT(CC&& criteria, std::string name, FF lambda, std::int64_t id)
+            : AbstractElementT<C>::AbstractElementT(std::forward<CC>(criteria), id),
+              _name(std::move(name)),
+              _lambda(std::move(lambda))
         {
         }
 
@@ -439,12 +442,6 @@ namespace DataStormI
 
         const std::string& getName() const final { return _name; }
 
-        template<typename FF> void init(const std::string& name, FF&& lambda)
-        {
-            _name = name;
-            _lambda = std::forward<FF>(lambda);
-        }
-
         using BaseClassType = Filter;
 
     private:
@@ -463,11 +460,6 @@ namespace DataStormI
             return AbstractFactoryT<C, FilterT<C, V>>::getImpl(id);
         }
 
-        std::shared_ptr<Filter> decode(const Ice::CommunicatorPtr& communicator, const Ice::ByteSeq& data) final
-        {
-            return AbstractFactoryT<C, FilterT<C, V>>::create(DecoderT<C>::decode(communicator, data));
-        }
-
         static std::shared_ptr<FilterFactoryT<C, V>> createFactory()
         {
             auto f = std::make_shared<FilterFactoryT<C, V>>();
@@ -499,9 +491,8 @@ namespace DataStormI
 
             std::shared_ptr<Filter> create(Criteria criteria)
             {
-                auto filter = std::static_pointer_cast<FilterT<Criteria, ValueT>>(filterFactory.create(criteria));
-                filter->init(name, lambda(filter->get()));
-                return filter;
+                return std::static_pointer_cast<FilterT<Criteria, ValueT>>(
+                    filterFactory.create(criteria, name, lambda(criteria)));
             }
 
             std::shared_ptr<Filter> get(std::int64_t id) const final { return filterFactory.get(id); }