Skip to content

Commit

Permalink
adds #{version} to bpmn files, adds #{date} to fhir files, ${} -> #{}
Browse files Browse the repository at this point in the history
Defines a release version via the PluginDefinition class and adds
#{date} to the fhir resources. Switches fhir files to the new #{...}
pattern. Adds the #{version} place holder to the bpmn files.

Closes #59
  • Loading branch information
hhund committed Dec 22, 2021
1 parent 0e18601 commit ee0bc19
Show file tree
Hide file tree
Showing 22 changed files with 114 additions and 111 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.netzwerk_universitaetsmedizin.codex.processes.data_transfer;

import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand All @@ -22,6 +23,7 @@
public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
{
public static final String VERSION = "0.5.0";
public static final LocalDate DATE = LocalDate.of(2021, 9, 6);

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

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

@Override
public Stream<String> getBpmnFiles()
{
Expand Down Expand Up @@ -84,7 +92,8 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
"wwwnetzwerk-universitaetsmedizinde_dataReceive/" + VERSION,
Arrays.asList(aRec, cD, nC, sTstaDrec, vD));

return ResourceProvider.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
classLoader, propertyResolver, resourcesByProcessKeyAndVersion);
return ResourceProvider.read(VERSION, DATE,
() -> fhirContext.newXmlParser().setStripVersionsFromReferences(false), classLoader, propertyResolver,
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:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_18azqkl" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataReceive" isExecutable="true" camunda:versionTag="0.5.0">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataReceive" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:startEvent id="DataReceiveMessageStartEvent" name="start data receive process">
<bpmn:outgoing>Flow_1gyqorb</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_1qwi1k6" messageRef="Message_157qpi8" />
Expand Down
6 changes: 3 additions & 3 deletions codex-process-data-transfer/src/main/resources/bpe/send.bpmn
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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_008keuw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataSend" isExecutable="true" camunda:versionTag="0.5.0">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataSend" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:startEvent id="DataSendMessageStartEvent" name="start data send process">
<bpmn:outgoing>Flow_1km61ly</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_07sumgd" messageRef="Message_0mcjkpi" />
Expand All @@ -20,9 +20,9 @@
<bpmn:endEvent id="StartDataTranslateProcess" name="start data translate process">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/0.5.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataTranslate</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|0.5.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_109e2pt</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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1davgtw" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTranslate" isExecutable="true" camunda:versionTag="0.5.0">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTranslate" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:startEvent id="DataTranslateMessageStartEvent" name="start data translate process">
<bpmn:outgoing>Flow_185r1m5</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_0nqjzhp" messageRef="Message_1nly3ld" />
Expand All @@ -24,9 +24,9 @@
<bpmn:endEvent id="StartReceiveProcess" name="start receive process">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/0.5.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataReceive</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|0.5.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|#{version}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1c2ibtj</bpmn:incoming>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1bd6yss" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.8.1">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTrigger" isExecutable="true" camunda:versionTag="0.5.0">
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTrigger" isExecutable="true" camunda:versionTag="#{version}">
<bpmn:serviceTask id="FindNewData" name="find new data" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.service.FindNewData">
<bpmn:incoming>Flow_0jy9ipp</bpmn:incoming>
<bpmn:outgoing>Flow_0xlfzol</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sendTask id="StartSendProcess" name="start send process" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.message.StartSendProcess">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/0.5.0</camunda:inputParameter>
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/#{version}</camunda:inputParameter>
<camunda:inputParameter name="messageName">startDataSend</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|0.5.0</camunda:inputParameter>
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|#{version}</camunda:inputParameter>
</camunda:inputOutput>
<camunda:properties>
<camunda:property name="dsf.end.listener" value="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
</extension>
<extension url="task-profile">
<valueCanonical
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|${version}" />
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
<extension url="http://highmed.org/fhir/StructureDefinition/extension-process-authorization-organization">
<valueIdentifier>
<system value="http://highmed.org/sid/organization-identifier" />
<value value="${de.netzwerk_universitaetsmedizin.codex.gth.identifier.value:hs-heilbronn.de}" />
<value value="#{de.netzwerk_universitaetsmedizin.codex.gth.identifier.value:hs-heilbronn.de}" />
</valueIdentifier>
</extension>
<system value="http://highmed.org/fhir/CodeSystem/process-authorization" />
Expand All @@ -31,7 +31,7 @@
<extension url="http://highmed.org/fhir/StructureDefinition/extension-process-authorization-organization">
<valueIdentifier>
<system value="http://highmed.org/sid/organization-identifier" />
<value value="${de.netzwerk_universitaetsmedizin.codex.crr.identifier.value:num-codex.de}" />
<value value="#{de.netzwerk_universitaetsmedizin.codex.crr.identifier.value:num-codex.de}" />
</valueIdentifier>
</extension>
<system value="http://highmed.org/fhir/CodeSystem/process-authorization" />
Expand All @@ -42,14 +42,15 @@
<url
value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="dataReceive" />
<title value="Data Receive Process" />
<subtitle value="NUM-CODEX Central Research Repository Data Receive Process" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</extension>
<extension url="task-profile">
<valueCanonical
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|${version}" />
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -58,14 +58,15 @@
<url
value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="dataSend" />
<title value="Data Send Process" />
<subtitle value="Data Send to GECCO Transfer Hub Process" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</extension>
<extension url="task-profile">
<valueCanonical
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|${version}" />
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand All @@ -39,7 +39,7 @@
<extension url="http://highmed.org/fhir/StructureDefinition/extension-process-authorization-organization">
<valueIdentifier>
<system value="http://highmed.org/sid/organization-identifier" />
<value value="${de.netzwerk_universitaetsmedizin.codex.gth.identifier.value:hs-heilbronn.de}" />
<value value="#{de.netzwerk_universitaetsmedizin.codex.gth.identifier.value:hs-heilbronn.de}" />
</valueIdentifier>
</extension>
<system value="http://highmed.org/fhir/CodeSystem/process-authorization" />
Expand All @@ -50,14 +50,15 @@
<url
value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="dataTranslate" />
<title value="Data Translate Process" />
<subtitle value="GECCO Transfer Hub Data Translate Process" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</extension>
<extension url="task-profile">
<valueCanonical
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-trigger|${version}" />
value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-trigger|#{version}" />
</extension>
<extension url="requester">
<valueCoding>
Expand Down Expand Up @@ -108,14 +108,15 @@
<url
value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTrigger" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="dataTrigger" />
<title value="Data Trigger Process" />
<subtitle value="Start/Stop Data Trigger Process" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="NUM-CODEX" />
<contact>
<name value="NUM-CODEX" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
</meta>
<url value="http://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/data-transfer" />
<!-- version managed by bpe -->
<version value="${version}" />
<version value="#{version}" />
<name value="NumCodexDataTransfer" />
<title value="NUM-CODEX data-transfer" />
<!-- status managed by bpe -->
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<publisher value="NUM-CODEX" />
<description value="CodeSystem with standard values for the NUM-CODEX data-transfer processes" />
<caseSensitive value="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<NamingSystem xmlns="http://hl7.org/fhir">
<meta>
<tag>
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag" />
<code value="ALL" />
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag"/>
<code value="ALL"/>
</tag>
</meta>
<name value="NUM-CODEX_Bloom-Filter_Identifier"/>
<status value="active" />
<status value="active"/>
<kind value="identifier"/>
<date value="2021-09-06"/>
<!-- date managed by bpe -->
<date value="#{date}"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="Bloom Filter"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<NamingSystem xmlns="http://hl7.org/fhir">
<meta>
<tag>
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag" />
<code value="ALL" />
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag"/>
<code value="ALL"/>
</tag>
</meta>
<name value="NUM-CODEX_CRR_Pseudonym_Identifier"/>
<status value="active" />
<status value="active"/>
<kind value="identifier"/>
<date value="2021-09-06"/>
<!-- date managed by bpe -->
<date value="#{date}"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="CODEX specific pseudonym"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<NamingSystem xmlns="http://hl7.org/fhir">
<meta>
<tag>
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag" />
<code value="ALL" />
<system value="http://highmed.org/fhir/CodeSystem/read-access-tag"/>
<code value="ALL"/>
</tag>
</meta>
<name value="NUM-CODEX_DIC_Pseudonym_Identifier"/>
<status value="active" />
<status value="active"/>
<kind value="identifier"/>
<date value="2021-09-06"/>
<!-- date managed by bpe -->
<date value="#{date}"/>
<publisher value="NUM-Codex"/>
<responsible value="THS Greifswald"/>
<description value="DIZ specific pseudonym"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</tag>
</meta>
<url value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive" />
<version value="${version}" />
<version value="#{version}" />
<name value="TaskStartDataReceive" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -20,7 +21,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/${version}" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/#{version}" />
</element>
<element id="Task.input">
<path value="Task.input" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</tag>
</meta>
<url value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send" />
<version value="${version}" />
<version value="#{version}" />
<name value="TaskStartDataSend" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -20,7 +21,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/${version}" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/#{version}" />
</element>
<element id="Task.input">
<path value="Task.input" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</tag>
</meta>
<url value="http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate" />
<version value="${version}" />
<version value="#{version}" />
<name value="TaskStartDataTranslate" />
<status value="unknown" />
<experimental value="false" />
<date value="2021-09-06" />
<!-- date managed by bpe -->
<date value="#{date}" />
<fhirVersion value="4.0.1" />
<kind value="resource" />
<abstract value="false" />
Expand All @@ -20,7 +21,7 @@
<differential>
<element id="Task.instantiatesUri">
<path value="Task.instantiatesUri" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/${version}" />
<fixedUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/#{version}" />
</element>
<element id="Task.input">
<path value="Task.input" />
Expand Down
Loading

0 comments on commit ee0bc19

Please sign in to comment.