Improve DataSpecUtils::asConcreteDataMatcher(InputSpec)

Now supports some DataDescriptorMatcher

Author: ktf

Framework/Core/src/DataSpecUtils.cxx

@@ -277,24 +277,6 @@ bool DataSpecUtils::partialMatch(OutputSpec const& output, header::DataDescripti
   return dataType.description == description;
 }
 
-ConcreteDataMatcher DataSpecUtils::asConcreteDataMatcher(InputSpec const& spec)
-{
-  return std::get<ConcreteDataMatcher>(spec.matcher);
-}
-
-ConcreteDataMatcher DataSpecUtils::asConcreteDataMatcher(OutputSpec const& spec)
-{
-  return std::get<ConcreteDataMatcher>(spec.matcher);
-}
-
-ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(OutputSpec const& spec)
-{
-  return std::visit([](auto const& concrete) {
-    return ConcreteDataTypeMatcher{concrete.origin, concrete.description};
-  },
-                    spec.matcher);
-}
-
 struct MatcherInfo {
   header::DataOrigin origin = header::gDataOriginInvalid;                // Whether or not we found an origins (should be a bad query!)
   header::DataDescription description = header::gDataDescriptionInvalid; // Whether or not we found a description
@@ -383,6 +365,36 @@ MatcherInfo extractMatcherInfo(DataDescriptorMatcher const& top)
   return state;
 }
 
+ConcreteDataMatcher DataSpecUtils::asConcreteDataMatcher(InputSpec const& spec)
+{
+  return std::visit(overloaded{[](ConcreteDataMatcher const& concrete) {
+                                 return concrete;
+                               },
+                               [&binding = spec.binding](DataDescriptorMatcher const& matcher) {
+                                 auto info = extractMatcherInfo(matcher);
+                                 if (info.hasOrigin && info.hasUniqueOrigin &&
+                                     info.hasDescription && info.hasDescription &&
+                                     info.hasSubSpec && info.hasUniqueSubSpec) {
+                                   return ConcreteDataMatcher{info.origin, info.description, info.subSpec};
+                                 }
+                                 throw std::runtime_error("Cannot convert " + binding + " to ConcreteDataMatcher");
+                               }},
+                    spec.matcher);
+}
+
+ConcreteDataMatcher DataSpecUtils::asConcreteDataMatcher(OutputSpec const& spec)
+{
+  return std::get<ConcreteDataMatcher>(spec.matcher);
+}
+
+ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(OutputSpec const& spec)
+{
+  return std::visit([](auto const& concrete) {
+    return ConcreteDataTypeMatcher{concrete.origin, concrete.description};
+  },
+                    spec.matcher);
+}
+
 ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(InputSpec const& spec)
 {
   return std::visit(overloaded{

Framework/Core/test/unittest_DataSpecUtils.cxx

@@ -125,7 +125,11 @@ BOOST_AUTO_TEST_CASE(MatchingInputs)
   BOOST_CHECK(DataSpecUtils::match(matchingInput2, concreteExample3) == false);
   BOOST_CHECK(DataSpecUtils::match(matchingInput2, concreteExample4) == false);
 
-  BOOST_CHECK_THROW(DataSpecUtils::asConcreteDataMatcher(matchingInput2), std::bad_variant_access);
+  BOOST_CHECK_THROW(DataSpecUtils::asConcreteDataMatcher(matchingInput2), std::runtime_error);
+  auto concrete2 = DataSpecUtils::asConcreteDataMatcher(matchingInput1);
+  BOOST_CHECK_EQUAL(concrete.origin.as<std::string>(), "TEST");
+  BOOST_CHECK_EQUAL(concrete.description.as<std::string>(), "FOOO");
+  BOOST_CHECK_EQUAL(concrete.subSpec, 1);
 }
 
 BOOST_AUTO_TEST_CASE(MatchingOutputs)