DPL: add helper for matcher creation (#5446)

Will be useful to move the output spec to use matchers.

Author: ktf

Framework/Core/include/Framework/DataSpecUtils.h

@@ -180,6 +180,9 @@ struct DataSpecUtils {
   /// Get the subspec, if available
   static std::optional<header::DataHeader::SubSpecificationType> getOptionalSubSpec(InputSpec const& spec);
 
+  /// Build a DataDescriptMatcher which does not care about the subSpec.
+  static data_matcher::DataDescriptorMatcher dataDescriptorMatcherFrom(ConcreteDataMatcher const& concrete);
+
   /// Build a DataDescriptMatcher which does not care about the subSpec.
   static data_matcher::DataDescriptorMatcher dataDescriptorMatcherFrom(ConcreteDataTypeMatcher const& dataType);
 

Framework/Core/src/DataSpecUtils.cxx

@@ -470,6 +470,22 @@ OutputSpec DataSpecUtils::asOutputSpec(InputSpec const& spec)
                     spec.matcher);
 }
 
+DataDescriptorMatcher DataSpecUtils::dataDescriptorMatcherFrom(ConcreteDataMatcher const& concrete)
+{
+  DataDescriptorMatcher matchEverything{
+    DataDescriptorMatcher::Op::And,
+    OriginValueMatcher{concrete.origin.as<std::string>()},
+    std::make_unique<DataDescriptorMatcher>(
+      DataDescriptorMatcher::Op::And,
+      DescriptionValueMatcher{concrete.description.as<std::string>()},
+      std::make_unique<DataDescriptorMatcher>(
+        DataDescriptorMatcher::Op::And,
+        SubSpecificationTypeValueMatcher{concrete.subSpec},
+        std::make_unique<DataDescriptorMatcher>(DataDescriptorMatcher::Op::Just,
+                                                StartTimeValueMatcher{ContextRef{0}})))};
+  return std::move(matchEverything);
+}
+
 DataDescriptorMatcher DataSpecUtils::dataDescriptorMatcherFrom(ConcreteDataTypeMatcher const& dataType)
 {
   auto timeDescriptionMatcher = std::make_unique<DataDescriptorMatcher>(

Framework/Core/test/unittest_DataSpecUtils.cxx

@@ -256,6 +256,20 @@ BOOST_AUTO_TEST_CASE(TestMatcherFromDescription)
   BOOST_CHECK_EQUAL(DataSpecUtils::asConcreteDataDescription(ddSpec).as<std::string>(), "TSET");
 }
 
+BOOST_AUTO_TEST_CASE(TestMatcherFromConcrete)
+{
+  auto fromQueryInputSpec = DataSpecUtils::dataDescriptorMatcherFrom(ConcreteDataMatcher{"TSET", "FOO", 1});
+  InputSpec ddSpec{
+    "binding",
+    std::move(fromQueryInputSpec)};
+
+  auto concrete = DataSpecUtils::asConcreteDataMatcher(ddSpec);
+
+  BOOST_CHECK_EQUAL(concrete.origin.as<std::string>(), "TSET");
+  BOOST_CHECK_EQUAL(concrete.description.as<std::string>(), "FOO");
+  BOOST_CHECK_EQUAL(concrete.subSpec, 1);
+}
+
 BOOST_AUTO_TEST_CASE(FindOutputSpec)
 {
   std::vector<OutputSpec> specs = {