use constants as well in processes

Author: wetret

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

@@ -1,5 +1,7 @@
 package org.highmed.dsf.bpe.service;
 
+import static org.highmed.dsf.bpe.ConstantsBase.ORGANIZATION_IDENTIFIER_SYSTEM;
+
 import java.util.List;
 
 import org.camunda.bpm.engine.delegate.DelegateExecution;
@@ -38,7 +40,7 @@ private void checkNumberOfParticipatingMedics(ResearchStudy researchStudy)
 		long medics = researchStudy.getExtensionsByUrl(ConstantsFeasibility.EXTENSION_PARTICIPATING_MEDIC_URI).stream()
 				.filter(e -> e.getValue() instanceof Reference).map(e -> (Reference) e.getValue())
 				.map(r -> r.getIdentifier())
-				.filter(i -> "http://highmed.org/fhir/NamingSystem/organization-identifier".equals(i.getSystem()))
+				.filter(i -> ORGANIZATION_IDENTIFIER_SYSTEM.equals(i.getSystem()))
 				.map(i -> i.getValue()).distinct().count();
 
 		if (medics < ConstantsFeasibility.MIN_PARTICIPATING_MEDICS)

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

@@ -1,5 +1,7 @@
 package org.highmed.dsf.bpe.service;
 
+import static org.highmed.dsf.bpe.variables.ConstantsFeasibility.EXTENSION_PARTICIPATING_TTP_URI;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -150,8 +152,7 @@ private List<Group> getCohortDefinitions(Bundle bundle, String baseUrl)
 
 	private String getTtpIdentifier(ResearchStudy researchStudy, FhirWebserviceClient client)
 	{
-		Extension ext = researchStudy
-				.getExtensionByUrl("http://highmed.org/fhir/StructureDefinition/participating-ttp");
+		Extension ext = researchStudy.getExtensionByUrl(EXTENSION_PARTICIPATING_TTP_URI);
 		Reference ref = (Reference) ext.getValue();
 		return ref.getIdentifier().getValue();
 	}

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

@@ -1,5 +1,8 @@
 package org.highmed.dsf.bpe.service;
 
+import static org.highmed.dsf.bpe.ConstantsBase.ORGANIZATION_IDENTIFIER_SYSTEM;
+import static org.highmed.dsf.bpe.ConstantsBase.ORGANIZATION_TYPE_MEDIC;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -15,6 +18,7 @@
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.ResearchStudy;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,9 +92,9 @@ private ResearchStudy getResearchStudy(IdType researchStudyid, FhirWebserviceCli
 
 	private ResearchStudy addMissingOrganizations(ResearchStudy researchStudy, FhirWebserviceClient client)
 	{
-		List<String> identifiers = organizationProvider.getOrganizationsByType("MeDIC")
+		List<String> identifiers = organizationProvider.getOrganizationsByType(ORGANIZATION_TYPE_MEDIC)
 				.flatMap(o -> o.getIdentifier().stream())
-				.filter(i -> "http://highmed.org/fhir/NamingSystem/organization-identifier".equals(i.getSystem()))
+				.filter(i -> ORGANIZATION_IDENTIFIER_SYSTEM.equals(i.getSystem()))
 				.map(i -> i.getValue()).collect(Collectors.toList());
 
 		List<String> existingIdentifiers = researchStudy
@@ -108,8 +112,8 @@ private ResearchStudy addMissingOrganizations(ResearchStudy researchStudy, FhirW
 						identifier, researchStudy.getId());
 
 				researchStudy.addExtension().setUrl(ConstantsFeasibility.EXTENSION_PARTICIPATING_MEDIC_URI).setValue(
-						new Reference().setType("Organization").setIdentifier(new Identifier()
-								.setSystem("http://highmed.org/fhir/NamingSystem/organization-identifier")
+						new Reference().setType(ResourceType.Organization.name()).setIdentifier(new Identifier()
+								.setSystem(ORGANIZATION_IDENTIFIER_SYSTEM)
 								.setValue(identifier)));
 
 			});

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

@@ -1,5 +1,7 @@
 package org.highmed.dsf.bpe.service;
 
+import static org.highmed.dsf.bpe.ConstantsBase.ORGANIZATION_IDENTIFIER_SYSTEM;
+
 import java.security.Key;
 import java.util.List;
 import java.util.Objects;
@@ -28,6 +30,7 @@
 import org.hl7.fhir.r4.model.Binary;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Reference;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -147,13 +150,13 @@ protected String saveResultSetAsBinaryForTtp(ResultSet resultSet, String securit
 	{
 		byte[] content = serializeResultSet(resultSet);
 		Reference securityContext = new Reference();
-		securityContext.setType("Organization").getIdentifier()
-				.setSystem("http://highmed.org/fhir/NamingSystem/organization-identifier").setValue(securityIdentifier);
+		securityContext.setType(ResourceType.Organization.name()).getIdentifier()
+				.setSystem(ORGANIZATION_IDENTIFIER_SYSTEM).setValue(securityIdentifier);
 		Binary binary = new Binary().setContentType(ConstantsBase.OPENEHR_MIMETYPE_JSON)
 				.setSecurityContext(securityContext).setData(content);
 
 		IdType created = createBinaryResource(binary);
-		return new IdType(getFhirWebserviceClientProvider().getLocalBaseUrl(), "Binary", created.getIdPart(),
+		return new IdType(getFhirWebserviceClientProvider().getLocalBaseUrl(), ResourceType.Binary.name(), created.getIdPart(),
 				created.getVersionIdPart()).getValue();
 	}
 

dsf-bpe-process-local-services/src/main/java/org/highmed/dsf/bpe/service/ExtractInputValues.java

@@ -1,5 +1,7 @@
 package org.highmed.dsf.bpe.service;
 
+import static org.highmed.dsf.bpe.ConstantsBase.EXTENSION_QUERY_URI;
+
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -61,7 +63,7 @@ private List<Group> getCohortDefinitions(Stream<String> queries)
 		return queries.map(q -> {
 			Group group = new Group();
 			group.setIdElement(new IdType(UUID.randomUUID().toString()));
-			group.addExtension().setUrl("http://highmed.org/fhir/StructureDefinition/query").setValue(
+			group.addExtension().setUrl(EXTENSION_QUERY_URI).setValue(
 					new Expression().setLanguageElement(ConstantsBase.AQL_QUERY_TYPE).setExpression(q));
 			return group;
 		}).collect(Collectors.toList());