Skip to content

Commit 6e41024

Browse files
wetretwetret
committed
moves generally valid profiles to fhir-validation, use static imports for constants
1 parent 136a573 commit 6e41024

File tree

45 files changed

+365
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+365
-830
lines changed

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/ConstantsFeasibility.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ public interface ConstantsFeasibility
3434
String CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_MULTI_MEDIC_RESULT = "multi-medic-result";
3535
String CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE = "research-study-reference";
3636

37-
String EXTENSION_HIGHMED_PARTICIPATING_MEDIC = "http://highmed.org/fhir/StructureDefinition/extension-participating-medic";
38-
String EXTENSION_HIGHMED_PARTICIPATING_TTP = "http://highmed.org/fhir/StructureDefinition/extension-participating-ttp";
39-
String EXTENSION_HIGHMED_GROUP_ID = "http://highmed.org/fhir/StructureDefinition/extension-group-id";
40-
41-
String PROFILE_HIGHMED_GROUP = "http://highmed.org/fhir/StructureDefinition/group";
42-
String PROFILE_HIGHEMD_RESEARCH_STUDY_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/research-study-feasibility";
43-
4437
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-request-feasibility";
4538
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "requestFeasibility/";
4639
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
@@ -69,6 +62,4 @@ public interface ConstantsFeasibility
6962

7063
String PROFILE_HIGHMED_TASK_ERROR_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-feasibility";
7164
String PROFILE_HIGHMED_TASK_ERROR_FEASIBILITY_MESSAGE_NAME = "errorMultiMedicFeasibilityMessage";
72-
73-
String NAMINGSYSTEM_HIGHMED_RESEARCH_STUDY_IDENTIFIER = "http://highmed.org/fhir/NamingSystem/research-study-identifier";
7465
}

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/FeasibilityProcessPluginDefinition.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,7 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
5353
var aReq = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-requestFeasibility.xml");
5454

5555
var cF = CodeSystemResource.file("fhir/CodeSystem/highmed-feasibility.xml");
56-
var cQT = CodeSystemResource.file("fhir/CodeSystem/highmed-query-type.xml");
5756

58-
var n = NamingSystemResource.file("fhir/NamingSystem/highmed-research-study-identifier.xml");
59-
60-
var sExtG = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-extension-group-id.xml");
61-
var sExtPartMeDic = StructureDefinitionResource
62-
.file("fhir/StructureDefinition/highmed-extension-participating-medic.xml");
63-
var sExtPartTtp = StructureDefinitionResource
64-
.file("fhir/StructureDefinition/highmed-extension-participating-ttp.xml");
65-
var sExtQ = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-extension-query.xml");
66-
var sG = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-group.xml");
67-
var sR = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-research-study-feasibility.xml");
6857
var sTCom = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-compute-feasibility.xml");
6958
var sTErr = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-error-feasibility.xml");
7059
var sTExe = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-execute-feasibility.xml");
@@ -75,12 +64,11 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
7564
.file("fhir/StructureDefinition/highmed-task-single-medic-result-feasibility.xml");
7665

7766
var vF = ValueSetResource.file("fhir/ValueSet/highmed-feasibility.xml");
78-
var vQT = ValueSetResource.file("fhir/ValueSet/highmed-query-type.xml");
7967

8068
Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
81-
"computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sExtG, sG, sTCom, sTResS, vF),
82-
"executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, cQT, n, sR, sExtPartMeDic, sExtPartTtp, sExtQ, sG, sTExe, vF, vQT),
83-
"requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, cQT, n, sExtG, sExtPartMeDic, sExtPartTtp, sG, sR, sExtQ, sTReq, sTResM, sTErr, vF, vQT));
69+
"computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sTCom, sTResS, vF),
70+
"executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, sTExe, vF),
71+
"requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, sTReq, sTResM, sTErr, vF));
8472

8573
return ResourceProvider
8674
.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false), classLoader,

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMedicRequest.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
package org.highmed.dsf.bpe.message;
22

3+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_BLOOM_FILTER_CONFIG;
4+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK;
5+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE;
6+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_RESEARCH_STUDY;
7+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY;
8+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_BLOOM_FILTER_CONFIG;
9+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK;
10+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE;
11+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE;
12+
313
import java.util.stream.Stream;
414

515
import org.camunda.bpm.engine.delegate.DelegateExecution;
6-
import org.highmed.dsf.bpe.ConstantsFeasibility;
716
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
817
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
918
import org.highmed.dsf.fhir.organization.OrganizationProvider;
@@ -27,38 +36,30 @@ public SendMedicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper
2736
@Override
2837
protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
2938
{
30-
ResearchStudy researchStudy = (ResearchStudy) execution
31-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_RESEARCH_STUDY);
39+
ResearchStudy researchStudy = (ResearchStudy) execution.getVariable(BPMN_EXECUTION_VARIABLE_RESEARCH_STUDY);
3240
IdType researchStudyId = new IdType(
3341
getFhirWebserviceClientProvider().getLocalBaseUrl() + "/" + researchStudy.getId());
3442

35-
ParameterComponent inputResearchStudyReference = getTaskHelper()
36-
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
37-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE,
38-
new Reference().setReference(researchStudyId.toVersionless().getValueAsString()));
43+
ParameterComponent inputResearchStudyReference = getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
44+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE,
45+
new Reference().setReference(researchStudyId.toVersionless().getValueAsString()));
3946

40-
boolean needsConsentCheck = (boolean) execution
41-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK);
47+
boolean needsConsentCheck = (boolean) execution.getVariable(BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK);
4248
ParameterComponent inputNeedsConsentCheck = getTaskHelper()
43-
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
44-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK,
49+
.createInput(CODESYSTEM_HIGHMED_FEASIBILITY, CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK,
4550
needsConsentCheck);
4651

47-
boolean needsRecordLinkage = (boolean) execution
48-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
52+
boolean needsRecordLinkage = (boolean) execution.getVariable(BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
4953
ParameterComponent inputNeedsRecordLinkage = getTaskHelper()
50-
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
51-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
54+
.createInput(CODESYSTEM_HIGHMED_FEASIBILITY, CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
5255
needsRecordLinkage);
5356

5457
if (needsRecordLinkage)
5558
{
5659
BloomFilterConfig bloomFilterConfig = (BloomFilterConfig) execution
57-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_BLOOM_FILTER_CONFIG);
58-
ParameterComponent inputBloomFilterConfig = getTaskHelper()
59-
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
60-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_BLOOM_FILTER_CONFIG,
61-
bloomFilterConfig.toBytes());
60+
.getVariable(BPMN_EXECUTION_VARIABLE_BLOOM_FILTER_CONFIG);
61+
ParameterComponent inputBloomFilterConfig = getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
62+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_BLOOM_FILTER_CONFIG, bloomFilterConfig.toBytes());
6263

6364
return Stream.of(inputResearchStudyReference, inputNeedsConsentCheck, inputNeedsRecordLinkage,
6465
inputBloomFilterConfig);

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMultiMedicResults.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import static org.highmed.dsf.bpe.ConstantsBase.CODESYSTEM_HIGHMED_BPMN;
44
import static org.highmed.dsf.bpe.ConstantsBase.CODESYSTEM_HIGHMED_BPMN_VALUE_ERROR;
5+
import static org.highmed.dsf.bpe.ConstantsBase.EXTENSION_HIGHMED_GROUP_ID;
6+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS;
7+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY;
8+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_MULTI_MEDIC_RESULT;
9+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDICS_COUNT;
510

611
import java.util.List;
712
import java.util.stream.Stream;
@@ -34,7 +39,7 @@ public SendMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHe
3439
protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
3540
{
3641
FinalFeasibilityQueryResults results = (FinalFeasibilityQueryResults) execution
37-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS);
42+
.getVariable(BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS);
3843

3944
Stream<ParameterComponent> resultInputs = results.getResults().stream().flatMap(this::toInputs);
4045
Stream<ParameterComponent> errorInput = getErrorInput(execution);
@@ -45,14 +50,14 @@ protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecut
4550
private Stream<ParameterComponent> toInputs(FinalFeasibilityQueryResult result)
4651
{
4752
ParameterComponent input1 = getTaskHelper()
48-
.createInputUnsignedInt(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
49-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_MULTI_MEDIC_RESULT,
53+
.createInputUnsignedInt(CODESYSTEM_HIGHMED_FEASIBILITY,
54+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_MULTI_MEDIC_RESULT,
5055
result.getCohortSize());
5156
input1.addExtension(createCohortIdExtension(result.getCohortId()));
5257

5358
ParameterComponent input2 = getTaskHelper()
54-
.createInputUnsignedInt(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
55-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDICS_COUNT,
59+
.createInputUnsignedInt(CODESYSTEM_HIGHMED_FEASIBILITY,
60+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDICS_COUNT,
5661
result.getParticipatingMedics());
5762
input2.addExtension(createCohortIdExtension(result.getCohortId()));
5863

@@ -61,7 +66,7 @@ private Stream<ParameterComponent> toInputs(FinalFeasibilityQueryResult result)
6166

6267
private Extension createCohortIdExtension(String cohortId)
6368
{
64-
return new Extension(ConstantsFeasibility.EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
69+
return new Extension(EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
6570
}
6671

6772
private Stream<ParameterComponent> getErrorInput(DelegateExecution execution)

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendSingleMedicResults.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package org.highmed.dsf.bpe.message;
22

3+
import static org.highmed.dsf.bpe.ConstantsBase.EXTENSION_HIGHMED_GROUP_ID;
4+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_QUERY_RESULTS;
5+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY;
6+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT;
7+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT_REFERENCE;
8+
39
import java.util.stream.Stream;
410

511
import org.camunda.bpm.engine.delegate.DelegateExecution;
6-
import org.highmed.dsf.bpe.ConstantsFeasibility;
712
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
813
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
914
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
@@ -33,7 +38,7 @@ public SendSingleMedicResults(FhirWebserviceClientProvider clientProvider, TaskH
3338
protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
3439
{
3540
FeasibilityQueryResults results = (FeasibilityQueryResults) execution
36-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_QUERY_RESULTS);
41+
.getVariable(BPMN_EXECUTION_VARIABLE_QUERY_RESULTS);
3742

3843
return results.getResults().stream().map(result -> toInput(result));
3944
}
@@ -42,17 +47,15 @@ private Task.ParameterComponent toInput(FeasibilityQueryResult result)
4247
{
4348
if (result.isCohortSizeResult())
4449
{
45-
ParameterComponent input = getTaskHelper()
46-
.createInputUnsignedInt(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
47-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT,
48-
result.getCohortSize());
50+
ParameterComponent input = getTaskHelper().createInputUnsignedInt(CODESYSTEM_HIGHMED_FEASIBILITY,
51+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT, result.getCohortSize());
4952
input.addExtension(createCohortIdExtension(result.getCohortId()));
5053
return input;
5154
}
5255
else if (result.isIdResultSetUrlResult())
5356
{
54-
ParameterComponent input = getTaskHelper().createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
55-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT_REFERENCE,
57+
ParameterComponent input = getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
58+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_SINGLE_MEDIC_RESULT_REFERENCE,
5659
new Reference(result.getResultSetUrl()));
5760
input.addExtension(createCohortIdExtension(result.getCohortId()));
5861
return input;
@@ -69,6 +72,6 @@ else if (result.isIdResultSetUrlResult())
6972

7073
private Extension createCohortIdExtension(String cohortId)
7174
{
72-
return new Extension(ConstantsFeasibility.EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
75+
return new Extension(EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
7376
}
7477
}

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendTtpRequest.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package org.highmed.dsf.bpe.message;
22

3+
import static org.highmed.dsf.bpe.ConstantsBase.BPMN_EXECUTION_VARIABLE_TARGETS;
4+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE;
5+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY;
6+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE;
7+
import static org.highmed.dsf.bpe.ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDIC_CORRELATION_KEY;
8+
39
import java.util.stream.Stream;
410

511
import org.camunda.bpm.engine.delegate.DelegateExecution;
6-
import org.highmed.dsf.bpe.ConstantsBase;
7-
import org.highmed.dsf.bpe.ConstantsFeasibility;
812
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
913
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1014
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -25,18 +29,16 @@ public SendTtpRequest(FhirWebserviceClientProvider clientProvider, TaskHelper ta
2529
@Override
2630
protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
2731
{
28-
Targets multiInstanceTargets = (Targets) execution.getVariable(ConstantsBase.BPMN_EXECUTION_VARIABLE_TARGETS);
32+
Targets multiInstanceTargets = (Targets) execution.getVariable(BPMN_EXECUTION_VARIABLE_TARGETS);
2933

3034
Stream<Task.ParameterComponent> inputTargets = multiInstanceTargets.getEntries().stream()
31-
.map(target -> getTaskHelper().createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
32-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDIC_CORRELATION_KEY,
35+
.map(target -> getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
36+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDIC_CORRELATION_KEY,
3337
target.getCorrelationKey()));
3438

35-
boolean needsRecordLinkage = (boolean) execution
36-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
39+
boolean needsRecordLinkage = (boolean) execution.getVariable(BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
3740
Task.ParameterComponent inputNeedsRecordLinkage = getTaskHelper()
38-
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
39-
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
41+
.createInput(CODESYSTEM_HIGHMED_FEASIBILITY, CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
4042
needsRecordLinkage);
4143

4244
return Stream.concat(inputTargets, Stream.of(inputNeedsRecordLinkage));

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/service/CalculateMultiMedicResults.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.highmed.dsf.bpe.service;
22

3+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS;
4+
import static org.highmed.dsf.bpe.ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_QUERY_RESULTS;
5+
36
import java.util.List;
47
import java.util.Map;
58
import java.util.stream.Collectors;
69

710
import org.camunda.bpm.engine.delegate.DelegateExecution;
8-
import org.highmed.dsf.bpe.ConstantsFeasibility;
911
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
1012
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
1113
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
@@ -26,11 +28,11 @@ public CalculateMultiMedicResults(FhirWebserviceClientProvider clientProvider, T
2628
protected void doExecute(DelegateExecution execution) throws Exception
2729
{
2830
List<FeasibilityQueryResult> results = ((FeasibilityQueryResults) execution
29-
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_QUERY_RESULTS)).getResults();
31+
.getVariable(BPMN_EXECUTION_VARIABLE_QUERY_RESULTS)).getResults();
3032

3133
List<FinalFeasibilityQueryResult> finalResults = calculateResults(results);
3234

33-
execution.setVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS,
35+
execution.setVariable(BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS,
3436
FinalFeasibilityQueryResultsValues.create(new FinalFeasibilityQueryResults(finalResults)));
3537
}
3638

0 commit comments

Comments
 (0)