Fixed: decoding / encoding

TouK · Dec 12, 2024 · 86533d3 · 86533d3
1 parent 4ab6fe4
commit 86533d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...mponents-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala b/...mponents-api/src/main/scala/pl/touk/nussknacker/engine/flink/api/NkGlobalParameters.scala
@@ -100,9 +100,11 @@ object NkGlobalParameters {
       val configMap = parameters.configParameters
         .map(ConfigGlobalParametersToMapEncoder.encode)
         .getOrElse(Map.empty)
+
       val namespaceTagsMap = parameters.namespaceParameters
         .map(p => encodeWithKeyPrefix(p.tags, namespaceTagsMapPrefix))
         .getOrElse(Map.empty)
+
       val additionalInformationMap =
         encodeWithKeyPrefix(parameters.additionalInformation, additionalInformationMapPrefix)
 
@@ -112,8 +114,8 @@ object NkGlobalParameters {
     def decode(map: Map[String, String]): Option[NkGlobalParameters] = {
       def decodeWithKeyPrefix(map: Map[String, String], prefix: String): Map[String, String] = {
         map.view
-          .filter { case (key, _) => key.startsWith(prefix) }
-          .map { case (key, value) => key.stripPrefix(prefix) -> value }
+          .filter { case (key, _) => key.startsWith(s"$prefix.") }
+          .map { case (key, value) => key.stripPrefix(s"$prefix.") -> value }
           .toMap
       }
 
@@ -130,10 +132,12 @@ object NkGlobalParameters {
       val buildInfoOpt = map.get("buildInfo")
 
       val configParameters = ConfigGlobalParametersToMapEncoder.decode(map)
+
       val namespaceTags = {
         val namespaceTagsMap = decodeWithKeyPrefix(map, namespaceTagsMapPrefix)
         if (namespaceTagsMap.isEmpty) None else Some(NamespaceMetricsTags(namespaceTagsMap))
       }
+
       val additionalInformation = decodeWithKeyPrefix(map, additionalInformationMapPrefix)
 
       for {

diff --git a/...nk/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkRestManager.scala b/...nk/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkRestManager.scala
@@ -160,14 +160,14 @@ class FlinkRestManager(
       val userConfig = executionConfig.`user-config`
 
       for {
-        version <- userConfig.get("additionalInformation.versionId").flatMap(_.asString).map(_.toLong).map(VersionId(_))
-        user    <- userConfig.get("additionalInformation.user").map(_.asString.getOrElse(""))
-        modelVersion = userConfig.get("additionalInformation.modelVersion").flatMap(_.asString).map(_.toInt)
+        version <- userConfig.get("versionId").flatMap(_.asString).map(_.toLong).map(VersionId(_))
+        user    <- userConfig.get("user").map(_.asString.getOrElse(""))
+        modelVersion = userConfig.get("modelVersion").flatMap(_.asString).map(_.toInt)
         processId = ProcessId(
-          userConfig.get("additionalInformation.processId").flatMap(_.asString).map(_.toLong).getOrElse(-1L)
+          userConfig.get("processId").flatMap(_.asString).map(_.toLong).getOrElse(-1L)
         )
         labels = userConfig
-          .get("additionalInformation.labels")
+          .get("labels")
           .flatMap(_.asArray)
           .map(_.toList.flatMap(_.asString))
           .toList