[Fix #1596] Update to latest schema (#1597)

Revert "[Fix #1596] Update to latest schema"

This reverts commit 0982f1d.

[Fix 1596] Schema updates

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

Author: fjtirado

api/src/main/java/io/serverlessworkflow/api/ValidationReader.java

@@ -15,6 +15,8 @@
  */
 package io.serverlessworkflow.api;
 
+import com.fasterxml.jackson.core.exc.StreamReadException;
+import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.Error;
 import com.networknt.schema.InputFormat;
@@ -65,12 +67,13 @@ public Workflow read(String input, WorkflowFormat format) throws IOException {
     return validate(format.mapper().readValue(input, JsonNode.class), format);
   }
 
-  private Workflow validate(JsonNode value, WorkflowFormat format) {
+  private Workflow validate(JsonNode value, WorkflowFormat format)
+      throws StreamReadException, DatabindException, IOException {
     Collection<Error> validationErrors = schemaObject.validate(value);
     if (!validationErrors.isEmpty()) {
       throw new IllegalArgumentException(
           validationErrors.stream().map(Error::toString).collect(Collectors.joining("\n")));
     }
-    return format.mapper().convertValue(value, Workflow.class);
+    return format.mapper().treeToValue(value, Workflow.class);
   }
 }

api/src/main/java/io/serverlessworkflow/api/WorkflowReader.java

@@ -216,12 +216,12 @@ private static class ValidationHolder {
   }
 
   /**
-   * Returns the default {@link WorkflowReaderOperations} instance (no validation).
+   * Returns the default {@link WorkflowReaderOperations} instance
    *
    * @return the default reader
    */
   private static WorkflowReaderOperations defaultReader() {
-    return NoValidationHolder.instance;
+    return ValidationHolder.instance;
   }
 
   private WorkflowReader() {}

fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/BaseTryTaskBuilder.java

@@ -178,7 +178,7 @@ public CatchErrorsBuilder title(final String title) {
     }
 
     public CatchErrorsBuilder details(final String details) {
-      this.errorFilter.setDetails(details);
+      this.errorFilter.setDetail(details);
       return this;
     }
 

fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ForEachTaskBuilder.java

@@ -17,6 +17,7 @@
 
 import io.serverlessworkflow.api.types.ForTask;
 import io.serverlessworkflow.api.types.ForTaskConfiguration;
+import io.serverlessworkflow.api.types.In;
 import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.fluent.spec.spi.ForEachTaskFluent;
 import java.util.List;
@@ -48,7 +49,7 @@ public ForEachTaskBuilder<T> each(String each) {
   }
 
   public ForEachTaskBuilder<T> in(String in) {
-    this.forTaskConfiguration.setIn(in);
+    this.forTaskConfiguration.setIn(new In().withForInExpression(in));
     return this;
   }
 

fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/TryCatchDslTest.java

@@ -329,7 +329,7 @@ void when_try_catch_match_details() {
     assertThat(tryTask).isNotNull();
     var cat = tryTask.getCatch();
     assertThat(cat).isNotNull();
-    assertThat(cat.getErrors().getWith().getDetails())
+    assertThat(cat.getErrors().getWith().getDetail())
         .isEqualTo("Enforcement Failure - invalid email");
   }
 

impl/core/src/main/java/io/serverlessworkflow/impl/executors/ForExecutor.java

@@ -16,6 +16,7 @@
 package io.serverlessworkflow.impl.executors;
 
 import io.serverlessworkflow.api.types.ForTask;
+import io.serverlessworkflow.api.types.In;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowDefinition;
@@ -50,9 +51,11 @@ protected Optional<WorkflowPredicate> buildWhileFilter() {
     }
 
     protected WorkflowValueResolver<Collection<?>> buildCollectionFilter() {
+      In in = task.getFor().getIn();
       return application
           .expressionFactory()
-          .resolveCollection(ExpressionDescriptor.from(task.getFor().getIn()));
+          .resolveCollection(
+              new ExpressionDescriptor(in.getForInExpression(), in.getForInInlineArray()));
     }
 
     @Override

impl/core/src/main/java/io/serverlessworkflow/impl/executors/TryExecutor.java

@@ -187,7 +187,7 @@ private CompletableFuture<WorkflowModel> handleException(
               taskContext,
               workflow.definition().application().modelFactory().fromAny(error))) {
         if (errorVariable != null) {
-          taskContext.variables().put(errorVariable, WorkflowErrorExpr.from(error));
+          taskContext.variables().put(errorVariable, error);
         }
         if (catchTaskExecutor.isPresent()) {
           completable =
@@ -213,14 +213,6 @@ private CompletableFuture<WorkflowModel> handleException(
     return CompletableFuture.failedFuture(e);
   }
 
-  private static record WorkflowErrorExpr(
-      String type, int status, String instance, String title, String details) {
-    static WorkflowErrorExpr from(WorkflowError error) {
-      return new WorkflowErrorExpr(
-          error.type(), error.status(), error.instance(), error.title(), error.detail());
-    }
-  }
-
   private static Optional<Predicate<WorkflowError>> buildErrorFilter(CatchErrors errors) {
     return errors != null
         ? Optional.of(error -> filterError(error, errors.getWith()))
@@ -232,7 +224,7 @@ private static boolean filterError(WorkflowError error, ErrorFilter errorFilter)
         && (errorFilter.getStatus() <= 0 || error.status() == errorFilter.getStatus())
         && compareString(errorFilter.getInstance(), error.instance())
         && compareString(errorFilter.getTitle(), error.title())
-        && compareString(errorFilter.getDetails(), error.detail());
+        && compareString(errorFilter.getDetail(), error.detail());
   }
 
   private static boolean compareString(String one, String other) {

impl/test/src/test/resources/workflows-samples/try-catch-error-variable.yaml

@@ -17,4 +17,4 @@ do:
         do:
           - handleError:
               set:
-                errorMessage: ${$caughtError.details}
+                errorMessage: ${$caughtError.detail}

impl/test/src/test/resources/workflows-samples/try-catch-match-details.yaml

@@ -17,7 +17,7 @@ do:
           with:
             type: https://example.com/errors/transient
             status: 503
-            details: Enforcement Failure - invalid email
+            detail: Enforcement Failure - invalid email
         do:
           - handleError:
               set:

impl/test/src/test/resources/workflows-samples/try-catch-not-match-details.yaml

@@ -17,4 +17,4 @@ do:
                 with:
                     type: https://example.com/errors/security
                     status: 403
-                    details: User not found in tenant catalog
+                    detail: User not found in tenant catalog