graphql variables type judgment

Author: lvhuichao

server/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java

@@ -11,7 +11,6 @@
 import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH;
 import static com.openblocks.sdk.util.JsonUtils.readTree;
 import static com.openblocks.sdk.util.JsonUtils.toJsonThrows;
-import static com.openblocks.sdk.util.MustacheHelper.renderMustacheForObjectValue;
 import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString;
 import static com.openblocks.sdk.util.StreamUtils.collectList;
 import static com.openblocks.sdk.util.StreamUtils.distinctByKey;
@@ -74,6 +73,7 @@
 import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType;
 import com.openblocks.sdk.query.QueryVisitorContext;
 import com.openblocks.sdk.util.JsonUtils;
+import com.openblocks.sdk.util.MustacheHelper;
 import com.openblocks.sdk.webclient.WebClients;
 
 import lombok.Builder;
@@ -139,7 +139,7 @@ public GraphQLQueryExecutionContext buildQueryExecutionContext(GraphQLDatasource
         List<Property> updatedQueryBodyParams = renderMustacheValueInProperties(queryBodyParams, requestParams);
         var updatedVariables = JsonUtils.createObjectNode();
         queryConfig.getVariables().forEach(property -> updatedVariables.set(property.getKey(),
-                JsonUtils.valueToTree(renderMustacheForObjectValue(property.getValue(), requestParams))));
+                MustacheHelper.renderMustacheJson(property.getValue(), requestParams)));
         String normalizedUrl = buildUrl(urlDomain, updatedQueryPath, requestParams);
         Map<String, String> allHeaders = buildHeaders(datasourceHeaders, updatedQueryHeaders);
         String contentType = parseContentType(allHeaders).toLowerCase();

server/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java

@@ -1,7 +1,7 @@
 package com.openblocks.sdk.plugin.sheet.changeset;
 
 import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS;
-import static com.openblocks.sdk.util.MustacheHelper.renderMustacheForObjectValue;
+import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJson;
 import static java.util.Collections.emptyMap;
 
 import java.util.ArrayList;
@@ -14,6 +14,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.openblocks.sdk.exception.PluginException;
+import com.openblocks.sdk.util.JsonUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,7 +47,7 @@ public SheetKeyValuePairChangeSet(Object comp) {
     public SheetChangeSetRow render(Map<String, Object> requestMap) {
         List<SheetChangeSetItem> result = new ArrayList<>();
         for (String column : map.keySet()) {
-            Object renderedValue = renderMustacheForObjectValue(map.get(column), requestMap);
+            Object renderedValue = JsonUtils.jsonNodeToObject(renderMustacheJson(map.get(column), requestMap));
             result.add(new SheetChangeSetItem(column, renderedValue));
         }
         return new SheetChangeSetRow(result);

server/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MustacheHelper.java

@@ -298,23 +298,6 @@ public static String renderMustacheString(String template, Map<String, ?> paramM
         return renderMustacheTokens(tokenize, paramMap);
     }
 
-    public static Object renderMustacheForObjectValue(String template, Map<String, ?> paramMap) {
-        if (isBlank(template)) {
-            return template;
-        }
-        List<String> tokenize = tokenize(template.trim());
-        if (tokenize.size() == 1) {
-            String token = tokenize.get(0);
-            if (isMustacheToken(token)) {
-                String key = removeCurlyBraces(token);
-                if (paramMap.containsKey(key)) {
-                    return paramMap.get(key);
-                }
-            }
-        }
-        return renderMustacheString(template, paramMap);
-    }
-
     @SuppressWarnings("DuplicatedCode")
     public static String renderMustacheStringWithoutRemoveSurroundedPar(String template, Map<String, ?> paramMap) {
         if (isBlank(template)) {

server/openblocks-sdk/src/test/java/com/openblocks/sdk/helpers/MustacheHelperTest.java

@@ -7,6 +7,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +18,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.openblocks.sdk.util.JsonUtils;
 import com.openblocks.sdk.util.MustacheHelper;
 
 @SuppressWarnings(
@@ -443,4 +445,30 @@ public void testRenderMustacheJsonString() {
         String s = MustacheHelper.renderMustacheJsonString(json, map);
         System.out.println(s);
     }
+
+    @Test
+    public void typeJudgment() {
+        Object number = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("1", Map.of()));
+        Assert.assertTrue(number instanceof Integer);
+        Object b = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("true", Map.of()));
+        Assert.assertTrue(b instanceof Boolean);
+        Object array = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("['abc', 1]", Map.of()));
+        Assert.assertTrue(array instanceof Collection<?>);
+        Object array2 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("[abc, cde]", Map.of()));
+        Assert.assertTrue(array2 instanceof Collection<?>);
+        Object o = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("{'a': 1, 'b': 'xx'}", Map.of()));
+        Assert.assertTrue(o instanceof Map<?, ?>);
+        Object o2 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("{a:1, b:2}", Map.of()));
+        Assert.assertTrue(o2 instanceof Map<?, ?>);
+        Object o3 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("{{3}}3", Map.of("3", 3)));
+        Assert.assertEquals(o3, "33");
+        Object o4 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("{{3}}3", Map.of("3", "3")));
+        Assert.assertEquals(o4, "33");
+        Object o5 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("{{t}}rue", Map.of("t", "t")));
+        Assert.assertEquals(o5, "true");
+        Object o6 = JsonUtils.jsonNodeToObject(MustacheHelper.renderMustacheJson("[1, {{3}}3]", Map.of("3", 3)));
+        Object[] objects = ((Collection<?>) o6).toArray();
+        Assert.assertEquals(objects[0], 1);
+        Assert.assertEquals(objects[1], "33");
+    }
 }