Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tools/src/main/java/org/projectnessie/cel/tools/Script.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ private <T> T evaluate(Class<T> resultType, Object arguments) throws ScriptExecu
"script returned unknown %s, but expected result type is %s",
result, resultType.getName()));
}
if (resultType == Val.class) {
return (T) result;
}

return result.convertToNative(resultType);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
import org.projectnessie.cel.ProgramOption;
import org.projectnessie.cel.checker.Decls;
import org.projectnessie.cel.common.types.IntT;
import org.projectnessie.cel.common.types.ListT;
import org.projectnessie.cel.common.types.MapT;
import org.projectnessie.cel.common.types.StringT;
import org.projectnessie.cel.common.types.ref.Val;
import org.projectnessie.cel.interpreter.functions.Overload;
import org.projectnessie.cel.toolstests.Dummy;

Expand Down Expand Up @@ -93,6 +96,33 @@ void function() throws Exception {
assertThat(result).isEqualTo("hello world");
}

@Test
void executeValReturnsCelNativeResult() throws Exception {
ScriptHost scriptHost = ScriptHost.newBuilder().build();

Script listScript = scriptHost.buildScript("[1, 2, 3]").build();
Val list = listScript.execute(Val.class, Collections.emptyMap());
assertThat(list).isInstanceOf(ListT.class);
assertThat((Object[]) list.value()).containsExactly(1L, 2L, 3L);

Script mapScript = scriptHost.buildScript("{\"a\": 1, \"b\": 2}").build();
Val map = mapScript.execute(Val.class, Collections.emptyMap());
assertThat(map).isInstanceOf(MapT.class);
Map<String, Long> expectedMap = new HashMap<>();
expectedMap.put("a", 1L);
expectedMap.put("b", 2L);
assertThat(map.value()).isEqualTo(expectedMap);
}

@Test
void executeObjectStillConvertsToNativeResult() throws Exception {
Script script = ScriptHost.newBuilder().build().buildScript("[1, 2, 3]").build();

Object result = script.execute(Object.class, Collections.emptyMap());

assertThat(result).isEqualTo(Arrays.asList(1L, 2L, 3L));
}

@Test
void execFail() throws Exception {
ScriptHost scriptHost = ScriptHost.newBuilder().build();
Expand Down
Loading