[Fix #636] Relocating dependencies

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

Author: fjtirado

examples/events/pom.xml

@@ -11,7 +11,7 @@
     <dependencies>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-core</artifactId>
+            <artifactId>serverlessworkflow-impl-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

examples/pom.xml

@@ -21,6 +21,11 @@
                 <artifactId>serverlessworkflow-impl-http</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.serverlessworkflow</groupId>
+                <artifactId>serverlessworkflow-impl-jackson</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>

examples/simpleGet/pom.xml

@@ -11,7 +11,7 @@
     <dependencies>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-core</artifactId>
+            <artifactId>serverlessworkflow-impl-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>

impl/core/pom.xml

@@ -8,31 +8,23 @@
     <artifactId>serverlessworkflow-impl-core</artifactId>
     <name>Serverless Workflow :: Impl :: Core</name>
     <dependencies>
-     <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-types</artifactId>
-            <version>${project.version}</version>
+         <dependency>
+           <groupId>io.serverlessworkflow</groupId>
+           <artifactId>serverlessworkflow-types</artifactId>
+           <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.cloudevents</groupId>
-            <artifactId>cloudevents-api</artifactId>
+            <artifactId>cloudevents-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.cloudevents</groupId>
-            <artifactId>cloudevents-json-jackson</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.f4b6a3</groupId>
             <artifactId>ulid-creator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>json-schema-validator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.thisptr</groupId>
-            <artifactId>jackson-jq</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -58,11 +50,5 @@
             <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/WorkflowApplication.java

@@ -17,23 +17,25 @@
 
 import com.github.f4b6a3.ulid.UlidCreator;
 import io.serverlessworkflow.api.types.Document;
+import io.serverlessworkflow.api.types.SchemaInline;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.events.EventConsumer;
 import io.serverlessworkflow.impl.events.EventPublisher;
 import io.serverlessworkflow.impl.events.InMemoryEvents;
 import io.serverlessworkflow.impl.executors.DefaultTaskExecutorFactory;
 import io.serverlessworkflow.impl.executors.TaskExecutorFactory;
 import io.serverlessworkflow.impl.expressions.ExpressionFactory;
-import io.serverlessworkflow.impl.expressions.JQExpressionFactory;
 import io.serverlessworkflow.impl.expressions.RuntimeDescriptor;
-import io.serverlessworkflow.impl.jsonschema.DefaultSchemaValidatorFactory;
-import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory;
 import io.serverlessworkflow.impl.resources.DefaultResourceLoaderFactory;
 import io.serverlessworkflow.impl.resources.ResourceLoaderFactory;
+import io.serverlessworkflow.impl.resources.StaticResource;
+import io.serverlessworkflow.impl.schema.SchemaValidator;
+import io.serverlessworkflow.impl.schema.SchemaValidatorFactory;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -101,11 +103,31 @@ public WorkflowIdFactory idFactory() {
   }
 
   public static class Builder {
+    private static final SchemaValidatorFactory EMPTY_SCHEMA_VALIDATOR =
+        new SchemaValidatorFactory() {
+
+          private final SchemaValidator NoValidation =
+              new SchemaValidator() {
+                @Override
+                public void validate(WorkflowModel node) {}
+              };
+
+          @Override
+          public SchemaValidator getValidator(StaticResource resource) {
+
+            return NoValidation;
+          }
+
+          @Override
+          public SchemaValidator getValidator(SchemaInline inline) {
+            return NoValidation;
+          }
+        };
     private TaskExecutorFactory taskFactory = DefaultTaskExecutorFactory.get();
-    private ExpressionFactory exprFactory = JQExpressionFactory.get();
+    private ExpressionFactory exprFactory;
     private Collection<WorkflowExecutionListener> listeners;
     private ResourceLoaderFactory resourceLoaderFactory = DefaultResourceLoaderFactory.get();
-    private SchemaValidatorFactory schemaValidatorFactory = DefaultSchemaValidatorFactory.get();
+    private SchemaValidatorFactory schemaValidatorFactory;
     private WorkflowPositionFactory positionFactory = () -> new QueueWorkflowPosition();
     private WorkflowIdFactory idFactory = () -> UlidCreator.getMonotonicUlid().toString();
     private ExecutorServiceFactory executorFactory = () -> Executors.newCachedThreadPool();
@@ -175,6 +197,18 @@ public Builder withEventPublisher(EventPublisher eventPublisher) {
     }
 
     public WorkflowApplication build() {
+      if (exprFactory == null) {
+        exprFactory =
+            ServiceLoader.load(ExpressionFactory.class)
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Expression factory is required"));
+      }
+      if (schemaValidatorFactory == null) {
+        schemaValidatorFactory =
+            ServiceLoader.load(SchemaValidatorFactory.class)
+                .findFirst()
+                .orElse(EMPTY_SCHEMA_VALIDATOR);
+      }
       return new WorkflowApplication(this);
     }
   }

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

@@ -22,8 +22,8 @@
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.executors.TaskExecutor;
 import io.serverlessworkflow.impl.executors.TaskExecutorHelper;
-import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
+import io.serverlessworkflow.impl.schema.SchemaValidator;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;

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

@@ -21,9 +21,9 @@
 import io.serverlessworkflow.api.types.SchemaUnion;
 import io.serverlessworkflow.api.types.UriTemplate;
 import io.serverlessworkflow.impl.expressions.ExpressionUtils;
-import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
-import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
+import io.serverlessworkflow.impl.schema.SchemaValidator;
+import io.serverlessworkflow.impl.schema.SchemaValidatorFactory;
 import java.net.URI;
 import java.util.Optional;
 import java.util.function.Function;

impl/core/src/main/java/io/serverlessworkflow/impl/events/CloudEventUtils.java

@@ -15,15 +15,7 @@
  */
 package io.serverlessworkflow.impl.events;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.CloudEventData;
-import io.cloudevents.jackson.JsonCloudEventData;
-import io.serverlessworkflow.impl.json.JsonUtils;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.Date;
@@ -32,57 +24,17 @@
 
 public class CloudEventUtils {
 
-  public static JsonNode toJsonNode(CloudEvent event) {
-    ObjectNode result = JsonUtils.mapper().createObjectNode();
-    if (event.getData() != null) {
-      result.set("data", toJsonNode(event.getData()));
-    }
-    if (event.getSubject() != null) {
-      result.put("subject", event.getSubject());
-    }
-    if (event.getDataContentType() != null) {
-      result.put("datacontenttype", event.getDataContentType());
-    }
-    result.put("id", event.getId());
-    result.put("source", event.getSource().toString());
-    result.put("type", event.getType());
-    result.put("specversion", event.getSpecVersion().toString());
-    if (event.getDataSchema() != null) {
-      result.put("dataschema", event.getDataSchema().toString());
-    }
-    if (event.getTime() != null) {
-      result.put("time", event.getTime().toString());
-    }
-    event
-        .getExtensionNames()
-        .forEach(n -> result.set(n, JsonUtils.fromValue(event.getExtension(n))));
-    return result;
-  }
+  private CloudEventUtils() {}
 
   public static OffsetDateTime toOffset(Date date) {
     return date.toInstant().atOffset(ZoneOffset.UTC);
   }
 
-  public static JsonNode toJsonNode(CloudEventData data) {
-    if (data == null) {
-      return NullNode.instance;
-    }
-    try {
-      return data instanceof JsonCloudEventData
-          ? ((JsonCloudEventData) data).getNode()
-          : JsonUtils.mapper().readTree(data.toBytes());
-    } catch (IOException io) {
-      throw new UncheckedIOException(io);
-    }
-  }
-
   public static Map<String, Object> extensions(CloudEvent event) {
     Map<String, Object> result = new LinkedHashMap<>();
     for (String name : event.getExtensionNames()) {
       result.put(name, event.getExtension(name));
     }
     return result;
   }
-
-  private CloudEventUtils() {}
 }

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

@@ -30,8 +30,8 @@
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowPosition;
 import io.serverlessworkflow.impl.WorkflowStatus;
-import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
+import io.serverlessworkflow.impl.schema.SchemaValidator;
 import java.time.Instant;
 import java.util.Iterator;
 import java.util.Map;

impl/core/src/main/java/io/serverlessworkflow/impl/expressions/DateTimeDescriptor.java

@@ -15,7 +15,6 @@
  */
 package io.serverlessworkflow.impl.expressions;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.Instant;
 
 public class DateTimeDescriptor {
@@ -30,13 +29,11 @@ private DateTimeDescriptor(Instant instant) {
     this.instant = instant;
   }
 
-  @JsonProperty("iso8601")
-  public String iso8601() {
+  public String getIso8601() {
     return instant.toString();
   }
 
-  @JsonProperty("epoch")
-  public Epoch epoch() {
+  public Epoch getEpoch() {
     return Epoch.of(instant);
   }