Merge branch 'main' into issue-477

Author: fjtirado

Diff for: api/src/main/resources/schema/workflow.yaml

@@ -777,19 +777,22 @@ $defs:
           errors:
             type: object
             title: CatchErrors
-            description: The configuration of a concept used to catch errors.
+            properties:
+              with:
+                $ref: '#/$defs/errorFilter'
+            description: static error filter
           as:
             type: string
             title: CatchAs
             description: The name of the runtime expression variable to save the error as. Defaults to 'error'.
           when:
             type: string
             title: CatchWhen
-            description: A runtime expression used to determine whether or not to catch the filtered error.
+            description: A runtime expression used to determine whether to catch the filtered error.
           exceptWhen:
             type: string
             title: CatchExceptWhen
-            description: A runtime expression used to determine whether or not to catch the filtered error.
+            description: A runtime expression used to determine whether not to catch the filtered error.
           retry:
             oneOf:
               - $ref: '#/$defs/retryPolicy'
@@ -1152,6 +1155,27 @@ $defs:
         title: ErrorDetails
         description: A human-readable explanation specific to this occurrence of the error.
     required: [ type, status ]
+  errorFilter:
+    type: object
+    title: ErrorFilter
+    description: Error filtering base on static values. For error filtering on dynamic values, use catch.when property
+    minProperties: 1
+    properties:
+      type:
+        type: string
+        description: if present, means this value should be used for filtering
+      status: 
+        type: integer
+        description: if present, means this value should be used for filtering
+      instance:
+        type: string
+        description: if present, means this value should be used for filtering
+      title: 
+        type: string
+        description: if present, means this value should be used for filtering
+      details:
+        type: string
+        description: if present, means this value should be used for filtering
   uriTemplate:
     title: UriTemplate
     anyOf:

Diff for: impl/core/pom.xml

@@ -8,13 +8,19 @@
   <artifactId>serverlessworkflow-impl-core</artifactId>
   <properties>
       <version.net.thisptr>1.1.0</version.net.thisptr>
+      <version.com.github.f4b6a3>5.2.3</version.com.github.f4b6a3>
   </properties>
   <dependencies>
     <dependency>
       <groupId>io.serverlessworkflow</groupId>
       <artifactId>serverlessworkflow-api</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.f4b6a3</groupId>
+      <artifactId>ulid-creator</artifactId>
+      <version>${version.com.github.f4b6a3}</version>
+    </dependency>
     <dependency>
      <groupId>com.networknt</groupId>
      <artifactId>json-schema-validator</artifactId>
@@ -44,5 +50,10 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/ExecutorServiceFactory.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+@FunctionalInterface
+public interface ExecutorServiceFactory extends Supplier<ExecutorService> {}

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/LongFilter.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import java.util.function.BiFunction;
+
+@FunctionalInterface
+public interface LongFilter extends BiFunction<WorkflowContext, TaskContext<?>, Long> {}

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/QueueWorkflowPosition.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.stream.Collectors;
+
+public class QueueWorkflowPosition implements WorkflowPosition {
+
+  private Deque<Object> queue;
+
+  QueueWorkflowPosition() {
+    this(new ArrayDeque<>());
+  }
+
+  private QueueWorkflowPosition(Deque<Object> list) {
+    this.queue = list;
+  }
+
+  public QueueWorkflowPosition copy() {
+    return new QueueWorkflowPosition(new ArrayDeque<>(this.queue));
+  }
+
+  @Override
+  public WorkflowPosition addIndex(int index) {
+    queue.add(index);
+    return this;
+  }
+
+  @Override
+  public WorkflowPosition addProperty(String prop) {
+    queue.add(prop);
+    return this;
+  }
+
+  @Override
+  public String jsonPointer() {
+    return queue.stream().map(Object::toString).collect(Collectors.joining("/"));
+  }
+
+  @Override
+  public String toString() {
+    return "QueueWorkflowPosition [queue=" + queue + "]";
+  }
+
+  @Override
+  public WorkflowPosition back() {
+    queue.removeLast();
+    return this;
+  }
+
+  @Override
+  public Object last() {
+    return queue.getLast();
+  }
+}

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/RuntimeDescriptorFactory.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import io.serverlessworkflow.impl.expressions.RuntimeDescriptor;
+import java.util.function.Supplier;
+
+@FunctionalInterface
+public interface RuntimeDescriptorFactory extends Supplier<RuntimeDescriptor> {}

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/DefaultWorkflowPosition.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/StringBufferWorkflowPosition.java

@@ -15,9 +15,21 @@
  */
 package io.serverlessworkflow.impl;
 
-public class DefaultWorkflowPosition implements WorkflowPosition {
+public class StringBufferWorkflowPosition implements WorkflowPosition {
 
-  private StringBuilder sb = new StringBuilder("");
+  private StringBuilder sb;
+
+  StringBufferWorkflowPosition() {
+    this("");
+  }
+
+  private StringBufferWorkflowPosition(String str) {
+    this.sb = new StringBuilder(str);
+  }
+
+  public StringBufferWorkflowPosition copy() {
+    return new StringBufferWorkflowPosition(this.jsonPointer());
+  }
 
   @Override
   public WorkflowPosition addIndex(int index) {
@@ -38,7 +50,7 @@ public String jsonPointer() {
 
   @Override
   public String toString() {
-    return "DefaultWorkflowPosition [sb=" + sb + "]";
+    return "StringBufferWorkflowPosition [sb=" + sb + "]";
   }
 
   @Override
@@ -49,4 +61,10 @@ public WorkflowPosition back() {
     }
     return this;
   }
+
+  @Override
+  public Object last() {
+    int indexOf = sb.lastIndexOf("/");
+    return indexOf != -1 ? jsonPointer().substring(indexOf + 1) : "";
+  }
 }

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/StringFilter.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import java.util.function.BiFunction;
+
+@FunctionalInterface
+public interface StringFilter extends BiFunction<WorkflowContext, TaskContext<?>, String> {}

Diff for: impl/core/src/main/java/io/serverlessworkflow/impl/TaskContext.java

@@ -19,28 +19,79 @@
 import io.serverlessworkflow.api.types.FlowDirective;
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
 import io.serverlessworkflow.api.types.TaskBase;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
 
 public class TaskContext<T extends TaskBase> {
 
   private final JsonNode rawInput;
   private final T task;
+  private final WorkflowPosition position;
+  private final Instant startedAt;
 
   private JsonNode input;
   private JsonNode output;
   private JsonNode rawOutput;
   private FlowDirective flowDirective;
+  private Map<String, Object> contextVariables;
+  private Instant completedAt;
 
-  public TaskContext(JsonNode rawInput, T task) {
+  public TaskContext(JsonNode input, WorkflowPosition position) {
+    this(input, null, position, Instant.now(), input, input, input, null, new HashMap<>());
+  }
+
+  public TaskContext(JsonNode input, TaskContext<?> taskContext, T task) {
+    this(
+        input,
+        task,
+        taskContext.position,
+        Instant.now(),
+        input,
+        input,
+        input,
+        task.getThen(),
+        new HashMap<>(taskContext.variables()));
+  }
+
+  private TaskContext(
+      JsonNode rawInput,
+      T task,
+      WorkflowPosition position,
+      Instant startedAt,
+      JsonNode input,
+      JsonNode output,
+      JsonNode rawOutput,
+      FlowDirective flowDirective,
+      Map<String, Object> contextVariables) {
     this.rawInput = rawInput;
-    this.input = rawInput;
-    this.rawOutput = rawInput;
-    this.output = rawInput;
     this.task = task;
-    this.flowDirective = task.getThen();
+    this.position = position;
+    this.startedAt = startedAt;
+    this.input = input;
+    this.output = output;
+    this.rawOutput = rawOutput;
+    this.flowDirective = flowDirective;
+    this.contextVariables = contextVariables;
+  }
+
+  public TaskContext<T> copy() {
+    return new TaskContext<T>(
+        rawInput,
+        task,
+        position.copy(),
+        startedAt,
+        input,
+        output,
+        rawOutput,
+        flowDirective,
+        new HashMap<>(contextVariables));
   }
 
   public void input(JsonNode input) {
     this.input = input;
+    this.rawOutput = input;
+    this.output = input;
   }
 
   public JsonNode input() {
@@ -81,4 +132,24 @@ public FlowDirective flowDirective() {
         ? new FlowDirective().withFlowDirectiveEnum(FlowDirectiveEnum.CONTINUE)
         : flowDirective;
   }
+
+  public Map<String, Object> variables() {
+    return contextVariables;
+  }
+
+  public WorkflowPosition position() {
+    return position;
+  }
+
+  public Instant startedAt() {
+    return startedAt;
+  }
+
+  public void completedAt(Instant instant) {
+    this.completedAt = instant;
+  }
+
+  public Instant completedAt() {
+    return completedAt;
+  }
 }