feat: update interfaces for cesql runtime and context

Signed-off-by: Calum Murray <cmurray@redhat.com>
cloudevents · pierDipi · Jun 21, 2024 · Jun 19, 2024 · Jun 19, 2024 · Jun 19, 2024
commit 588648110fb719b0b79d8731c8f95330acbd635f
diff --git a/sql/src/main/java/io/cloudevents/sql/EvaluationContext.java b/sql/src/main/java/io/cloudevents/sql/EvaluationContext.java
@@ -18,19 +18,5 @@ public interface EvaluationContext {
      */
     String expressionText();
 
-    /**
-     * Append a new exception to the evaluation context.
-     * This exception will be propagated back in the evaluation result.
-     *
-     * @param exception exception to append
-     */
-    void appendException(EvaluationException exception);
-
-    /**
-     * Append a new exception to the evaluation context.
-     * This exception will be propagated back in the evaluation result.
-     *
-     * @param exceptionFactory exception factory, which will automatically include expression interval and text
-     */
-    void appendException(EvaluationException.EvaluationExceptionFactory exceptionFactory);
+    ExceptionFactory exceptionFactory();
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/EvaluationException.java b/sql/src/main/java/io/cloudevents/sql/EvaluationException.java
@@ -20,23 +20,27 @@ public enum ErrorKind {
         /**
          * An implicit or an explicit casting failed.
          */
-        INVALID_CAST,
+        CAST,
         /**
          * An event attribute was addressed, but missing.
          */
         MISSING_ATTRIBUTE,
         /**
          * Error happened while dispatching a function invocation. Reasons may be invalid function name or invalid arguments number.
          */
-        FUNCTION_DISPATCH,
+        MISSING_FUNCTION,
         /**
          * Error happened while executing a function. This usually contains a non null cause.
          */
-        FUNCTION_EXECUTION,
+        FUNCTION_EVALUATION,
         /**
          * Error happened while executing a math operation. Reason may be a division by zero.
          */
-        MATH
+        MATH,
+        /**
+         * Any error that does not fall into the other error kinds
+         */
+        GENERIC,
     }
 
     private final ErrorKind errorKind;

diff --git a/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java b/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java
@@ -7,35 +7,6 @@
  * The evaluation runtime takes care of the function resolution, casting and other core functionalities to execute an expression.
  */
 public interface EvaluationRuntime {
-
-    /**
-     * Check if the cast can be executed from {@code value} to the {@code target} type.
-     *
-     * @param value  the value to cast
-     * @param target the type cast target
-     * @return false if the cast trigger an error, true otherwise.
-     */
-    boolean canCast(Object value, Type target);
-
-    /**
-     * Return the {@code value} casted to the {@code target} type.
-     *
-     * @param ctx    the evaluation context
-     * @param value  the value to cast
-     * @param target the type cast target
-     * @return the casted value, if the cast succeeds, otherwise the default value of the target type
-     */
-    Object cast(EvaluationContext ctx, Object value, Type target);
-
-    /**
-     * Return the {@code value} casted to the {@code target} type. If fails, this is going to throw an exception without the evaluation context.
-     *
-     * @param value  the value to cast
-     * @param target the type cast target
-     * @return the casted value, if the cast succeeds, otherwise the default value of the target type
-     */
-    Object cast(Object value, Type target) throws EvaluationException;
-
     /**
      * Resolve a {@link Function} starting from its name and the concrete number of arguments.
      *

diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternal.java b/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternal.java
@@ -2,6 +2,8 @@
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
+import io.cloudevents.sql.ExceptionFactory;
+import io.cloudevents.sql.impl.runtime.EvaluationResult;
 import org.antlr.v4.runtime.misc.Interval;
 
 public interface ExpressionInternal {
@@ -10,7 +12,7 @@ public interface ExpressionInternal {
 
     String expressionText();
 
-    Object evaluate(EvaluationRuntime runtime, CloudEvent event, ExceptionThrower thrower);
+    EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, ExceptionFactory exceptionFactory);
 
     <T> T visit(ExpressionInternalVisitor<T> visitor);