1.修改部分EL实例toString方法，用于日志正常输出

Author: FanJiaRui

pom.xml

@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.fanjr.simplify</groupId>
     <artifactId>simplify-el</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
     <name>Simply Expression Language</name>
     <description>

src/main/java/org/fanjr/simplify/el/ELExecutor.java

@@ -414,9 +414,9 @@ public static ELInvoker resolve(char[] chars, int start, int end) {
                         if (dots.length == 1) {
                             // 已判断形式为XX.fun(...)形式，进一步判断是否为注册的function
                             String functionUtilsName = String.valueOf(chars, start, dots[0] - start);
-                            if (ELFunctionInvokeUtils.hasUtils(functionUtilsName)){
+                            if (ELFunctionInvokeUtils.hasUtils(functionUtilsName)) {
                                 String methodName = String.valueOf(chars, dots[0] + 1, nextFunctionToken - dots[0] - 1);
-                                parent = FunctionMethodNodeInvoker.newInstance(functionUtilsName, methodName, resolveList(chars, nextFunctionToken, nextFunctionEnd + 1));
+                                parent = FunctionMethodNodeInvoker.newInstance(new String(chars, start, nextFunctionEnd + 1 - start), functionUtilsName, methodName, resolveList(chars, nextFunctionToken, nextFunctionEnd + 1));
                                 // 位移到方法后
                                 start = nextFunctionEnd + 1;
                                 if (start >= end) {

src/main/java/org/fanjr/simplify/el/NullEL.java

@@ -20,4 +20,9 @@ public void accept(ELVisitor visitor) {
         // 访问自身
         visitor.visit(this);
     }
+
+    @Override
+    public String toString() {
+        return "[EL: null]";
+    }
 }

src/main/java/org/fanjr/simplify/el/SimpleEL.java

@@ -27,4 +27,9 @@ public void accept(ELVisitor visitor) {
             invoker.accept(visitor);
         }
     }
+
+    @Override
+    public String toString() {
+        return "[EL: " + invoker.toString() + "]";
+    }
 }

src/main/java/org/fanjr/simplify/el/SpliceEL.java

@@ -42,4 +42,13 @@ public void accept(ELVisitor visitor) {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (ELInvoker invoker : invokers) {
+            sb.append("[EL: ").append(invoker.toString()).append("]");
+        }
+        return sb.toString();
+    }
 }

src/main/java/org/fanjr/simplify/el/invoker/node/FunctionMethodNodeInvoker.java

@@ -23,15 +23,15 @@ public class FunctionMethodNodeInvoker extends NodeInvoker {
     private final String utilName;
     private final String methodName;
 
-    private FunctionMethodNodeInvoker(String utilName, String functionName, ArrayInvoker parameterEl) {
-        super(utilName);
+    private FunctionMethodNodeInvoker(String nodeName, String utilName, String functionName, ArrayInvoker parameterEl) {
+        super(nodeName);
         this.utilName = utilName;
         this.methodName = functionName;
         this.parameterEl = parameterEl;
     }
 
-    public static FunctionMethodNodeInvoker newInstance(String className, String methodName, ArrayInvoker parameterEl) {
-        return new FunctionMethodNodeInvoker(className, methodName, parameterEl);
+    public static FunctionMethodNodeInvoker newInstance(String nodeName, String className, String methodName, ArrayInvoker parameterEl) {
+        return new FunctionMethodNodeInvoker(nodeName, className, methodName, parameterEl);
     }
 
     @Override
@@ -62,11 +62,6 @@ void setValueByParent(NodeHolder parentNode, Object value, int index) {
         throw new ElException("不可对【" + this + "】方法执行结果重新赋值！");
     }
 
-    @Override
-    public String toString() {
-        return "Function:" + super.toString();
-    }
-
     @Override
     public boolean isVariable() {
         // 动作、方法类为非变量

src/test/java/unit/UnitTest.java

@@ -101,7 +101,7 @@ public void testCache() throws InterruptedException {
 
     @Test
     public void testVisitor() {
-        EL compile = ELExecutor.compile("((String)a+(String)b).substring(map.len)+$.toDate('2014'+map.mon+map.day).toString().length");
+        EL compile = ELExecutor.compile("BEFORE${((String)a+(String)b).substring(map.len)+$.toDate('2014'+map.mon+map.day).toString().length}AFTER");
         compile.accept(new ELVisitor() {
             @Override
             public boolean visit(EL el) {