[Fix #1738] Adding safeguard to avoid overriding keys set by user

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

Author: fjtirado

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

@@ -24,12 +24,17 @@
 import io.serverlessworkflow.impl.WorkflowMutableInstance;
 import io.serverlessworkflow.impl.WorkflowStatus;
 import io.serverlessworkflow.impl.executors.TransitionInfo;
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 public class WorkflowPersistenceInstance extends WorkflowMutableInstance {
 
   private final PersistenceWorkflowInfo info;
+  private Set<String> userMetaKeys = ConcurrentHashMap.newKeySet();
 
   public static WorkflowInstance of(WorkflowDefinition definition, PersistenceWorkflowInfo info) {
     return definition
@@ -48,7 +53,7 @@ private WorkflowPersistenceInstance(WorkflowDefinition definition, PersistenceWo
               }
             });
     this.startedAt = info.startedAt();
-    additionalObjects = info.metadata();
+    additionalObjects.putAll(info.metadata());
   }
 
   @Override
@@ -100,6 +105,34 @@ public void restoreContext(WorkflowContext workflow, TaskContext context) {
         searchContext = tryContext.parent();
       }
     }
-    taskInfo.additionalObjects().forEach(additionalObjects::put);
+    Set<String> retainKeys = new HashSet<>(userMetaKeys);
+    taskInfo
+        .additionalObjects()
+        .forEach(
+            (k, v) -> {
+              if (!retainKeys.contains(k)) {
+                additionalObjects.put(k, v);
+                retainKeys.add(k);
+              }
+            });
+    additionalObjects.keySet().retainAll(retainKeys);
+  }
+
+  @Override
+  public <T> T addMetadataIfAbsent(String key, Supplier<T> supplier) {
+    userMetaKeys.add(key);
+    return super.addMetadataIfAbsent(key, supplier);
+  }
+
+  @Override
+  public void removeMetadata(String key) {
+    userMetaKeys.remove(key);
+    super.removeMetadata(key);
+  }
+
+  @Override
+  public <T> Optional<T> removeMetadata(String key, Class<T> clazz) {
+    userMetaKeys.remove(key);
+    return super.removeMetadata(key, clazz);
   }
 }