minor objectMapper unification

Author: andreaTP

core/src/main/java/com/github/andreaTP/opa/chicory/Opa.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,9 +20,9 @@
 // directly porting:
 // https://github.com/open-policy-agent/npm-opa-wasm/blob/main/README.md
 public class Opa {
-
-    // TODO: pass around a concrete instance instead of using a global one
+    // TODO: pass around a concrete instance instead of using a global
     public static ObjectMapper jsonMapper = new ObjectMapper();
+    public static ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
 
     public static class OpaPolicy {
         private final OpaWasm wasm;

core/src/main/java/com/github/andreaTP/opa/chicory/builtins/Yaml.java

@@ -2,23 +2,19 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.BooleanNode;
 import com.fasterxml.jackson.databind.node.TextNode;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.github.andreaTP.opa.chicory.Opa;
 import com.github.andreaTP.opa.chicory.OpaBuiltin;
 
 public class Yaml {
-    public static ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
-
-    // maybe: .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
 
     private static JsonNode isValidImpl(JsonNode boxedYaml) {
         if (!boxedYaml.isTextual()) {
             return BooleanNode.getFalse();
         } else {
             try {
-                yamlMapper.readTree(boxedYaml.asText());
+                Opa.yamlMapper.readTree(boxedYaml.asText());
                 return BooleanNode.getTrue();
             } catch (JsonProcessingException e) {
                 return BooleanNode.getFalse();
@@ -34,7 +30,7 @@ private static JsonNode unmarshalImpl(JsonNode boxedYaml) {
             throw new RuntimeException("yaml is not correctly boxed in a Json string");
         } else {
             try {
-                return yamlMapper.readTree(boxedYaml.asText());
+                return Opa.yamlMapper.readTree(boxedYaml.asText());
             } catch (JsonProcessingException e) {
                 // should ignore errors here ...
                 return BooleanNode.getFalse();
@@ -47,7 +43,7 @@ private static JsonNode unmarshalImpl(JsonNode boxedYaml) {
 
     public static JsonNode marshalImpl(JsonNode json) {
         try {
-            return TextNode.valueOf(yamlMapper.writeValueAsString(json));
+            return TextNode.valueOf(Opa.yamlMapper.writeValueAsString(json));
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }