[Fix #636] Initial refactor to separate Jackson/JQ

Signed-off-by: fjtirado <[email protected]>

Author: fjtirado

impl/core/pom.xml

@@ -8,9 +8,9 @@
     <artifactId>serverlessworkflow-impl-core</artifactId>
     <name>Serverless Workflow :: Impl :: Core</name>
     <dependencies>
-        <dependency>
+     <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-api</artifactId>
+            <artifactId>serverlessworkflow-types</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -58,5 +58,11 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.serverlessworkflow</groupId>
+            <artifactId>serverlessworkflow-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
     </dependencies>
 </project>

impl/core/src/main/java/io/serverlessworkflow/impl/TaskContext.java

@@ -15,7 +15,6 @@
  */
 package io.serverlessworkflow.impl;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.impl.executors.TransitionInfo;
 import java.time.Instant;
@@ -25,22 +24,22 @@
 
 public class TaskContext {
 
-  private final JsonNode rawInput;
+  private final WorkflowModel rawInput;
   private final TaskBase task;
   private final WorkflowPosition position;
   private final Instant startedAt;
   private final String taskName;
   private final Map<String, Object> contextVariables;
   private final Optional<TaskContext> parentContext;
 
-  private JsonNode input;
-  private JsonNode output;
-  private JsonNode rawOutput;
+  private WorkflowModel input;
+  private WorkflowModel output;
+  private WorkflowModel rawOutput;
   private Instant completedAt;
   private TransitionInfo transition;
 
   public TaskContext(
-      JsonNode input,
+      WorkflowModel input,
       WorkflowPosition position,
       Optional<TaskContext> parentContext,
       String taskName,
@@ -49,15 +48,15 @@ public TaskContext(
   }
 
   private TaskContext(
-      JsonNode rawInput,
+      WorkflowModel rawInput,
       Optional<TaskContext> parentContext,
       String taskName,
       TaskBase task,
       WorkflowPosition position,
       Instant startedAt,
-      JsonNode input,
-      JsonNode output,
-      JsonNode rawOutput) {
+      WorkflowModel input,
+      WorkflowModel output,
+      WorkflowModel rawOutput) {
     this.rawInput = rawInput;
     this.parentContext = parentContext;
     this.taskName = taskName;
@@ -76,40 +75,40 @@ public TaskContext copy() {
         rawInput, parentContext, taskName, task, position, startedAt, input, output, rawOutput);
   }
 
-  public void input(JsonNode input) {
+  public void input(WorkflowModel input) {
     this.input = input;
     this.rawOutput = input;
     this.output = input;
   }
 
-  public JsonNode input() {
+  public WorkflowModel input() {
     return input;
   }
 
-  public JsonNode rawInput() {
+  public WorkflowModel rawInput() {
     return rawInput;
   }
 
   public TaskBase task() {
     return task;
   }
 
-  public TaskContext rawOutput(JsonNode output) {
+  public TaskContext rawOutput(WorkflowModel output) {
     this.rawOutput = output;
     this.output = output;
     return this;
   }
 
-  public JsonNode rawOutput() {
+  public WorkflowModel rawOutput() {
     return rawOutput;
   }
 
-  public TaskContext output(JsonNode output) {
+  public TaskContext output(WorkflowModel output) {
     this.output = output;
     return this;
   }
 
-  public JsonNode output() {
+  public WorkflowModel output() {
     return output;
   }
 

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

@@ -202,6 +202,10 @@ public WorkflowPositionFactory positionFactory() {
     return positionFactory;
   }
 
+  public WorkflowModelFactory modelFactory() {
+    return exprFactory.modelFactory();
+  }
+
   public RuntimeDescriptorFactory runtimeDescriptorFactory() {
     return runtimeDescriptorFactory;
   }

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowContext.java

@@ -15,12 +15,10 @@
  */
 package io.serverlessworkflow.impl;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 public class WorkflowContext {
   private final WorkflowDefinition definition;
   private final WorkflowInstance instance;
-  private JsonNode context;
+  private WorkflowModel context;
 
   WorkflowContext(WorkflowDefinition definition, WorkflowInstance instance) {
     this.definition = definition;
@@ -31,11 +29,11 @@ public WorkflowInstance instance() {
     return instance;
   }
 
-  public JsonNode context() {
+  public WorkflowModel context() {
     return context;
   }
 
-  public void context(JsonNode context) {
+  public void context(WorkflowModel context) {
     this.context = context;
   }
 

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java

@@ -22,7 +22,6 @@
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.executors.TaskExecutor;
 import io.serverlessworkflow.impl.executors.TaskExecutorHelper;
-import io.serverlessworkflow.impl.json.JsonUtils;
 import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import java.nio.file.Path;
@@ -47,13 +46,13 @@ private WorkflowDefinition(
       Input input = workflow.getInput();
       this.inputSchemaValidator =
           getSchemaValidator(application.validatorFactory(), resourceLoader, input.getSchema());
-      this.inputFilter = buildWorkflowFilter(application.expressionFactory(), input.getFrom());
+      this.inputFilter = buildWorkflowFilter(application, input.getFrom());
     }
     if (workflow.getOutput() != null) {
       Output output = workflow.getOutput();
       this.outputSchemaValidator =
           getSchemaValidator(application.validatorFactory(), resourceLoader, output.getSchema());
-      this.outputFilter = buildWorkflowFilter(application.expressionFactory(), output.getAs());
+      this.outputFilter = buildWorkflowFilter(application, output.getAs());
     }
     this.taskExecutor =
         TaskExecutorHelper.createExecutorList(
@@ -74,7 +73,7 @@ static WorkflowDefinition of(WorkflowApplication application, Workflow workflow,
   }
 
   public WorkflowInstance instance(Object input) {
-    return new WorkflowInstance(this, JsonUtils.fromValue(input));
+    return new WorkflowInstance(this, application.modelFactory().fromAny(input));
   }
 
   Optional<SchemaValidator> inputSchemaValidator() {

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowFilter.java

@@ -15,9 +15,7 @@
  */
 package io.serverlessworkflow.impl;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 @FunctionalInterface
 public interface WorkflowFilter {
-  JsonNode apply(WorkflowContext workflow, TaskContext task, JsonNode node);
+  WorkflowModel apply(WorkflowContext workflow, TaskContext task, WorkflowModel node);
 }

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowInstance.java

@@ -15,9 +15,7 @@
  */
 package io.serverlessworkflow.impl;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.serverlessworkflow.impl.executors.TaskExecutorHelper;
-import io.serverlessworkflow.impl.json.JsonUtils;
 import java.time.Instant;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -26,24 +24,24 @@
 public class WorkflowInstance {
   private final AtomicReference<WorkflowStatus> status;
   private final String id;
-  private final JsonNode input;
+  private final WorkflowModel input;
 
   private WorkflowContext workflowContext;
   private WorkflowDefinition definition;
   private Instant startedAt;
   private Instant completedAt;
-  private volatile JsonNode output;
-  private CompletableFuture<JsonNode> completableFuture;
+  private volatile WorkflowModel output;
+  private CompletableFuture<WorkflowModel> completableFuture;
 
-  WorkflowInstance(WorkflowDefinition definition, JsonNode input) {
+  WorkflowInstance(WorkflowDefinition definition, WorkflowModel input) {
     this.id = definition.application().idFactory().get();
     this.input = input;
     this.definition = definition;
     this.status = new AtomicReference<>(WorkflowStatus.PENDING);
     definition.inputSchemaValidator().ifPresent(v -> v.validate(input));
   }
 
-  public CompletableFuture<JsonNode> start() {
+  public CompletableFuture<WorkflowModel> start() {
     this.startedAt = Instant.now();
     this.workflowContext = new WorkflowContext(definition, this);
     this.status.set(WorkflowStatus.RUNNING);
@@ -60,7 +58,7 @@ public CompletableFuture<JsonNode> start() {
     return completableFuture;
   }
 
-  private JsonNode whenCompleted(JsonNode node) {
+  private WorkflowModel whenCompleted(WorkflowModel node) {
     output =
         workflowContext
             .definition()
@@ -85,7 +83,7 @@ public Instant completedAt() {
     return completedAt;
   }
 
-  public JsonNode input() {
+  public WorkflowModel input() {
     return input;
   }
 
@@ -97,11 +95,16 @@ public void status(WorkflowStatus state) {
     this.status.set(state);
   }
 
-  public Object output() {
-    return JsonUtils.toJavaValue(outputAsJsonNode());
+  public WorkflowModel output() {
+    return output;
   }
 
-  public JsonNode outputAsJsonNode() {
-    return output;
+  public <T> T outputAs(Class<T> clazz) {
+    return output
+        .as(clazz)
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Output " + output + " cannot be converted to class " + clazz));
   }
 }

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowModel.java

@@ -0,0 +1,50 @@
+/*
+ * 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.cloudevents.CloudEventData;
+import java.time.OffsetDateTime;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+
+public interface WorkflowModel {
+
+  void forEach(BiConsumer<String, WorkflowModel> consumer);
+
+  Optional<Boolean> asBoolean();
+
+  Collection<WorkflowModel> asCollection();
+
+  Optional<String> asText();
+
+  Optional<OffsetDateTime> asDate();
+
+  Optional<Number> asNumber();
+
+  Optional<CloudEventData> asCloudEventData();
+
+  Optional<Map<String, Object>> asMap();
+
+  Object asJavaObject();
+
+  Object asIs();
+
+  Class<?> objectClass();
+
+  <T> Optional<T> as(Class<T> clazz);
+}