bugfix: saga ExpressionEvaluator not support null value (apache#1837)

funky-eyes · Nov 1, 2019 · 5473a62 · 5473a62
1 parent c772c7d
commit 5473a62
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/...-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java b/...-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java
@@ -46,12 +46,6 @@ public boolean evaluate(Map<String, Object> variables) {
         Object rootObject;
         if (StringUtils.hasText(this.rootObjectName)) {
             rootObject = variables.get(this.rootObjectName);
-            if (rootObject == null) {
-                if (LOGGER.isWarnEnabled()) {
-                    LOGGER.warn("Variable [{}] is not exits. Cannot execute expression {}, return false instead.", rootObjectName, expression.getExpressionString());
-                }
-                return false;
-            }
         } else {
             rootObject = variables;
         }

diff --git a/test/src/test/java/io/seata/saga/engine/mock/DemoService.java b/test/src/test/java/io/seata/saga/engine/mock/DemoService.java
@@ -16,8 +16,6 @@
 package io.seata.saga.engine.mock;
 
 import io.seata.saga.engine.exception.EngineExecutionException;
-
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +26,7 @@ public class DemoService {
 
     public Map<String, Object> foo(Map<String, Object> input) {
         if(input == null){
-            return new HashMap<>(0);
+            return null;
         }
         if("true".equals(input.get("throwException"))){
             throw new EngineExecutionException("foo execute failed");
@@ -43,7 +41,7 @@ public Map<String, Object> foo(Map<String, Object> input) {
 
     public Map<String, Object> compensateFoo(Map<String, Object> input) {
         if(input == null){
-            return new HashMap<>(0);
+            return null;
         }
         if("true".equals(input.get("throwException"))){
             throw new EngineExecutionException("compensateFoo execute failed");
@@ -58,7 +56,7 @@ public Map<String, Object> compensateFoo(Map<String, Object> input) {
 
     public Map<String, Object> bar(Map<String, Object> input) {
         if(input == null){
-            return new HashMap<>(0);
+            return null;
         }
         if("true".equals(input.get("throwException"))){
             throw new EngineExecutionException("bar execute failed");
@@ -73,7 +71,7 @@ public Map<String, Object> bar(Map<String, Object> input) {
 
     public Map<String, Object> compensateBar(Map<String, Object> input) {
         if(input == null){
-            return new HashMap<>(0);
+            return null;
         }
         if("true".equals(input.get("throwException"))){
             throw new EngineExecutionException("compensateBar execute failed");
@@ -159,4 +157,4 @@ public void setName(String name) {
             this.name = name;
         }
     }
-}
+}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json b/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json
@@ -8,7 +8,7 @@
             "Type": "ServiceTask",
             "ServiceName": "demoService",
             "ServiceMethod": "foo",
-            "Next": "ChoiceState",
+            "Next": "ReturnNullState",
             "Input": [
                 {
                     "fooInput": "$.[a]"
@@ -18,6 +18,18 @@
                 "fooResult": "$.#root"
             }
         },
+        "ReturnNullState": {
+            "Type": "ServiceTask",
+            "ServiceName": "demoService",
+            "ServiceMethod": "foo",
+            "Next": "ChoiceState",
+            "Status": {
+                "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+                "$Exception{java.lang.Exception}": "FA",
+                "#root != null &&  #root.size() > 0": "SU",
+                "#root == null || #root.size() == 0": "FA"
+            }
+        },
         "ChoiceState":{
             "Type": "Choice",
             "Choices":[