Skip to content

Issue/438 DSF 1.x Process Instances Fail to Continue on DSF 2.x #439

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

Open
hhund wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Issue/438 DSF 1.x Process Instances Fail to Continue on DSF 2.x #439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b19e234
Adds fallback code to read 1.x task variables
hhund Mar 16, 2026
060aaf6
renamed variable
hhund Mar 16, 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
30 changes: 22 additions & 8 deletions ...bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/VariablesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;

import org.hl7.fhir.r4.model.QuestionnaireResponse;
Expand All @@ -42,7 +43,9 @@ public class VariablesImpl implements Variables, ListenerVariables
private static final Logger logger = LoggerFactory.getLogger(VariablesImpl.class);

private static final String TASKS_PREFIX = VariablesImpl.class.getName() + ".tasks.";
private static final String TASKS_PREFIX_DSF_1 = "dev.dsf.bpe.variables.VariablesImpl.tasks.";
private static final String START_TASK = VariablesImpl.class.getName() + ".startTask";
private static final String START_TASK_DSF_1 = "dev.dsf.bpe.variables.VariablesImpl.startTask";

private static final class DistinctTask
{
Expand Down Expand Up @@ -170,10 +173,10 @@ public <R extends Resource> List<R> getResourceList(String variableName)
return list != null ? list.getResourcesAndCast() : null;
}

private <R extends Resource> List<R> getResourceListOrDefault(String variableName, List<R> defaultList)
private <R extends Resource> List<R> getResourceListOrDefault(String variableName, Supplier<List<R>> defaultList)
{
List<R> list = getResourceList(variableName);
return list != null ? list : defaultList;
return list != null ? list : defaultList.get();
}

@Override
Expand All @@ -197,7 +200,12 @@ public Task getStartTask()
logger.trace("getStartTask - parentActivityInstanceId: {}, parentId: {}",
execution.getParentActivityInstanceId(), execution.getParentId());

return getResource(START_TASK);
Task task = getResource(START_TASK);

if (task == null)
task = getResource(START_TASK_DSF_1);

return task;
}

@Override
Expand All @@ -218,7 +226,8 @@ public List<Task> getTasks()

List<Task> tasks = Stream
.concat(Stream.of(getStartTask()),
execution.getVariables().keySet().stream().filter(k -> k.startsWith(TASKS_PREFIX))
execution.getVariables().keySet().stream()
.filter(k -> k.startsWith(TASKS_PREFIX) || k.startsWith(TASKS_PREFIX_DSF_1))
.map(this::getResourceList).flatMap(List::stream).filter(r -> r instanceof Task)
.map(r -> (Task) r))
.filter(t -> t != null).map(DistinctTask::new).distinct().map(DistinctTask::getTask).toList();
Expand All @@ -234,7 +243,9 @@ public List<Task> getCurrentTasks()

Stream<Task> start = execution.getParentId() == null ? Stream.of(getStartTask()) : Stream.empty();
Stream<Task> current = getResourceListOrDefault(TASKS_PREFIX + execution.getParentActivityInstanceId(),
List.<Task> of()).stream();
() -> getResourceListOrDefault(TASKS_PREFIX_DSF_1 + execution.getParentActivityInstanceId(),
List::<Task> of))
.stream();

return Collections.unmodifiableList(Stream.concat(start, current).toList());
}
Expand All @@ -252,7 +263,8 @@ public void updateTask(Task task)
else
{
String instanceId = execution.getParentActivityInstanceId();
List<Task> tasks = getResourceListOrDefault(TASKS_PREFIX + instanceId, List.of());
List<Task> tasks = getResourceListOrDefault(TASKS_PREFIX + instanceId,
() -> getResourceListOrDefault(TASKS_PREFIX_DSF_1 + instanceId, List::of));

if (tasks.stream().anyMatch(t -> t.getIdElement().getIdPart().equals(task.getIdElement().getIdPart())))
setResourceList(TASKS_PREFIX + instanceId, tasks);
Expand Down Expand Up @@ -307,7 +319,8 @@ public void onContinue(Task task)
{
String instanceId = execution.getParentActivityInstanceId();

List<Task> tasks = new ArrayList<>(getResourceListOrDefault(TASKS_PREFIX + instanceId, List.of()));
List<Task> tasks = new ArrayList<>(getResourceListOrDefault(TASKS_PREFIX + instanceId,
() -> getResourceListOrDefault(TASKS_PREFIX_DSF_1 + instanceId, List::of)));
tasks.add(task);

setResourceList(TASKS_PREFIX + instanceId, tasks);
Expand All @@ -322,7 +335,8 @@ public void onEnd()
logger.trace("onEnd");

String instanceId = execution.getParentActivityInstanceId();
List<Task> tasks = new ArrayList<>(getResourceListOrDefault(TASKS_PREFIX + instanceId, List.of()));
List<Task> tasks = new ArrayList<>(getResourceListOrDefault(TASKS_PREFIX + instanceId,
() -> getResourceListOrDefault(TASKS_PREFIX_DSF_1 + instanceId, List::of)));
tasks.removeAll(getCurrentTasks());
setResourceList(TASKS_PREFIX + instanceId, tasks);
}
Expand Down
Loading