Skip to content

Issue/378 profiles for all resources #379

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
hhund merged 17 commits into from
Oct 31, 2025
Merged

Issue/378 profiles for all resources #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dc7c834
DSF 2.0.0 FHIR resources
hhund Oct 28, 2025
50735ce
new and fixed profile validation tests, other minor changes
hhund Oct 29, 2025
4aeb4ec
changes to support 2.0.0 profiles
hhund Oct 29, 2025
179e3c0
removed special case for Questionnaire 1.0.0 profile
hhund Oct 29, 2025
ff36ddb
data migrations jobs to fix task profiles and questionnaire resources
hhund Oct 29, 2025
c68845b
fixed integration tests for new 2.0.0 profiles
hhund Oct 29, 2025
93689a0
new profile related validation, runtime modifications for v1 plugins
hhund Oct 29, 2025
bdca3d8
modification to be compliant with 2.0.0 profiles
hhund Oct 29, 2025
754e888
modification to check rewrite of old 1.0.0 profiles
hhund Oct 29, 2025
3aead3e
enforced default profiles, fixed tests, improved ConformanceService
hhund Oct 29, 2025
3a8eabe
disabled resource validation for initial data loaded internal bundle
hhund Oct 29, 2025
abdcc9f
formatting
hhund Oct 29, 2025
dd8a9ca
missing annotations, modified ActivityDefinition profile, improved tests
hhund Oct 29, 2025
e271528
missing annotation
hhund Oct 29, 2025
b142a18
Merge remote-tracking branch 'origin/develop_2' into
hhund Oct 30, 2025
374f4d0
typos fixed, method visibility changed protected -> private
hhund Oct 31, 2025
5bcbb04
added new organization and practitioner roles
hhund Oct 31, 2025
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
237 changes: 228 additions & 9 deletions ...pe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
import java.util.Map;
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;

import org.camunda.bpm.engine.delegate.ExecutionListener;
import org.camunda.bpm.engine.delegate.JavaDelegate;
Expand All @@ -22,13 +24,18 @@
import org.camunda.bpm.engine.variable.value.PrimitiveValue;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.ActivityDefinition;
import org.hl7.fhir.r4.model.CanonicalType;
import org.hl7.fhir.r4.model.CodeSystem;
import org.hl7.fhir.r4.model.ElementDefinition;
import org.hl7.fhir.r4.model.ElementDefinition.ElementDefinitionBindingComponent;
import org.hl7.fhir.r4.model.Identifier;
import org.hl7.fhir.r4.model.Library;
import org.hl7.fhir.r4.model.Measure;
import org.hl7.fhir.r4.model.MetadataResource;
import org.hl7.fhir.r4.model.NamingSystem;
import org.hl7.fhir.r4.model.Questionnaire;
import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent;
import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.r4.model.QuestionnaireResponse;
import org.hl7.fhir.r4.model.Resource;
import org.hl7.fhir.r4.model.StructureDefinition;
Expand Down Expand Up @@ -92,7 +99,7 @@ public PluginMdc getPluginMdc()
}

@Override
protected ProcessPluginFhirConfig<ActivityDefinition, CodeSystem, Library, Measure, NamingSystem, Questionnaire, StructureDefinition, Task, ValueSet> createFhirConfig()
protected ProcessPluginFhirConfig<Resource, ActivityDefinition, CodeSystem, Library, Measure, NamingSystem, Questionnaire, StructureDefinition, Task, ValueSet> createFhirConfig()
{
BiFunction<String, String, Object> parseResource = (String filename, String content) ->
{
Expand Down Expand Up @@ -182,14 +189,226 @@ else if (filename.endsWith(XML_SUFFIX))
? Optional.of(s.getBaseDefinitionElement().getValue())
: Optional.empty();

return new ProcessPluginFhirConfig<>(ActivityDefinition.class, CodeSystem.class, Library.class, Measure.class,
NamingSystem.class, Questionnaire.class, StructureDefinition.class, Task.class, ValueSet.class,
OrganizationIdentifier.SID, TaskIdentifier.SID, TaskStatus.DRAFT.toCode(), BpmnMessage.URL,
BpmnMessage.Codes.MESSAGE_NAME, parseResource, encodeResource, getResourceName, hasMetadataResourceUrl,
hasMetadataResourceVersion, getMetadataResourceVersion, getActivityDefinitionUrl, NamingSystem::hasName,
getTaskInstantiatesCanonical, getTaskIdentifierValue, isTaskStatusDraft, getRequester, getRecipient,
Task::hasInput, hasTaskInputMessageName, Task::hasOutput, getStructureDefinitionBaseDefinition,
StructureDefinition::setBaseDefinition);
Function<Resource, List<String>> getProfiles = r -> r.hasMeta() && r.getMeta().hasProfile() ? r.getMeta()
.getProfile().stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue).toList()
: List.of();

Consumer<ActivityDefinition> modifyActivityDefinition = a ->
{
List<CanonicalType> oldProfiles = a.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/activity-definition"), oldProfiles
.stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue).map(p -> switch (p)
{
case "http://dsf.dev/fhir/StructureDefinition/activity-definition|1.0.0" ->
"http://dsf.dev/fhir/StructureDefinition/activity-definition";
default -> p;
}))
.distinct().map(CanonicalType::new).toList();

a.getMeta().setProfile(newProfiles);
};

Consumer<CodeSystem> modifyCodeSystem = c ->
{
List<CanonicalType> oldProfiles = c.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/code-system"), oldProfiles.stream()
.filter(CanonicalType::hasValue).map(CanonicalType::getValue).map(p -> switch (p)
{
case "http://dsf.dev/fhir/StructureDefinition/code-system|1.0.0" ->
"http://dsf.dev/fhir/StructureDefinition/code-system";
default -> p;
}))
.distinct().map(CanonicalType::new).toList();

c.getMeta().setProfile(newProfiles);
};

Consumer<Library> modifyLibrary = l ->
{
List<CanonicalType> oldProfiles = l.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/library"),
oldProfiles.stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue))
.distinct().map(CanonicalType::new).toList();

l.getMeta().setProfile(newProfiles);
};

Consumer<Measure> modifyMeasure = m ->
{
List<CanonicalType> oldProfiles = m.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/measure"),
oldProfiles.stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue))
.distinct().map(CanonicalType::new).toList();

m.getMeta().setProfile(newProfiles);
};

Consumer<NamingSystem> modifyNamingSystem = n ->
{
List<CanonicalType> oldProfiles = n.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/naming-system"),
oldProfiles.stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue))
.distinct().map(CanonicalType::new).toList();

n.getMeta().setProfile(newProfiles);
};

Consumer<Questionnaire> modifyQuestionnaire = q ->
{
List<CanonicalType> oldProfiles = q.getMeta().getProfile();
List<CanonicalType> newProfiles = oldProfiles.stream().filter(CanonicalType::hasValue)
.map(CanonicalType::getValue).map(p -> switch (p)
{
case "http://dsf.dev/fhir/StructureDefinition/questionnaire|1.0.0",
"http://dsf.dev/fhir/StructureDefinition/questionnaire|1.5.0" ->
"http://dsf.dev/fhir/StructureDefinition/questionnaire";
default -> p;
}).distinct().map(CanonicalType::new).toList();

q.getMeta().setProfile(newProfiles);

setRequired(q.getItem());
};

Consumer<StructureDefinition> modifyStructureDefinition = s ->
{
String oldBaseDefinition = s.getBaseDefinition();
String newBaseDefinition = switch (oldBaseDefinition)
{
case "http://dsf.dev/fhir/StructureDefinition/task-base",
"http://dsf.dev/fhir/StructureDefinition/task-base|1.0.0" ->
"http://dsf.dev/fhir/StructureDefinition/task";
default -> oldBaseDefinition;
};
s.setBaseDefinition(newBaseDefinition);

s.getDifferential().getElement().stream().filter(ElementDefinition::hasBinding)
.map(ElementDefinition::getBinding).filter(ElementDefinitionBindingComponent::hasValueSet)
.forEach(b ->
{
String newValueSet = switch (b.getValueSet())
{
case "http://dsf.dev/fhir/CodeSystem/bpmn-message|1.0.0",
"http://dsf.dev/fhir/CodeSystem/bpmn-message|2.0.0" ->
"http://dsf.dev/fhir/CodeSystem/bpmn-message";
case "http://dsf.dev/fhir/CodeSystem/organization-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/organization-role|2.0.0" ->
"http://dsf.dev/fhir/CodeSystem/organization-role";
case "http://dsf.dev/fhir/CodeSystem/practitioner-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/practitioner-role|2.0.0" ->
"http://dsf.dev/fhir/CodeSystem/practitioner-role";
case "http://dsf.dev/fhir/CodeSystem/process-authorization|1.0.0",
"http://dsf.dev/fhir/CodeSystem/process-authorization|2.0.0" ->
"http://dsf.dev/fhir/CodeSystem/process-authorization";
case "http://dsf.dev/fhir/CodeSystem/read-access-tag|1.0.0",
"http://dsf.dev/fhir/CodeSystem/read-access-tag|2.0.0" ->
"http://dsf.dev/fhir/CodeSystem/read-access-tag";
default -> b.getValueSet();
};

b.setValueSet(newValueSet);
});

List<CanonicalType> oldProfiles = s.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/structure-definition"),
oldProfiles.stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue))
.distinct().map(CanonicalType::new).toList();

s.getMeta().setProfile(newProfiles);
};

Consumer<ValueSet> modifyValueSet = v ->
{
List<CanonicalType> oldProfiles = v.getMeta().getProfile();
List<CanonicalType> newProfiles = Stream
.concat(Stream.of("http://dsf.dev/fhir/StructureDefinition/value-set"), oldProfiles.stream()
.filter(CanonicalType::hasValue).map(CanonicalType::getValue).map(p -> switch (p)
{
case "http://dsf.dev/fhir/StructureDefinition/value-set|1.0.0" ->
"http://dsf.dev/fhir/StructureDefinition/value-set";
default -> p;
}))
.distinct().map(CanonicalType::new).toList();

v.getMeta().setProfile(newProfiles);
};

Predicate<Questionnaire> hasQuestionnaireItemsWithRequired = q -> !q.hasItem() || hasRequired(q.getItem());

Predicate<StructureDefinition> hasStructureDefinitionTaskDsfValueSetBindingsWithoutVersion = s -> s
.hasDifferential()
&& s.getDifferential().getElement().stream().filter(ElementDefinition::hasBinding)
.map(ElementDefinition::getBinding).filter(ElementDefinitionBindingComponent::hasValueSet)
.allMatch(b ->
{
return switch (b.getValueSet())
{
case "http://dsf.dev/fhir/CodeSystem/bpmn-message|1.0.0",
"http://dsf.dev/fhir/CodeSystem/bpmn-message|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/organization-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/organization-role|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/practitioner-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/practitioner-role|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/process-authorization|1.0.0",
"http://dsf.dev/fhir/CodeSystem/process-authorization|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/read-access-tag|1.0.0",
"http://dsf.dev/fhir/CodeSystem/read-access-tag|2.0.0" ->
false;
default -> true;
};
});

return new ProcessPluginFhirConfig<>(Resource.class, ActivityDefinition.class, CodeSystem.class, Library.class,
Measure.class, NamingSystem.class, Questionnaire.class, StructureDefinition.class, Task.class,
ValueSet.class, OrganizationIdentifier.SID, TaskIdentifier.SID, TaskStatus.DRAFT.toCode(),
BpmnMessage.URL, BpmnMessage.Codes.MESSAGE_NAME, parseResource, encodeResource, getResourceName,
hasMetadataResourceUrl, hasMetadataResourceVersion, getMetadataResourceVersion,
getActivityDefinitionUrl, NamingSystem::hasName, getTaskInstantiatesCanonical, getTaskIdentifierValue,
isTaskStatusDraft, getRequester, getRecipient, Task::hasInput, hasTaskInputMessageName, Task::hasOutput,
getStructureDefinitionBaseDefinition, StructureDefinition::setBaseDefinition, getProfiles,
modifyActivityDefinition, modifyCodeSystem, modifyLibrary, modifyMeasure, modifyNamingSystem,
modifyQuestionnaire, modifyStructureDefinition, modifyValueSet, hasQuestionnaireItemsWithRequired,
hasStructureDefinitionTaskDsfValueSetBindingsWithoutVersion);
}

private void setRequired(List<QuestionnaireItemComponent> items)
{
items.stream().filter(QuestionnaireItemComponent::hasLinkId).filter(QuestionnaireItemComponent::hasType)
.filter(i -> !QuestionnaireItemType.DISPLAY.equals(i.getType())).filter(i -> !i.hasRequired())
.forEach(i ->
{
switch (i.getLinkId())
{
case "business-key", "user-task-id" -> i.setRequired(true);
default -> i.setRequired(false);
}

if (i.hasItem())
setRequired(i.getItem());
});
}

private boolean hasRequired(List<QuestionnaireItemComponent> items)
{
return items.stream().filter(QuestionnaireItemComponent::hasLinkId).filter(QuestionnaireItemComponent::hasType)
.filter(i -> !QuestionnaireItemType.DISPLAY.equals(i.getType())).allMatch(i ->
{
return switch (i.getLinkId())
{
case "business-key", "user-task-id" -> i.hasRequired() && i.getRequired();
default -> i.hasRequired();
} && (!i.hasItem() || hasRequired(i.getItem()));
});
}

private IParser newXmlParser()
Expand Down
90 changes: 81 additions & 9 deletions ...pe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
Expand All @@ -29,13 +30,18 @@
import org.camunda.bpm.engine.variable.value.PrimitiveValue;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.ActivityDefinition;
import org.hl7.fhir.r4.model.CanonicalType;
import org.hl7.fhir.r4.model.CodeSystem;
import org.hl7.fhir.r4.model.ElementDefinition;
import org.hl7.fhir.r4.model.ElementDefinition.ElementDefinitionBindingComponent;
import org.hl7.fhir.r4.model.Identifier;
import org.hl7.fhir.r4.model.Library;
import org.hl7.fhir.r4.model.Measure;
import org.hl7.fhir.r4.model.MetadataResource;
import org.hl7.fhir.r4.model.NamingSystem;
import org.hl7.fhir.r4.model.Questionnaire;
import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent;
import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.r4.model.QuestionnaireResponse;
import org.hl7.fhir.r4.model.Resource;
import org.hl7.fhir.r4.model.StructureDefinition;
Expand Down Expand Up @@ -170,7 +176,7 @@ public PluginMdc getPluginMdc()
}

@Override
protected ProcessPluginFhirConfig<ActivityDefinition, CodeSystem, Library, Measure, NamingSystem, Questionnaire, StructureDefinition, Task, ValueSet> createFhirConfig()
protected ProcessPluginFhirConfig<Resource, ActivityDefinition, CodeSystem, Library, Measure, NamingSystem, Questionnaire, StructureDefinition, Task, ValueSet> createFhirConfig()
{
BiFunction<String, String, Object> parseResource = (String filename, String content) ->
{
Expand Down Expand Up @@ -258,14 +264,80 @@ else if (filename.endsWith(XML_SUFFIX))
? Optional.of(s.getBaseDefinitionElement().getValue())
: Optional.empty();

return new ProcessPluginFhirConfig<>(ActivityDefinition.class, CodeSystem.class, Library.class, Measure.class,
NamingSystem.class, Questionnaire.class, StructureDefinition.class, Task.class, ValueSet.class,
OrganizationIdentifier.SID, TaskIdentifier.SID, TaskStatus.DRAFT.toCode(), BpmnMessage.SYSTEM,
BpmnMessage.Codes.MESSAGE_NAME, parseResource, encodeResource, getResourceName, hasMetadataResourceUrl,
hasMetadataResourceVersion, getMetadataResourceVersion, getActivityDefinitionUrl, NamingSystem::hasName,
getTaskInstantiatesCanonical, getTaskIdentifierValue, isTaskStatusDraft, getRequester, getRecipient,
Task::hasInput, hasTaskInputMessageName, Task::hasOutput, getStructureDefinitionBaseDefinition,
StructureDefinition::setBaseDefinition);
Function<Resource, List<String>> getProfiles = r -> r.hasMeta() && r.getMeta().hasProfile() ? r.getMeta()
.getProfile().stream().filter(CanonicalType::hasValue).map(CanonicalType::getValue).toList()
: List.of();

Consumer<ActivityDefinition> modifyActivityDefinition = _ ->
{};
Consumer<CodeSystem> modifyCodeSystem = _ ->
{};
Consumer<Library> modifyLibrary = _ ->
{};
Consumer<Measure> modifyMeasure = _ ->
{};
Consumer<NamingSystem> modifyNamingSystem = _ ->
{};
Consumer<Questionnaire> modifyQuestionnaire = _ ->
{};
Consumer<StructureDefinition> modifyStructureDefinition = _ ->
{};
Consumer<ValueSet> modifyValueSet = _ ->
{};

Predicate<Questionnaire> hasQuestionnaireItemsWithRequired = q -> !q.hasItem() || hasRequired(q.getItem());

Predicate<StructureDefinition> hasStructureDefinitionTaskDsfValueSetBindingsWithoutVersion = s -> s
.hasDifferential()
&& s.getDifferential().getElement().stream().filter(ElementDefinition::hasBinding)
.map(ElementDefinition::getBinding).filter(ElementDefinitionBindingComponent::hasValueSet)
.allMatch(b ->
{
return switch (b.getValueSet())
{
case "http://dsf.dev/fhir/CodeSystem/bpmn-message|1.0.0",
"http://dsf.dev/fhir/CodeSystem/bpmn-message|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/organization-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/organization-role|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/practitioner-role|1.0.0",
"http://dsf.dev/fhir/CodeSystem/practitioner-role|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/process-authorization|1.0.0",
"http://dsf.dev/fhir/CodeSystem/process-authorization|2.0.0" ->
false;
case "http://dsf.dev/fhir/CodeSystem/read-access-tag|1.0.0",
"http://dsf.dev/fhir/CodeSystem/read-access-tag|2.0.0" ->
false;
default -> true;
};
});

return new ProcessPluginFhirConfig<>(Resource.class, ActivityDefinition.class, CodeSystem.class, Library.class,
Measure.class, NamingSystem.class, Questionnaire.class, StructureDefinition.class, Task.class,
ValueSet.class, OrganizationIdentifier.SID, TaskIdentifier.SID, TaskStatus.DRAFT.toCode(),
BpmnMessage.SYSTEM, BpmnMessage.Codes.MESSAGE_NAME, parseResource, encodeResource, getResourceName,
hasMetadataResourceUrl, hasMetadataResourceVersion, getMetadataResourceVersion,
getActivityDefinitionUrl, NamingSystem::hasName, getTaskInstantiatesCanonical, getTaskIdentifierValue,
isTaskStatusDraft, getRequester, getRecipient, Task::hasInput, hasTaskInputMessageName, Task::hasOutput,
getStructureDefinitionBaseDefinition, StructureDefinition::setBaseDefinition, getProfiles,
modifyActivityDefinition, modifyCodeSystem, modifyLibrary, modifyMeasure, modifyNamingSystem,
modifyQuestionnaire, modifyStructureDefinition, modifyValueSet, hasQuestionnaireItemsWithRequired,
hasStructureDefinitionTaskDsfValueSetBindingsWithoutVersion);
}

private boolean hasRequired(List<QuestionnaireItemComponent> items)
{
return items.stream().filter(QuestionnaireItemComponent::hasLinkId).filter(QuestionnaireItemComponent::hasType)
.filter(i -> !QuestionnaireItemType.DISPLAY.equals(i.getType())).allMatch(i ->
{
return switch (i.getLinkId())
{
case "business-key", "user-task-id" -> i.hasRequired() && i.getRequired();
default -> i.hasRequired();
} && (!i.hasItem() || hasRequired(i.getItem()));
});
}

private IParser newXmlParser()
Expand Down
Loading