Fixes #17682: Make clear in parent that parsing code is common

Normation · Jun 9, 2020 · fe5ba33 · fe5ba33
1 parent ea72f4e
commit fe5ba33
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/...rces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Properties.scala b/...rces/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Properties.scala
@@ -225,6 +225,19 @@ object GenericProperty {
     }
   }
 
+  /**
+   * Parse a value that was correctly serialized to hocon (ie string are quoted, etc)
+   */
+  def parseSerialisedValue(value: String): PureResult[ConfigValue] = {
+    PureResult.effect(s"Error: value is not parsable as a property: ${value}") {
+      ConfigFactory.parseString(
+        // it's necessary to put it on its own line to avoid pb with comments/multilines
+        s"""{"x":
+            ${value}
+            }""").getValue("x")
+    }
+  }
+
   /**
    * Contrary to native hocon, we only have TWO kinds of values:
    * - object, which are mandatory to start with a '{' and end by a '}'
@@ -239,13 +252,7 @@ object GenericProperty {
       case None => // here, we need to return the original string, user may want to use a comment (in bash for ex) as value
         Right(ConfigValueFactory.fromAnyRef(value))
       case Some(c) if(c == '{') =>
-        PureResult.effect(s"Error: value is not parsable as a property: ${value}") {
-          ConfigFactory.parseString(
-            // it's necessary to put it on its own line to avoid pb with comments/multilines
-            s"""{"x":
-                ${value}
-                }""").getValue("x")
-        }
+        parseSerialisedValue(value)
       case _ => // it's a string that should be understood as a string
         Right(ConfigValueFactory.fromAnyRef(value))
     }
@@ -265,14 +272,7 @@ object GenericProperty {
   implicit class GlobalParameterParsing(value: String) {
     def parseGlobalParameter(forceString: Boolean): PureResult[ConfigValue] = {
       if(forceString) Right(ConfigValueFactory.fromAnyRef(value))
-      else PureResult.effect(s"Error: value is not parsable as a property: ${value}") {
-        ConfigFactory.parseString(
-          // it's necessary to put it on its own line to avoid pb with comments/multilines
-          s"""{"x":
-              ${value}
-              }"""
-        ).getValue("x")
-      }
+      else parseSerialisedValue(value)
     }
   }
   implicit class GlobalParameterSerialisation(value: ConfigValue) {