Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjtirado merged 2 commits into from
Oct 5, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de5f360
[Fix #1738] Replace setMetadata by fine grain manipulation.
fjtirado Oct 5, 2026
e0c734a
[Fix #1738] Adding safeguard to avoid overriding keys set by user
fjtirado Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowMutableInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();

Expand Down Expand Up @@ -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());
Expand Down
7 changes: 6 additions & 1 deletion ...istence/api/src/main/java/io/serverlessworkflow/impl/persistence/PersistenceTaskInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@
*/
package io.serverlessworkflow.impl.persistence;

public interface PersistenceTaskInfo {}
import java.util.Map;

public interface PersistenceTaskInfo {

Map<String, Object> additionalObjects();
}
2 changes: 1 addition & 1 deletion ...persistence/api/src/main/java/io/serverlessworkflow/impl/persistence/RetriedTaskInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
46 changes: 43 additions & 3 deletions ...api/src/main/java/io/serverlessworkflow/impl/persistence/WorkflowPersistenceInstance.java
View file
Open in desktop
Comment thread
fjtirado marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@
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.function.Supplier;

public class WorkflowPersistenceInstance extends WorkflowMutableInstance {

private final PersistenceWorkflowInfo info;
private Set<String> userMetaKeys = new HashSet<>();

public static WorkflowInstance of(WorkflowDefinition definition, PersistenceWorkflowInfo info) {
return definition
Expand All @@ -48,7 +52,7 @@ private WorkflowPersistenceInstance(WorkflowDefinition definition, PersistenceWo
}
});
this.startedAt = info.startedAt();
setMetadata(info.metadata());
additionalObjects.putAll(info.metadata());
}

@Override
Expand Down Expand Up @@ -84,7 +88,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());
Expand All @@ -100,7 +103,44 @@ public void restoreContext(WorkflowContext workflow, TaskContext context) {
}
searchContext = tryContext.parent();
}
setMetadata(retriedTaskInfo.metadata());
}
Set<String> retainKeys;
synchronized (userMetaKeys) {
retainKeys = new HashSet<>(userMetaKeys);
taskInfo
.additionalObjects()
.forEach(
(k, v) -> {
if (!retainKeys.contains(k)) {
additionalObjects.put(k, v);
retainKeys.add(k);
Comment thread
fjtirado marked this conversation as resolved.
}
});
additionalObjects.keySet().retainAll(retainKeys);
}
}

@Override
public <T> T addMetadataIfAbsent(String key, Supplier<T> supplier) {
synchronized (userMetaKeys) {
userMetaKeys.add(key);
Comment thread
fjtirado marked this conversation as resolved.
return super.addMetadataIfAbsent(key, supplier);
}
}

@Override
public void removeMetadata(String key) {
synchronized (userMetaKeys) {
userMetaKeys.add(key);
Comment thread
fjtirado marked this conversation as resolved.
super.removeMetadata(key);
}
}

@Override
public <T> Optional<T> removeMetadata(String key, Class<T> clazz) {
synchronized (userMetaKeys) {
userMetaKeys.add(key);
Comment thread
fjtirado marked this conversation as resolved.
return super.removeMetadata(key, clazz);
}
}
}
Loading