fix: Fix broken render template function

kuseman · Sep 23, 2024 · 3c5deab · 3c5deab
1 parent fcdafb9
commit 3c5deab
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/RenderTemplateFunction.java b/...er-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/RenderTemplateFunction.java
@@ -1,5 +1,6 @@
 package se.kuseman.payloadbuilder.catalog.es;
 
+import static java.util.Collections.emptyMap;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static se.kuseman.payloadbuilder.api.utils.MapUtils.entry;
 import static se.kuseman.payloadbuilder.api.utils.MapUtils.ofEntries;
@@ -51,20 +52,32 @@ public Arity arity()
         return Arity.TWO;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public ValueVector evalScalar(IExecutionContext context, TupleVector input, String catalogAlias, List<IExpression> arguments)
     {
-        Object templateObj = arguments.get(0)
+        ValueVector vv = arguments.get(0)
                 .eval(context);
-        if (!(templateObj instanceof String))
+        if (vv.isNull(0))
         {
-            throw new IllegalArgumentException("Expected template argument for " + getName() + " to return a String, got: " + templateObj);
+            return ValueVector.literalNull(ResolvedType.STRING, 1);
         }
-        Object paramsObj = arguments.get(1)
+        String template = vv.getString(0)
+                .toString();
+
+        vv = arguments.get(1)
                 .eval(context);
-        if (!(paramsObj instanceof Map))
+
+        Map<String, Object> params = emptyMap();
+
+        if (!vv.isNull(0))
         {
-            throw new IllegalArgumentException("Expected params argument for " + getName() + " to return a Map, got: " + paramsObj);
+            Object paramsObj = vv.getAny(0);
+            if (!(paramsObj instanceof Map))
+            {
+                throw new IllegalArgumentException("Expected params argument for " + getName() + " to return a Map, got: " + paramsObj);
+            }
+            params = (Map<String, Object>) paramsObj;
         }
 
         String endpoint = context.getSession()
@@ -76,10 +89,6 @@ public ValueVector evalScalar(IExecutionContext context, TupleVector input, Stri
             throw new IllegalArgumentException("Missing endpoint in catalog properties.");
         }
 
-        String template = (String) templateObj;
-        @SuppressWarnings("unchecked")
-        Map<String, Object> params = (Map<String, Object>) paramsObj;
-
         HttpPost post = new HttpPost(endpoint + "/_render/template/");
         post.setEntity(new StringEntity(serialize(ofEntries(entry("id", template), entry("params", params))), StandardCharsets.UTF_8));