MUL-294: Move and template parseConfig method for reuse

Author: tweska

src/multio/action/Action.h

@@ -25,6 +25,7 @@
 #include "ActionStatistics.h"
 #include "eckit/memory/NonCopyable.h"
 #include "multio/config/ComponentConfiguration.h"
+#include "multio/datamod/core/EntryParser.h"
 #include "multio/message/Message.h"
 #include "multio/util/FailureHandling.h"
 
@@ -130,4 +131,16 @@ class ActionBuilder final : public ActionBuilderBase {
 
 //--------------------------------------------------------------------------------------------------
 
+template <typename ParsedConfig>
+ParsedConfig parseConfig(const ComponentConfiguration& compConf) {
+    multio::datamod::ParseOptions opts;
+    opts.allowAdditionalKeys = false;
+
+    auto conf = compConf.parsedConfig();
+    conf.remove("type");
+    conf.remove("next");
+
+    return multio::datamod::readRecordByValue<ParsedConfig>(conf, opts);
+}
+
 }  // namespace multio::action

src/multio/action/encode-mtg2/EncodeMtg2.cc

@@ -43,23 +43,9 @@ mars2grib::RawOptions mapOpts(EncodeMtg2Options opts) {
     return ret;
 };
 
-EncodeMtg2Options parseOpts(const ComponentConfiguration& compConf) {
-    /// TODO(pgeier) With C++20 designators are more useful for inline creation of structs:
-    /// ParsedOptions{.allowAdditionalKeys=false}
-    dm::ParseOptions opts;
-    opts.allowAdditionalKeys = false;
-    
-    // TODO(pgeier) Fix after refactoring action - need to remove keys "type" and "next"
-    auto conf = compConf.parsedConfig();
-    conf.remove("type");
-    conf.remove("next");
-    
-    return dm::readRecordByValue<EncodeMtg2Options>(conf, opts);
-}
-
 
 EncodeMtg2::EncodeMtg2(const ComponentConfiguration& compConf) :
-    ChainedAction{compConf}, opts_{parseOpts(compConf)}, mars2grib_{mapOpts(opts_)} {}
+    ChainedAction{compConf}, opts_{parseConfig<EncodeMtg2Options>(compConf)}, mars2grib_{mapOpts(opts_)} {}
 
 
 void EncodeMtg2::executeImpl(Message msg) {

src/multio/action/scale/Scale.cc

@@ -20,18 +20,6 @@
 
 namespace multio::action::scale {
 
-ScaleConfig parseConfig(const ComponentConfiguration& compConf) {
-    dm::ParseOptions opts;
-    opts.allowAdditionalKeys = false;
-
-    // TODO(pgeier) Fix after refactoring action - need to remove keys "type" and "next"
-    auto conf = compConf.parsedConfig();
-    conf.remove("type");
-    conf.remove("next");
-
-    return dm::readRecordByValue<ScaleConfig>(conf, opts);
-}
-
 const std::vector<ScaleMappingConfig> getPresetMappings(const Preset& preset) {
     // Load the mapping file
     eckit::LocalConfiguration mappingConf{eckit::YAMLConfiguration{eckit::PathName{
@@ -71,7 +59,7 @@ Mappings getMappings(const ScaleConfig& config) {
 }
 
 Scale::Scale(const ComponentConfiguration& compConf) :
-    ChainedAction(compConf), mappings_{getMappings(parseConfig(compConf))} {}
+    ChainedAction(compConf), mappings_{getMappings(parseConfig<ScaleConfig>(compConf))} {}
 
 void Scale::executeImpl(message::Message msg) {
     // Skip non-field messages