Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Issues/34 upgrade to dsf 0.6.0 #38

Merged
merged 4 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.highmed.dsf.bpe;

import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand All @@ -20,6 +21,7 @@
public class DataSharingProcessPluginDefinition implements ProcessPluginDefinition
{
public static final String VERSION = "0.6.0";
public static final LocalDate RELEASE_DATE = LocalDate.of(2022, 4, 14);

@Override
public String getName()
Expand All @@ -33,6 +35,12 @@ public String getVersion()
return VERSION;
}

@Override
public LocalDate getReleaseDate()
{
return RELEASE_DATE;
}

@Override
public Stream<String> getBpmnFiles()
{
Expand Down Expand Up @@ -75,7 +83,8 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
"highmedorg_requestDataSharing/" + VERSION,
Arrays.asList(aReq, cDS, sTReq, sRSDS, sTResM, sTErrM, vDS));

return ResourceProvider.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
classLoader, resolver, resourcesByProcessKeyAndVersion);
return ResourceProvider.read(VERSION, RELEASE_DATE,
() -> fhirContext.newXmlParser().setStripVersionsFromReferences(false), classLoader, resolver,
resourcesByProcessKeyAndVersion);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1yff9tp" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="highmedorg_computeDataSharing" isExecutable="true" camunda:versionTag="0.6.0">
<bpmn:process id="highmedorg_computeDataSharing" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:subProcess id="SubProcess_1gopxt4">
<bpmn:incoming>SequenceFlow_1lfe4wr</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0xxpamp</bpmn:outgoing>
Expand Down Expand Up @@ -41,9 +41,9 @@
<bpmn:endEvent id="EndEventSuccess" name="send results to MeDIC">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/requestDataSharing/0.6.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/requestDataSharing/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">resultMultiMedicDataSharingMessage</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-data-sharing|0.6.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-data-sharing|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_0uaqn1r</bpmn:incoming>
Expand Down Expand Up @@ -82,9 +82,9 @@
<bpmn:endEvent id="EndEventError" name="send error to MeDIC">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/requestDataSharing/0.6.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/requestDataSharing/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">errorMultiMedicDataSharingMessage</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-data-sharing|0.6.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-data-sharing|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1tmnvhl</bpmn:incoming>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0drkcb5" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="highmedorg_executeDataSharing" isExecutable="true" camunda:versionTag="0.6.0">
<bpmn:process id="highmedorg_executeDataSharing" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:serviceTask id="checkResults" name="check results" camunda:class="org.highmed.dsf.bpe.service.CheckMedicSingleMedicResults">
<bpmn:incoming>Flow_1pzik8k</bpmn:incoming>
<bpmn:outgoing>Flow_08925ay</bpmn:outgoing>
Expand All @@ -23,9 +23,9 @@
<bpmn:endEvent id="EndEventSuccess" name="send results to TTP">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/computeDataSharing/0.6.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/computeDataSharing/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">resultSingleMedicDataSharingMessage</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-single-medic-result-data-sharing|0.6.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-single-medic-result-data-sharing|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1611vr6</bpmn:incoming>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1flneil" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="highmedorg_requestDataSharing" isExecutable="true" camunda:versionTag="0.6.0">
<bpmn:process id="highmedorg_requestDataSharing" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:sequenceFlow id="Flow_0dd6nmz" sourceRef="StartEvent" targetRef="downloadResearchStudyResource" />
<bpmn:sequenceFlow id="Flow_06otxko" sourceRef="downloadResearchStudyResource" targetRef="selectRequestTargetsAndGenerateKeys" />
<bpmn:startEvent id="StartEvent" name="start">
Expand All @@ -15,9 +15,9 @@
<bpmn:sendTask id="sendRequestToMedics" name="send request to medics" camunda:class="org.highmed.dsf.bpe.message.SendMedicRequest">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/executeDataSharing/0.6.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/executeDataSharing/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">executeDataSharingMessage</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-execute-data-sharing|0.6.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-execute-data-sharing|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_18ie7l6</bpmn:incoming>
Expand Down Expand Up @@ -66,9 +66,9 @@
<bpmn:intermediateThrowEvent id="sendCorreltationKeysToTTP" name="send correlation keys to TTP">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/computeDataSharing/0.6.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://highmed.org/bpe/Process/computeDataSharing/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">computeDataSharingMessage</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-compute-data-sharing|0.6.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-compute-data-sharing|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_0cx3xe1</bpmn:incoming>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<valueString value="computeDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-compute-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-compute-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -58,7 +58,7 @@
<valueString value="resultSingleMedicDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-single-medic-result-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-single-medic-result-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -103,14 +103,15 @@
</extension>
<url value="http://highmed.org/bpe/Process/computeDataSharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="ComputeDataSharing" />
<title value="Compute Data Sharing" />
<subtitle value="Process to compute a data sharing result" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="HiGHmed" />
<contact>
<name value="HiGHmed" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<valueString value="executeDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-execute-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-execute-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -75,14 +75,15 @@
</extension>
<url value="http://highmed.org/bpe/Process/executeDataSharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="ExecuteDataSharing" />
<title value="Execute Data Sharing" />
<subtitle value="Process to execute a data sharing query" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="HiGHmed" />
<contact>
<name value="HiGHmed" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<valueString value="requestDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-request-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-request-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -58,7 +58,7 @@
<valueString value="resultMultiMedicDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -106,7 +106,7 @@
<valueString value="errorMultiMedicDataSharingMessage" />
</extension>
<extension url="task-profile">
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-data-sharing|${version}" />
<valueCanonical value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-data-sharing|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -151,14 +151,15 @@
</extension>
<url value="http://highmed.org/bpe/Process/requestDataSharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="RequestDataSharing" />
<title value="Request Data Sharing" />
<subtitle value="Process to request data sharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="HiGHmed" />
<contact>
<name value="HiGHmed" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
</meta>
<url value="http://highmed.org/fhir/CodeSystem/data-sharing"/>
<!-- version managed by bpe -->
<version value="${version}"/>
<version value="#{version}"/>
<name value="HiGHmed_Data_Sharing"/>
<title value="HiGHmed Data Sharing"/>
<!-- status managed by bpe -->
<status value="unknown"/>
<experimental value="false"/>
<date value="2021-08-24"/>
<!-- date managed by bpe -->
<date value="#{date}"/>
<publisher value="HiGHmed"/>
<description value="CodeSystem with standard values for HiGhmed data sharing processes"/>
<caseSensitive value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
</tag>
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/research-study-data-sharing" />
<version value="${version}" />
<version value="#{version}" />
<name value="ResearchStudyDataSharing" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/task-compute-data-sharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="TaskComputeDataSharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -22,7 +23,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://highmed.org/bpe/Process/computeDataSharing/${version}" />
<fixedUri value="http://highmed.org/bpe/Process/computeDataSharing/#{version}" />
</element>
<element id="Task.input">
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/task-execute-data-sharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="TaskExecuteDataSharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -22,7 +23,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://highmed.org/bpe/Process/executeDataSharing/${version}" />
<fixedUri value="http://highmed.org/bpe/Process/executeDataSharing/#{version}" />
</element>
<element id="Task.input">
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-data-sharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="TaskMultiMedicErrorDataSharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -23,7 +24,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/${version}" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/#{version}" />
</element>
<element id="Task.input">
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-data-sharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="TaskMultiMedicResultDataSharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -22,7 +23,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/${version}" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/#{version}" />
</element>
<element id="Task.input">
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
</meta>
<url value="http://highmed.org/fhir/StructureDefinition/task-request-data-sharing" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="TaskRequestDataSharing" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-08-24" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -22,7 +23,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/${version}" />
<fixedUri value="http://highmed.org/bpe/Process/requestDataSharing/#{version}" />
</element>
<element id="Task.input">
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name">
Expand Down
Loading