[Fix #782] More changes after testing

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

Author: fjtirado

impl/README.md

@@ -62,7 +62,6 @@ public CompletableFuture<WorkflowModel> start() {
     return startExecution(
         () -> {
           startedAt = Instant.now();
-          status.set(WorkflowStatus.RUNNING);
           publishEvent(
               workflowContext, l -> l.onWorkflowStarted(new WorkflowStartedEvent(workflowContext)));
         });
@@ -73,6 +72,7 @@ protected final CompletableFuture<WorkflowModel> startExecution(Runnable runnabl
     if (future != null) {
       return future;
     }
+    status.set(WorkflowStatus.RUNNING);
     runnable.run();
     future =
         TaskExecutorHelper.processTaskList(

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

@@ -144,10 +144,12 @@ public static String toString(UriTemplate template) {
   }
 
   public static void safeClose(AutoCloseable closeable) {
-    try {
-      closeable.close();
-    } catch (Exception ex) {
-      logger.warn("Error closing resource {}", closeable.getClass().getName(), ex);
+    if (closeable != null) {
+      try {
+        closeable.close();
+      } catch (Exception ex) {
+        logger.warn("Error closing resource {}", closeable.getClass().getName(), ex);
+      }
     }
   }
 }

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

@@ -194,10 +194,11 @@ public CompletableFuture<TaskContext> apply(
     TaskContext taskContext = new TaskContext(input, position, parentContext, taskName, task);
     workflowContext.instance().restoreContext(workflowContext, taskContext);
     CompletableFuture<TaskContext> completable = CompletableFuture.completedFuture(taskContext);
-    if (taskContext.isCompleted() && !TaskExecutorHelper.isActive(workflowContext)) {
+    if (!TaskExecutorHelper.isActive(workflowContext)) {
       return completable;
-    }
-    if (ifFilter.map(f -> f.test(workflowContext, taskContext, input)).orElse(true)) {
+    } else if (taskContext.isCompleted()) {
+      return executeNext(completable, workflowContext);
+    } else if (ifFilter.map(f -> f.test(workflowContext, taskContext, input)).orElse(true)) {
       return executeNext(
           completable
               .thenCompose(workflowContext.instance()::suspendedCheck)

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

@@ -0,0 +1,13 @@
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/serverlessworkflow/sdk-java)
+
+# Serverless Workflow Specification — Java SDK (Reference Implementation)- Persistence
+
+Workflow persistence aim is to be able to restore workflow instances execution in the event of a JVM stop. To do that, progress of every running instance is persisted into the underlying DB by using life cycle events. Later on, when a new JVM is instantiated, the application is expected to manually start those instances that are not longer being executed by any other JVM, using the information previously stored. 
+
+Currently, persistence structure has been layout for key-value store dbs, plus one concrete implementation using [H2 MVStore](mvstore/README.md). Next step will do the same for relational dbs (table layout plus concrete implementation using Postgresql). 
+
+Map of key values has been given precedence because, when persisting the status of a running workflow instance, the number of writes are usually large, while read only operations are only performed when the JVM starts up. This give a performance edge for this kind of db over relational ones.
+
+---
+
+*Questions or ideas? PRs and issues welcome!*

impl/persistence/README.md

@@ -24,14 +24,19 @@ public class DefaultBufferFactory implements WorkflowBufferFactory {
 
   private final Collection<CustomObjectMarshaller> marshallers;
 
+  private static class DefaultBufferFactoryHolder {
+    private static DefaultBufferFactory instance =
+        new DefaultBufferFactory(
+            ServiceLoader.load(CustomObjectMarshaller.class).stream()
+                .map(ServiceLoader.Provider::get)
+                .toList());
+  }
+
   public static DefaultBufferFactory factory() {
-    return new DefaultBufferFactory(
-        ServiceLoader.load(CustomObjectMarshaller.class).stream()
-            .map(ServiceLoader.Provider::get)
-            .toList());
+    return DefaultBufferFactoryHolder.instance;
   }
 
-  public DefaultBufferFactory(Collection<CustomObjectMarshaller> marshallers) {
+  protected DefaultBufferFactory(Collection<CustomObjectMarshaller> marshallers) {
     this.marshallers = marshallers;
   }