Merge pull request #259 from TIBCOSoftware/iterate-expression

Support expression for iterate field

Author: lixingwang

action/flow/instance/taskinst.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TIBCOSoftware/flogo-contrib/action/flow/model"
 	"github.com/TIBCOSoftware/flogo-lib/core/activity"
 	"github.com/TIBCOSoftware/flogo-lib/core/data"
+	"github.com/TIBCOSoftware/flogo-lib/core/mapper/exprmapper"
 	"github.com/TIBCOSoftware/flogo-lib/logger"
 )
 
@@ -189,8 +190,8 @@ func (ti *TaskInst) HasWorkingData() bool {
 }
 
 func (ti *TaskInst) Resolve(toResolve string) (value interface{}, err error) {
-
-	return definition.GetDataResolver().Resolve(toResolve, ti.flowInst)
+	//Support expression mapping
+	return exprmapper.GetMappingValue(toResolve, ti.flowInst, definition.GetDataResolver())
 }
 
 func (ti *TaskInst) AddWorkingData(attr *data.Attribute) {
@@ -494,6 +495,7 @@ func (taskInst *TaskInst) appendErrorData(err error) {
 
 	//todo add case for *dataMapperError & *activity.Error
 }
+
 //// Failed marks the Activity as failed
 //func (td *TaskInst) Failed(err error) {
 //

action/flow/model/simple/iteratorbehavior.go

@@ -47,6 +47,10 @@ func (tb *IteratorTaskBehavior) Eval(ctx model.TaskContext) (evalResult model.Ev
 				return model.EVAL_FAIL, err
 			}
 			itx = NewIntIterator(count)
+		case int64:
+			itx = NewIntIterator(int(t))
+		case float64:
+			itx = NewIntIterator(int(t))
 		case int:
 			count := iterateOn.(int)
 			itx = NewIntIterator(count)
@@ -142,12 +146,12 @@ func getIterateValue(ctx model.TaskContext) (value interface{}, set bool) {
 
 	strVal, ok := value.(string)
 	if ok {
-		if strVal[0] == '$' {
-			val, err := ctx.Resolve(strVal)
-			if err == nil {
-				return val, true
-			}
+		val, err := ctx.Resolve(strVal)
+		if err != nil {
+			log.Errorf("Get iterate value failed, due to %s", err.Error())
+			return nil, false
 		}
+		return val, true
 	}
 
 	return value, true
@@ -270,7 +274,7 @@ func NewObjectIterator(data map[string]interface{}) *ObjectIterator {
 
 type ReflectIterator struct {
 	current int
-	val reflect.Value
+	val     reflect.Value
 }
 
 func (itx *ReflectIterator) Key() interface{} {
@@ -299,4 +303,4 @@ func (itx *ReflectIterator) next() bool {
 
 func NewReflectIterator(val reflect.Value) *ReflectIterator {
 	return &ReflectIterator{val: val, current: -1}
-}
+}

model/simple/behaviors/taskiterator.go

@@ -47,6 +47,10 @@ func (tb *IteratorTask) Eval(ctx model.TaskContext) (evalResult model.EvalResult
 				return model.EVAL_FAIL, err
 			}
 			itx = NewIntIterator(count)
+		case int64:
+			itx = NewIntIterator(int(t))
+		case float64:
+			itx = NewIntIterator(int(t))
 		case int:
 			count := iterateOn.(int)
 			itx = NewIntIterator(count)
@@ -141,12 +145,12 @@ func getIterateValue(ctx model.TaskContext) (value interface{}, set bool) {
 
 	strVal, ok := value.(string)
 	if ok {
-		if strVal[0] == '$' {
-			val, err := ctx.Resolve(strVal)
-			if err == nil {
-				return val, true
-			}
+		val, err := ctx.Resolve(strVal)
+		if err != nil {
+			log.Errorf("Get iterate value failed, due to %s", err.Error())
+			return nil, false
 		}
+		return val, true
 	}
 
 	return value, true
@@ -269,7 +273,7 @@ func NewObjectIterator(data map[string]interface{}) *ObjectIterator {
 
 type ReflectIterator struct {
 	current int
-	val reflect.Value
+	val     reflect.Value
 }
 
 func (itx *ReflectIterator) Key() interface{} {
@@ -298,4 +302,4 @@ func (itx *ReflectIterator) next() bool {
 
 func NewReflectIterator(val reflect.Value) *ReflectIterator {
 	return &ReflectIterator{val: val, current: -1}
-}
+}