Reuse parseControllerService utility

Author: lordgamez

extensions/standard-processors/processors/ConvertRecord.cpp

@@ -22,33 +22,15 @@
 #include "utils/ProcessorConfigUtils.h"
 
 namespace org::apache::nifi::minifi::processors {
-namespace {
-template<typename RecordSetIO>
-std::shared_ptr<RecordSetIO> getRecordSetIO(core::ProcessContext& context, const core::PropertyReference& property, const utils::Identifier& processor_uuid) {
-  std::string service_name = context.getProperty(property).value_or("");
-  if (!IsNullOrEmpty(service_name)) {
-    auto record_set_io = std::dynamic_pointer_cast<RecordSetIO>(context.getControllerService(service_name, processor_uuid));
-    if (!record_set_io)
-      return nullptr;
-    return record_set_io;
-  }
-  return nullptr;
-}
-}  // namespace
 
 void ConvertRecord::onSchedule(core::ProcessContext& context, core::ProcessSessionFactory&) {
-  record_set_reader_ = getRecordSetIO<core::RecordSetReader>(context, RecordReader, getUUID());
-  if (!record_set_reader_) {
-    throw Exception(ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "Record Reader property is missing or invalid");
-  }
-  record_set_writer_ = getRecordSetIO<core::RecordSetWriter>(context, RecordWriter, getUUID());
-  if (!record_set_writer_) {
-    throw Exception(ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "Record Writer property is missing or invalid");
-  }
+  record_set_reader_ = utils::parseControllerService<core::RecordSetReader>(context, RecordReader, getUUID());
+  record_set_writer_ = utils::parseControllerService<core::RecordSetWriter>(context, RecordWriter, getUUID());
   include_zero_record_flow_files_ = utils::parseBoolProperty(context, IncludeZeroRecordFlowFiles);
 }
 
 void ConvertRecord::onTrigger(core::ProcessContext& context, core::ProcessSession& session) {
+  gsl_Expects(record_set_reader_ && record_set_writer_);
   const auto flow_file = session.get();
   if (!flow_file) {
     context.yield();

extensions/standard-processors/tests/unit/ConvertRecordTests.cpp

@@ -32,10 +32,12 @@ TEST_CASE("ConvertRecord scheduling fails with invalid reader and writer", "[Con
   SingleProcessorTestController controller(utils::make_processor<processors::ConvertRecord>("ConvertRecord"));
   controller.plan->addController("XMLReader", "XMLReader");
 
-  REQUIRE_THROWS_WITH(controller.trigger(minifi::test::InputFlowFileData{""}), "Process Schedule Operation: Record Reader property is missing or invalid");
+  REQUIRE_THROWS_WITH(controller.trigger(minifi::test::InputFlowFileData{""}), "Process Schedule Operation: Required controller service property 'Record Reader' is missing");
 
   REQUIRE(controller.getProcessor()->setProperty(processors::ConvertRecord::RecordReader.name, "XMLReader"));
-  REQUIRE_THROWS_WITH(controller.trigger(minifi::test::InputFlowFileData{""}), "Process Schedule Operation: Record Writer property is missing or invalid");
+  REQUIRE_THROWS_WITH(controller.trigger(minifi::test::InputFlowFileData{""}), "Process Schedule Operation: Required controller service property 'Record Writer' is missing");
+  REQUIRE(controller.getProcessor()->setProperty(processors::ConvertRecord::RecordWriter.name, "XMLWriter"));
+  REQUIRE_THROWS_WITH(controller.trigger(minifi::test::InputFlowFileData{""}), "Process Schedule Operation: Controller service 'Record Writer' = 'XMLWriter' not found");
 }
 
 TEST_CASE("Record conversion fails with read failure", "[ConvertRecord]") {