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

Commit afcdbae

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issues/100_upgrade_to_dsf_0.9.0'
into develop
2 parents 7891db6 + e3b9c9b commit afcdbae

32 files changed

Lines changed: 101 additions & 131 deletions

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

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,27 @@
22

33
import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_RETURN_TARGET;
44

5-
import java.util.stream.Stream;
6-
5+
import org.camunda.bpm.engine.delegate.DelegateExecution;
76
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
87
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
98
import org.highmed.dsf.fhir.organization.OrganizationProvider;
109
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
1110
import org.highmed.dsf.fhir.task.TaskHelper;
1211
import org.highmed.dsf.fhir.variables.Target;
13-
import org.hl7.fhir.r4.model.Task.ParameterComponent;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1612

1713
import ca.uhn.fhir.context.FhirContext;
1814

1915
public class ContinueSendProcess extends AbstractTaskMessageSend
2016
{
21-
private static final Logger logger = LoggerFactory.getLogger(ContinueSendProcess.class);
22-
2317
public ContinueSendProcess(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
2418
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
2519
{
2620
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2721
}
2822

2923
@Override
30-
protected Target getTarget()
24+
protected Target getTarget(DelegateExecution execution)
3125
{
32-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
33-
}
34-
35-
@Override
36-
protected void sendTask(Target target, String instantiatesUri, String messageName, String businessKey,
37-
String profile, Stream<ParameterComponent> additionalInputParameters)
38-
{
39-
// TODO implement continue send
40-
logger.debug("implement continue send");
41-
42-
super.sendTask(target, instantiatesUri, messageName, businessKey, profile, additionalInputParameters);
26+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4327
}
4428
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public void afterPropertiesSet() throws Exception
4343
}
4444

4545
@Override
46-
protected Target getTarget()
46+
protected Target getTarget(DelegateExecution execution)
4747
{
48-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
48+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4949
}
5050

5151
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public ContinueSendProcessWithValidationError(FhirWebserviceClientProvider clien
2929
}
3030

3131
@Override
32-
protected Target getTarget()
32+
protected Target getTarget(DelegateExecution execution)
3333
{
34-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
34+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3535
}
3636

3737
@Override

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,27 @@
22

33
import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_RETURN_TARGET;
44

5-
import java.util.stream.Stream;
6-
5+
import org.camunda.bpm.engine.delegate.DelegateExecution;
76
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
87
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
98
import org.highmed.dsf.fhir.organization.OrganizationProvider;
109
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
1110
import org.highmed.dsf.fhir.task.TaskHelper;
1211
import org.highmed.dsf.fhir.variables.Target;
13-
import org.hl7.fhir.r4.model.Task.ParameterComponent;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
1612

1713
import ca.uhn.fhir.context.FhirContext;
1814

1915
public class ContinueTranslateProcess extends AbstractTaskMessageSend
2016
{
21-
private static final Logger logger = LoggerFactory.getLogger(ContinueTranslateProcess.class);
22-
2317
public ContinueTranslateProcess(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
2418
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
2519
{
2620
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2721
}
2822

2923
@Override
30-
protected Target getTarget()
31-
{
32-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
33-
}
34-
35-
@Override
36-
protected void sendTask(Target target, String instantiatesUri, String messageName, String businessKey,
37-
String profile, Stream<ParameterComponent> additionalInputParameters)
24+
protected Target getTarget(DelegateExecution execution)
3825
{
39-
40-
// TODO implement continue translate
41-
logger.debug("implement continue translate");
42-
43-
super.sendTask(target, instantiatesUri, messageName, businessKey, profile, additionalInputParameters);
26+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4427
}
4528
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public void afterPropertiesSet() throws Exception
4343
}
4444

4545
@Override
46-
protected Target getTarget()
46+
protected Target getTarget(DelegateExecution execution)
4747
{
48-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
48+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
4949
}
5050

5151
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public ContinueTranslateProcessWithValidationError(FhirWebserviceClientProvider
3030
}
3131

3232
@Override
33-
protected Target getTarget()
33+
protected Target getTarget(DelegateExecution execution)
3434
{
35-
return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
35+
return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET);
3636
}
3737

3838
@Override

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecut
4444
}
4545

4646
@Override
47-
protected void sendTask(Target target, String instantiatesUri, String messageName, String businessKey,
48-
String profile, Stream<ParameterComponent> additionalInputParameters)
47+
protected void sendTask(DelegateExecution execution, Target target, String instantiatesUri, String messageName,
48+
String businessKey, String profile, Stream<ParameterComponent> additionalInputParameters)
4949
{
50-
String crrBusinessKey = createAndSaveAlternativeBusinessKey();
50+
String crrBusinessKey = createAndSaveAlternativeBusinessKey(execution);
5151

5252
logger.debug("DIC businessKey {}, CRR businessKey {}", businessKey, crrBusinessKey);
5353

54-
super.sendTask(target, instantiatesUri, messageName, crrBusinessKey, profile, additionalInputParameters);
54+
super.sendTask(execution, target, instantiatesUri, messageName, crrBusinessKey, profile,
55+
additionalInputParameters);
5556
}
5657

5758
private ParameterComponent pseudonymParameter(DelegateExecution execution)
@@ -82,7 +83,7 @@ private ParameterComponent dataReferenceParameter(DelegateExecution execution)
8283
}
8384

8485
@Override
85-
protected void handleSendTaskError(Exception exception, String errorMessage)
86+
protected void handleSendTaskError(DelegateExecution execution, Exception exception, String errorMessage)
8687
{
8788
throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_CRR_NOT_REACHABLE,
8889
"Error while sending Task to CRR: " + exception.getMessage());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public StartSendProcess(FhirWebserviceClientProvider clientProvider, TaskHelper
4646
}
4747

4848
@Override
49-
protected void sendTask(Target target, String instantiatesUri, String messageName, String businessKey,
50-
String profile, Stream<ParameterComponent> additionalInputParameters)
49+
protected void sendTask(DelegateExecution execution, Target target, String instantiatesUri, String messageName,
50+
String businessKey, String profile, Stream<ParameterComponent> additionalInputParameters)
5151
{
5252
// can't use same business key as trigger process
53-
super.sendTask(target, instantiatesUri, messageName, UUID.randomUUID().toString(), profile,
53+
super.sendTask(execution, target, instantiatesUri, messageName, UUID.randomUUID().toString(), profile,
5454
additionalInputParameters);
5555
}
5656

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private ParameterComponent dataReferenceParameter(DelegateExecution execution)
6868
}
6969

7070
@Override
71-
protected void handleSendTaskError(Exception exception, String errorMessage)
71+
protected void handleSendTaskError(DelegateExecution execution, Exception exception, String errorMessage)
7272
{
7373
throw new BpmnError(CODESYSTEM_NUM_CODEX_DATA_TRANSFER_ERROR_VALUE_GTH_NOT_REACHABLE,
7474
"Error while sending Task to GTH: " + exception.getMessage());

‎codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/receive/DecryptData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private void decryptGeccoData(DelegateExecution execution)
8585
throws InvalidKeyException, BadPaddingException, IllegalBlockSizeException, NoSuchPaddingException,
8686
NoSuchAlgorithmException, InvalidAlgorithmParameterException, IOException
8787
{
88-
Task task = getCurrentTaskFromExecutionVariables();
88+
Task task = getCurrentTaskFromExecutionVariables(execution);
8989
Optional<String> pseudonym = getPseudonym(task);
9090

9191
byte[] encrypted = (byte[]) execution.getVariable(BPMN_EXECUTION_VARIABLE_BUNDLE);

0 commit comments

Comments
 (0)