[Fix #1738] Replace setMetadata by fine grain manipulation.

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

@@ -53,7 +53,7 @@ public class WorkflowMutableInstance implements WorkflowInstance {
   protected AtomicReference<CompletableFuture<WorkflowModel>> futureRef = new AtomicReference<>();
   protected Instant completedAt;
 
-  private Map<String, Object> additionalObjects = new ConcurrentHashMap<>();
+  protected Map<String, Object> additionalObjects = new ConcurrentHashMap<>();
 
   protected final Map<String, Integer> iterationsMap = new ConcurrentHashMap<>();
 
@@ -448,10 +448,6 @@ public void addCancelable(CompletableFuture<?> cancelable) {
     }
   }
 
-  protected void setMetadata(Map<String, Object> metadata) {
-    this.additionalObjects = new ConcurrentHashMap<>(metadata);
-  }
-
   @Override
   public <T> T addMetadataIfAbsent(String key, Supplier<T> supplier) {
     return (T) additionalObjects.computeIfAbsent(key, k -> supplier.get());

impl/persistence/api/src/main/java/io/serverlessworkflow/impl/persistence/PersistenceTaskInfo.java

@@ -15,4 +15,9 @@
  */
 package io.serverlessworkflow.impl.persistence;
 
-public interface PersistenceTaskInfo {}
+import java.util.Map;
+
+public interface PersistenceTaskInfo {
+
+  Map<String, Object> additionalObjects();
+}

impl/persistence/api/src/main/java/io/serverlessworkflow/impl/persistence/RetriedTaskInfo.java

@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-public record RetriedTaskInfo(int retryAttempt, Map<String, Object> metadata)
+public record RetriedTaskInfo(int retryAttempt, Map<String, Object> additionalObjects)
     implements PersistenceTaskInfo {
   public RetriedTaskInfo(int retryAttempt) {
     this(retryAttempt, Map.of());

impl/persistence/api/src/main/java/io/serverlessworkflow/impl/persistence/WorkflowPersistenceInstance.java

@@ -48,7 +48,7 @@ private WorkflowPersistenceInstance(WorkflowDefinition definition, PersistenceWo
               }
             });
     this.startedAt = info.startedAt();
-    setMetadata(info.metadata());
+    additionalObjects = info.metadata();
   }
 
   @Override
@@ -84,7 +84,6 @@ public void restoreContext(WorkflowContext workflow, TaskContext context) {
                   : workflow.definition().taskExecutor(completedTaskInfo.nextPosition()),
               completedTaskInfo.isEndNode()));
       workflow.context(completedTaskInfo.context());
-      setMetadata(completedTaskInfo.additionalObjects());
     } else if (taskInfo instanceof RetriedTaskInfo retriedTaskInfo) {
       if (context.retryAttempt() == 0) {
         context.retryAttempt(retriedTaskInfo.retryAttempt());
@@ -100,7 +99,7 @@ public void restoreContext(WorkflowContext workflow, TaskContext context) {
         }
         searchContext = tryContext.parent();
       }
-      setMetadata(retriedTaskInfo.metadata());
     }
+    taskInfo.additionalObjects().forEach(additionalObjects::put);
   }
 }