Fix configuration calls (#1418)

* fix [QC-103] - update configuration interface usage in data sampling
* Adapt Data Sampling to the new Configuration

Author: awegrzyn

Framework/Core/src/DataSampling.cxx

@@ -142,7 +142,7 @@ QcTaskConfigurations DataSampling::readQcTasksConfiguration(const std::string& c
 
   std::vector<std::string> taskNames;
   try {
-    std::string taskNamesString = configFile->getString("qc/config/DataSampling/tasksList").value();
+    std::string taskNamesString = configFile->get<std::string>("qc/config/DataSampling/tasksList");
     boost::split(taskNames, taskNamesString, boost::is_any_of(","));
   } catch (const boost::bad_optional_access&) {
     LOG(ERROR) << "QC Task configuration error. In file " << configurationSource
@@ -157,22 +157,22 @@ QcTaskConfigurations DataSampling::readQcTasksConfiguration(const std::string& c
 
     std::string taskInputsNames;
     try {
-      std::string simpleQcTaskDefinition = configFile->getString(prefixConfigTasks + taskName + "/taskDefinition").value();
-      taskInputsNames = configFile->getString(prefixConfigTasks + simpleQcTaskDefinition + "/inputs").value();
-      task.fractionOfDataToSample = configFile->getFloat(prefixConfigTasks + simpleQcTaskDefinition + "/fraction").value();
+      std::string simpleQcTaskDefinition = configFile->get<std::string>(prefixConfigTasks + taskName + "/taskDefinition");
+      taskInputsNames = configFile->get<std::string>(prefixConfigTasks + simpleQcTaskDefinition + "/inputs");
+      task.fractionOfDataToSample = configFile->get<double>(prefixConfigTasks + simpleQcTaskDefinition + "/fraction");
       if (task.fractionOfDataToSample <= 0 || task.fractionOfDataToSample > 1) {
         LOG(ERROR) << "QC Task configuration error. In file " << configurationSource << ", value "
                    << prefixConfigTasks + simpleQcTaskDefinition + "/fraction"
                    << " is not in range (0,1]. Setting value to 0.";
         task.fractionOfDataToSample = 0;
       }
-      task.dispatcherType = configFile->getString(prefixConfigTasks + simpleQcTaskDefinition + "/dispatcherType").value_or("DPL");
+      task.dispatcherType = configFile->get<std::string>(prefixConfigTasks + simpleQcTaskDefinition + "/dispatcherType", "DPL");
       // if there is a channelConfig specified, then user wants output in raw FairMQ layer, not DPL
-      task.fairMqOutputChannelConfig = configFile->getString(prefixConfigTasks + simpleQcTaskDefinition + "/channelConfig").value_or("");
+      task.fairMqOutputChannelConfig = configFile->get<std::string>(prefixConfigTasks + simpleQcTaskDefinition + "/channelConfig", "");
 
       // FIXME: I do not like '-1' meaning 'all' - not 100% sure if it's safe to compare with '-1' later
       task.subSpec = static_cast<header::DataHeader::SubSpecificationType>(
-        configFile->getInt(prefixConfigTasks + simpleQcTaskDefinition + "/subSpec").value_or(-1));
+        configFile->get<int>(prefixConfigTasks + simpleQcTaskDefinition + "/subSpec", -1));
 
     } catch (const boost::bad_optional_access&) {
       LOG(ERROR) << "QC Task configuration error. In file " << configurationSource
@@ -187,12 +187,12 @@ QcTaskConfigurations DataSampling::readQcTasksConfiguration(const std::string& c
 
       InputSpec desiredData;
       try {
-        desiredData.binding = configFile->getString(prefixConfigTasks + input + "/inputName").value();
+        desiredData.binding = configFile->get<std::string>(prefixConfigTasks + input + "/inputName");
 
-        std::string origin = configFile->getString(prefixConfigTasks + input + "/dataOrigin").value();
+        std::string origin = configFile->get<std::string>(prefixConfigTasks + input + "/dataOrigin");
         origin.copy(desiredData.origin.str, (size_t)desiredData.origin.size);
 
-        std::string description = configFile->getString(prefixConfigTasks + input + "/dataDescription").value();
+        std::string description = configFile->get<std::string>(prefixConfigTasks + input + "/dataDescription");
         description.copy(desiredData.description.str, (size_t)desiredData.description.size);
 
       } catch (const boost::bad_optional_access&) {
@@ -203,12 +203,12 @@ QcTaskConfigurations DataSampling::readQcTasksConfiguration(const std::string& c
       task.desiredDataSpecs.push_back(desiredData);
 
       // for temporary feature
-      if (configFile->getInt(prefixConfigTasks + input + "/spawnConverter").value_or(0)) {
-        FairMqInput fairMqInput{ OutputSpec{
-                                   desiredData.origin, desiredData.description, task.subSpec == -1 ? 0 : task.subSpec,
-                                 },
-                                 configFile->getString(prefixConfigTasks + input + "/channelConfig").value_or(""),
-                                 configFile->getString(prefixConfigTasks + input + "/converterType").value_or("incrementalConverter") };
+      if (configFile->get<int>(prefixConfigTasks + input + "/spawnConverter", 0)) {
+        FairMqInput fairMqInput{
+          OutputSpec{ desiredData.origin, desiredData.description, task.subSpec == -1 ? 0 : task.subSpec },
+          configFile->get<std::string>(prefixConfigTasks + input + "/channelConfig", ""),
+          configFile->get<std::string>(prefixConfigTasks + input + "/converterType", "incrementalConverter")
+        };
         task.desiredFairMqData.push_back(fairMqInput);
       }
     }
@@ -232,10 +232,10 @@ InfrastructureConfig DataSampling::readInfrastructureConfiguration(const std::st
   std::unique_ptr<ConfigurationInterface> configFile = ConfigurationFactory::getConfiguration(configurationSource);
 
   cfg.enableTimePipeliningDispatchers =
-    static_cast<bool>(configFile->getInt("qc/config/DataSampling/enableTimePipeliningDispatchers").get_value_or(0));
+    static_cast<bool>(configFile->get<int>("qc/config/DataSampling/enableTimePipeliningDispatchers", 0));
   cfg.enableParallelDispatchers =
-    static_cast<bool>(configFile->getInt("qc/config/DataSampling/enableParallelDispatchers").get_value_or(0));
-  cfg.enableProxy = static_cast<bool>(configFile->getInt("qc/config/DataSampling/enableProxy").get_value_or(0));
+    static_cast<bool>(configFile->get<int>("qc/config/DataSampling/enableParallelDispatchers", 0));
+  cfg.enableProxy = static_cast<bool>(configFile->get<int>("qc/config/DataSampling/enableProxy", 0));
 
   return cfg;
 }