Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 5e8e548

Browse files
hhundhhund
committed
Merge branch 'release/0.4.1' into main
2 parents 961adeb + 7f5e1ce commit 5e8e548

28 files changed

+60
-71
lines changed

‎codex-process-data-transfer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
1010
<artifactId>codex-processes-ap1</artifactId>
11-
<version>0.4.0</version>
11+
<version>0.4.1</version>
1212
</parent>
1313

1414
<properties>

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
2323
{
24-
public static final String VERSION = "0.4.0";
24+
public static final String VERSION = "0.4.1";
2525

2626
@Override
2727
public String getName()

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/GeccoClientImpl.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,6 @@ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore t
104104
return hapiClientFactory;
105105
}
106106

107-
private IGenericClient createGenericClient()
108-
{
109-
IGenericClient client = clientFactory.newGenericClient(geccoServerBase);
110-
111-
configuredWithBasicAuth(client);
112-
configureBearerTokenAuthInterceptor(client);
113-
configureLoggingInterceptor(client);
114-
115-
return client;
116-
}
117-
118107
private void configuredWithBasicAuth(IGenericClient client)
119108
{
120109
if (geccoServerBasicAuthUsername != null && geccoServerBasicAuthPassword != null)
@@ -141,9 +130,8 @@ private void configureLoggingInterceptor(IGenericClient client)
141130
@Override
142131
public void testConnection()
143132
{
144-
IGenericClient client = createGenericClient();
145-
146-
CapabilityStatement statement = client.capabilities().ofType(CapabilityStatement.class).execute();
133+
CapabilityStatement statement = getGenericFhirClient().capabilities().ofType(CapabilityStatement.class)
134+
.execute();
147135

148136
logger.info("Connection test OK {} - {}", statement.getSoftware().getName(),
149137
statement.getSoftware().getVersion());
@@ -181,7 +169,13 @@ public Path getSearchBundleOverride()
181169
@Override
182170
public IGenericClient getGenericFhirClient()
183171
{
184-
return clientFactory.newGenericClient(geccoServerBase);
172+
IGenericClient client = clientFactory.newGenericClient(geccoServerBase);
173+
174+
configuredWithBasicAuth(client);
175+
configureBearerTokenAuthInterceptor(client);
176+
configureLoggingInterceptor(client);
177+
178+
return client;
185179
}
186180

187181
@Override

‎codex-process-data-transfer/src/main/resources/bpe/receive.bpmn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataReceive" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataReceive" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:startEvent id="DataReceiveMessageStartEvent" name="start data receive process">
55
<bpmn:outgoing>Flow_1gyqorb</bpmn:outgoing>
66
<bpmn:messageEventDefinition id="MessageEventDefinition_1qwi1k6" messageRef="Message_157qpi8" />

‎codex-process-data-transfer/src/main/resources/bpe/send.bpmn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataSend" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataSend" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:startEvent id="DataSendMessageStartEvent" name="start data send process">
55
<bpmn:outgoing>Flow_1km61ly</bpmn:outgoing>
66
<bpmn:messageEventDefinition id="MessageEventDefinition_07sumgd" messageRef="Message_0mcjkpi" />
@@ -20,9 +20,9 @@
2020
<bpmn:endEvent id="StartDataTranslateProcess" name="start data translate process">
2121
<bpmn:extensionElements>
2222
<camunda:inputOutput>
23-
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/0.4.0</camunda:inputParameter>
23+
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTranslate/0.4.1</camunda:inputParameter>
2424
<camunda:inputParameter name="messageName">startDataTranslate</camunda:inputParameter>
25-
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|0.4.0</camunda:inputParameter>
25+
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate|0.4.1</camunda:inputParameter>
2626
</camunda:inputOutput>
2727
</bpmn:extensionElements>
2828
<bpmn:incoming>Flow_109e2pt</bpmn:incoming>

‎codex-process-data-transfer/src/main/resources/bpe/translate.bpmn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTranslate" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTranslate" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:startEvent id="DataTranslateMessageStartEvent" name="start data translate process">
55
<bpmn:outgoing>Flow_185r1m5</bpmn:outgoing>
66
<bpmn:messageEventDefinition id="MessageEventDefinition_0nqjzhp" messageRef="Message_1nly3ld" />
@@ -24,9 +24,9 @@
2424
<bpmn:endEvent id="StartReceiveProcess" name="start receive process">
2525
<bpmn:extensionElements>
2626
<camunda:inputOutput>
27-
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/0.4.0</camunda:inputParameter>
27+
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataReceive/0.4.1</camunda:inputParameter>
2828
<camunda:inputParameter name="messageName">startDataReceive</camunda:inputParameter>
29-
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|0.4.0</camunda:inputParameter>
29+
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive|0.4.1</camunda:inputParameter>
3030
</camunda:inputOutput>
3131
</bpmn:extensionElements>
3232
<bpmn:incoming>Flow_1c2ibtj</bpmn:incoming>

‎codex-process-data-transfer/src/main/resources/bpe/trigger.bpmn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTrigger" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="wwwnetzwerk-universitaetsmedizinde_dataTrigger" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:serviceTask id="FindNewData" name="find new data" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.service.FindNewData">
55
<bpmn:incoming>Flow_0jy9ipp</bpmn:incoming>
66
<bpmn:outgoing>Flow_0xlfzol</bpmn:outgoing>
77
</bpmn:serviceTask>
88
<bpmn:sendTask id="StartSendProcess" name="start send process" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.message.StartSendProcess">
99
<bpmn:extensionElements>
1010
<camunda:inputOutput>
11-
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/0.4.0</camunda:inputParameter>
11+
<camunda:inputParameter name="instantiatesUri">http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/0.4.1</camunda:inputParameter>
1212
<camunda:inputParameter name="messageName">startDataSend</camunda:inputParameter>
13-
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|0.4.0</camunda:inputParameter>
13+
<camunda:inputParameter name="profile">http://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send|0.4.1</camunda:inputParameter>
1414
</camunda:inputOutput>
1515
<camunda:properties>
1616
<camunda:property name="dsf.end.listener" value="false" />

‎codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- status managed by bpe -->
5050
<status value="unknown" />
5151
<experimental value="false" />
52-
<date value="2021-08-25" />
52+
<date value="2021-09-06" />
5353
<publisher value="NUM-CODEX" />
5454
<contact>
5555
<name value="NUM-CODEX" />

‎codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- status managed by bpe -->
6666
<status value="unknown" />
6767
<experimental value="false" />
68-
<date value="2021-08-25" />
68+
<date value="2021-09-06" />
6969
<publisher value="NUM-CODEX" />
7070
<contact>
7171
<name value="NUM-CODEX" />

‎codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!-- status managed by bpe -->
5858
<status value="unknown" />
5959
<experimental value="false" />
60-
<date value="2021-08-25" />
60+
<date value="2021-09-06" />
6161
<publisher value="NUM-CODEX" />
6262
<contact>
6363
<name value="NUM-CODEX" />

0 commit comments

Comments
 (0)