增加帮助函数

entropy-cloud · Jan 23, 2025 · e0765de · e0765de
1 parent dee2cd5
commit e0765de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/nop-core/src/main/java/io/nop/core/lang/json/JsonTool.java b/nop-core/src/main/java/io/nop/core/lang/json/JsonTool.java
@@ -23,6 +23,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import java.lang.reflect.Type;
+import java.util.Map;
 import java.util.function.Function;
 
 import static io.nop.core.CoreConfigs.CFG_JSON_PARSE_IGNORE_UNKNOWN_PROP;
@@ -40,6 +41,8 @@ public static IJsonTool instance() {
     }
 
     public static Object parse(String str) {
+        if (StringHelper.isBlank(str))
+            return null;
         JsonParseOptions options = new JsonParseOptions();
         options.setStrictMode(true);
         return instance().parseFromText(null, str, options);
@@ -51,6 +54,10 @@ public static Object parseNonStrict(String str) {
         return instance().parseFromText(null, str, options);
     }
 
+    public static Map<String, Object> parseMap(String str) {
+        return (Map<String, Object>) parseNonStrict(str);
+    }
+
     public static Object parseNonStrict(SourceLocation loc, String str) {
         JsonParseOptions options = new JsonParseOptions();
         options.setStrictMode(false);

diff --git a/nop-core/src/main/java/io/nop/core/model/selection/FieldSelectionBeanParser.java b/nop-core/src/main/java/io/nop/core/model/selection/FieldSelectionBeanParser.java
@@ -11,6 +11,7 @@
 import io.nop.api.core.util.SourceLocation;
 import io.nop.api.core.util.Symbol;
 import io.nop.commons.text.tokenizer.TextScanner;
+import io.nop.commons.util.StringHelper;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -21,6 +22,12 @@
 import static io.nop.core.CoreErrors.ERR_SELECTION_INVALID_ARG_NAME;
 
 public class FieldSelectionBeanParser {
+    public static FieldSelectionBean fromText(SourceLocation loc, String text) {
+        if (StringHelper.isEmpty(text))
+            return null;
+        return new FieldSelectionBeanParser().parseFromText(loc, text);
+    }
+
     public FieldSelectionBean parseFromText(SourceLocation loc, String text) {
         TextScanner sc = TextScanner.fromString(loc, text);
         sc.skipBlank();