java functions can work but with caveats #1558

Author: ptrthomas

karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java

@@ -1209,8 +1209,12 @@ private Object recurseAndDetachAndDeepClone(String name, Object o, Set<Object> s
         if (o instanceof Value) {
             Value value = (Value) o;
             try {
-                if (value.canExecute() && value.isMetaObject()) { // js function
-                    return new JsFunction(value);
+                if (value.canExecute()) { 
+                    if (value.isMetaObject()) { // js function
+                        return new JsFunction(value);
+                    } else { // java function                        
+                        return new JsExecutable(value);
+                    }
                 } else {
                     return value;
                 }

karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java

@@ -268,7 +268,7 @@ private Map<String, Object> initMagicVariables() {
         }
         if (scenario.isOutlineExample() && !this.isDynamicBackground()) { // init examples row magic variables
             Map<String, Object> exampleData = scenario.getExampleData();
-            exampleData.forEach((k, v) -> map.put(k, v));
+            map.putAll(exampleData);
             map.put("__row", exampleData);
             map.put("__num", scenario.getExampleIndex());
         }

karate-core/src/main/java/com/intuit/karate/graal/JsExecutable.java

@@ -42,12 +42,14 @@ public JsExecutable(Value value) {
         this.value = value;
     }
 
+    private static final Object LOCK = new Object();
+    
     @Override
     public Object execute(Value... arguments) {
-        if (logger.isTraceEnabled()) {
-            logger.trace("begin execute: {}", value);
+        synchronized (LOCK) {
+            logger.warn("[*** execute ***] global lock on java function possibly from callonce / callSingle: {}", value);
+            return value.execute(arguments);
         }
-        return value.execute(arguments);
     }
 
 }

karate-core/src/test/java/com/intuit/karate/core/parallel/parallel.feature

@@ -15,10 +15,10 @@ Scenario: one
 * match response == { one: '#string' }
 * def result = karate.callSingle('call-single-from-feature.feature')
 * match result.response == { message: 'from feature' }
-# use java class instance from callSingle in config
+
 * match HelloConfigSingle.sayHello('world') == 'hello world'
-# use java method instance from callSingle in config
-# * match sayHello('world') == 'hello world'
+* match HelloOnce.sayHello('world') == 'hello world'
+* match sayHello('world') == 'hello world'
 
 Scenario: two
 * path 'two'
@@ -28,10 +28,18 @@ Scenario: two
 * def result = karate.callSingle('call-single-from-feature.feature')
 * match result.response == { message: 'from feature' }
 
+* match HelloConfigSingle.sayHello('world') == 'hello world'
+* match HelloOnce.sayHello('world') == 'hello world'
+* match sayHello('world') == 'hello world'
+
 Scenario: three
 * path 'three'
 * method get
 * status 200
 * match response == { three: '#string' }
 * def result = karate.callSingle('call-single-from-feature.feature')
-* match result.response == { message: 'from feature' }
+* match result.response == { message: 'from feature' }
+
+* match HelloConfigSingle.sayHello('world') == 'hello world'
+* match HelloOnce.sayHello('world') == 'hello world'
+* match sayHello('world') == 'hello world'