Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/issues/20_Upgrade_to_DSF_0.5.0'
Browse files Browse the repository at this point in the history 
into develop
  • Loading branch information
@hhund
hhund committed Aug 19, 2021
2 parents 6d83f73 + 3e37a99 commit 0389149
Show file tree
Hide file tree
Showing 127 changed files with 3,070 additions and 1,622 deletions.
120 changes: 110 additions & 10 deletions dsf-bpe-process-feasibility/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/app/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
Expand All @@ -86,7 +86,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
Expand All @@ -103,7 +103,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
Expand All @@ -120,7 +120,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
Expand All @@ -137,7 +137,79 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic1</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic2</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic3</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process
</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/ttp</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process
</outputDirectory>
</configuration>
</execution>
</executions>
Expand All @@ -148,35 +220,63 @@
<configuration>
<filesets>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup/bpe/app/process</directory>
<directory>${dsf.location}/dsf-docker-test-setup/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</directory>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</directory>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</directory>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</directory>
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
Expand Down
14 changes: 8 additions & 6 deletions ...ess-feasibility/src/main/java/org/highmed/dsf/bpe/FeasibilityProcessPluginDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.highmed.dsf.fhir.resources.ResourceProvider;
import org.highmed.dsf.fhir.resources.StructureDefinitionResource;
import org.highmed.dsf.fhir.resources.ValueSetResource;
import org.springframework.core.env.PropertyResolver;

import ca.uhn.fhir.context.FhirContext;

Expand Down Expand Up @@ -45,7 +46,8 @@ public Stream<Class<?>> getSpringConfigClasses()
}

@Override
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader)
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader,
PropertyResolver resolver)
{
var aCom = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-computeFeasibility.xml");
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-executeFeasibility.xml");
Expand All @@ -64,12 +66,12 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader

var vF = ValueSetResource.file("fhir/ValueSet/highmed-feasibility.xml");

Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of("computeFeasibility/" + VERSION,
Arrays.asList(aCom, cF, sTCom, sTResS, vF), "executeFeasibility/" + VERSION,
Arrays.asList(aExe, cF, sTExe, vF), "requestFeasibility/" + VERSION,
Arrays.asList(aReq, cF, sTReq, sTResM, sTErr, vF));
Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
"highmedorg_computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sTCom, sTResS, vF),
"highmedorg_executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, sTExe, vF),
"highmedorg_requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, sTReq, sTResM, sTErr, vF));

return ResourceProvider.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
classLoader, resourcesByProcessKeyAndVersion);
classLoader, resolver, resourcesByProcessKeyAndVersion);
}
}
5 changes: 3 additions & 2 deletions dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMedicRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.organization.OrganizationProvider;
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
Expand All @@ -28,9 +29,9 @@
public class SendMedicRequest extends AbstractTaskMessageSend
{
public SendMedicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
OrganizationProvider organizationProvider, FhirContext fhirContext)
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
{
super(clientProvider, taskHelper, organizationProvider, fhirContext);
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...e-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMultiMedicErrors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.stream.Stream;

import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.organization.OrganizationProvider;
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
Expand All @@ -20,9 +21,9 @@
public class SendMultiMedicErrors extends AbstractTaskMessageSend
{
public SendMultiMedicErrors(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
OrganizationProvider organizationProvider, FhirContext fhirContext)
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
{
super(clientProvider, taskHelper, organizationProvider, fhirContext);
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMultiMedicResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.organization.OrganizationProvider;
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
Expand All @@ -29,9 +30,9 @@
public class SendMultiMedicResults extends AbstractTaskMessageSend
{
public SendMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
OrganizationProvider organizationProvider, FhirContext fhirContext)
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
{
super(clientProvider, taskHelper, organizationProvider, fhirContext);
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendSingleMedicResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.organization.OrganizationProvider;
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
Expand All @@ -29,9 +30,9 @@ public class SendSingleMedicResults extends AbstractTaskMessageSend
private static final Logger logger = LoggerFactory.getLogger(SendSingleMedicResults.class);

public SendSingleMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
OrganizationProvider organizationProvider, FhirContext fhirContext)
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
{
super(clientProvider, taskHelper, organizationProvider, fhirContext);
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendTtpRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.stream.Stream;

import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.organization.OrganizationProvider;
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
Expand All @@ -21,9 +22,9 @@
public class SendTtpRequest extends AbstractTaskMessageSend
{
public SendTtpRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
OrganizationProvider organizationProvider, FhirContext fhirContext)
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
{
super(clientProvider, taskHelper, organizationProvider, fhirContext);
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...ess-feasibility/src/main/java/org/highmed/dsf/bpe/service/CalculateMultiMedicResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResultsValues;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.task.TaskHelper;

public class CalculateMultiMedicResults extends AbstractServiceDelegate
{
public CalculateMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
public CalculateMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
ReadAccessHelper readAccessHelper)
{
super(clientProvider, taskHelper);
super(clientProvider, taskHelper, readAccessHelper);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...cess-feasibility/src/main/java/org/highmed/dsf/bpe/service/CheckFeasibilityResources.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.task.TaskHelper;
import org.highmed.dsf.fhir.variables.FhirResourcesList;
Expand All @@ -20,9 +21,10 @@

public class CheckFeasibilityResources extends AbstractServiceDelegate
{
public CheckFeasibilityResources(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
public CheckFeasibilityResources(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
ReadAccessHelper readAccessHelper)
{
super(clientProvider, taskHelper);
super(clientProvider, taskHelper, readAccessHelper);
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...process-feasibility/src/main/java/org/highmed/dsf/bpe/service/CheckMultiMedicResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
import org.highmed.dsf.fhir.task.TaskHelper;
import org.hl7.fhir.r4.model.Extension;
Expand All @@ -25,9 +26,10 @@

public class CheckMultiMedicResults extends AbstractServiceDelegate
{
public CheckMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
public CheckMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
ReadAccessHelper readAccessHelper)
{
super(clientProvider, taskHelper);
super(clientProvider, taskHelper, readAccessHelper);
}

@Override
Expand Down
Loading

0 comments on commit 0389149

Please sign in to comment.