Skip to content

Commit 0389149

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issues/20_Upgrade_to_DSF_0.5.0'
into develop
2 parents 6d83f73 + 3e37a99 commit 0389149

File tree

127 files changed

+3070
-1622
lines changed

Some content is hidden

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

127 files changed

+3070
-1622
lines changed

‎dsf-bpe-process-feasibility/pom.xml‎

Lines changed: 110 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<version>${project.version}</version>
7070
</artifactItem>
7171
</artifactItems>
72-
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/app/process</outputDirectory>
72+
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/process</outputDirectory>
7373
</configuration>
7474
</execution>
7575
<execution>
@@ -86,7 +86,7 @@
8686
<version>${project.version}</version>
8787
</artifactItem>
8888
</artifactItems>
89-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</outputDirectory>
89+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</outputDirectory>
9090
</configuration>
9191
</execution>
9292
<execution>
@@ -103,7 +103,7 @@
103103
<version>${project.version}</version>
104104
</artifactItem>
105105
</artifactItems>
106-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</outputDirectory>
106+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</outputDirectory>
107107
</configuration>
108108
</execution>
109109
<execution>
@@ -120,7 +120,7 @@
120120
<version>${project.version}</version>
121121
</artifactItem>
122122
</artifactItems>
123-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</outputDirectory>
123+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</outputDirectory>
124124
</configuration>
125125
</execution>
126126
<execution>
@@ -137,7 +137,79 @@
137137
<version>${project.version}</version>
138138
</artifactItem>
139139
</artifactItems>
140-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</outputDirectory>
140+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</outputDirectory>
141+
</configuration>
142+
</execution>
143+
<execution>
144+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic1</id>
145+
<phase>package</phase>
146+
<goals>
147+
<goal>copy</goal>
148+
</goals>
149+
<configuration>
150+
<artifactItems>
151+
<artifactItem>
152+
<groupId>${project.groupId}</groupId>
153+
<artifactId>${project.artifactId}</artifactId>
154+
<version>${project.version}</version>
155+
</artifactItem>
156+
</artifactItems>
157+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process
158+
</outputDirectory>
159+
</configuration>
160+
</execution>
161+
<execution>
162+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic2</id>
163+
<phase>package</phase>
164+
<goals>
165+
<goal>copy</goal>
166+
</goals>
167+
<configuration>
168+
<artifactItems>
169+
<artifactItem>
170+
<groupId>${project.groupId}</groupId>
171+
<artifactId>${project.artifactId}</artifactId>
172+
<version>${project.version}</version>
173+
</artifactItem>
174+
</artifactItems>
175+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process
176+
</outputDirectory>
177+
</configuration>
178+
</execution>
179+
<execution>
180+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic3</id>
181+
<phase>package</phase>
182+
<goals>
183+
<goal>copy</goal>
184+
</goals>
185+
<configuration>
186+
<artifactItems>
187+
<artifactItem>
188+
<groupId>${project.groupId}</groupId>
189+
<artifactId>${project.artifactId}</artifactId>
190+
<version>${project.version}</version>
191+
</artifactItem>
192+
</artifactItems>
193+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process
194+
</outputDirectory>
195+
</configuration>
196+
</execution>
197+
<execution>
198+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/ttp</id>
199+
<phase>package</phase>
200+
<goals>
201+
<goal>copy</goal>
202+
</goals>
203+
<configuration>
204+
<artifactItems>
205+
<artifactItem>
206+
<groupId>${project.groupId}</groupId>
207+
<artifactId>${project.artifactId}</artifactId>
208+
<version>${project.version}</version>
209+
</artifactItem>
210+
</artifactItems>
211+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process
212+
</outputDirectory>
141213
</configuration>
142214
</execution>
143215
</executions>
@@ -148,35 +220,63 @@
148220
<configuration>
149221
<filesets>
150222
<fileset>
151-
<directory>${dsf.location}/dsf-docker-test-setup/bpe/app/process</directory>
223+
<directory>${dsf.location}/dsf-docker-test-setup/bpe/process</directory>
224+
<includes>
225+
<include>${project.artifactId}-${project.version}.jar</include>
226+
</includes>
227+
<followSymlinks>false</followSymlinks>
228+
</fileset>
229+
<fileset>
230+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</directory>
231+
<includes>
232+
<include>${project.artifactId}-${project.version}.jar</include>
233+
</includes>
234+
<followSymlinks>false</followSymlinks>
235+
</fileset>
236+
<fileset>
237+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</directory>
238+
<includes>
239+
<include>${project.artifactId}-${project.version}.jar</include>
240+
</includes>
241+
<followSymlinks>false</followSymlinks>
242+
</fileset>
243+
<fileset>
244+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</directory>
245+
<includes>
246+
<include>${project.artifactId}-${project.version}.jar</include>
247+
</includes>
248+
<followSymlinks>false</followSymlinks>
249+
</fileset>
250+
<fileset>
251+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</directory>
152252
<includes>
153253
<include>${project.artifactId}-${project.version}.jar</include>
154254
</includes>
155255
<followSymlinks>false</followSymlinks>
156256
</fileset>
157257
<fileset>
158-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</directory>
258+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process</directory>
159259
<includes>
160260
<include>${project.artifactId}-${project.version}.jar</include>
161261
</includes>
162262
<followSymlinks>false</followSymlinks>
163263
</fileset>
164264
<fileset>
165-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</directory>
265+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process</directory>
166266
<includes>
167267
<include>${project.artifactId}-${project.version}.jar</include>
168268
</includes>
169269
<followSymlinks>false</followSymlinks>
170270
</fileset>
171271
<fileset>
172-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</directory>
272+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process</directory>
173273
<includes>
174274
<include>${project.artifactId}-${project.version}.jar</include>
175275
</includes>
176276
<followSymlinks>false</followSymlinks>
177277
</fileset>
178278
<fileset>
179-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</directory>
279+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process</directory>
180280
<includes>
181281
<include>${project.artifactId}-${project.version}.jar</include>
182282
</includes>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.highmed.dsf.fhir.resources.ResourceProvider;
1414
import org.highmed.dsf.fhir.resources.StructureDefinitionResource;
1515
import org.highmed.dsf.fhir.resources.ValueSetResource;
16+
import org.springframework.core.env.PropertyResolver;
1617

1718
import ca.uhn.fhir.context.FhirContext;
1819

@@ -45,7 +46,8 @@ public Stream<Class<?>> getSpringConfigClasses()
4546
}
4647

4748
@Override
48-
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader)
49+
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader,
50+
PropertyResolver resolver)
4951
{
5052
var aCom = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-computeFeasibility.xml");
5153
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-executeFeasibility.xml");
@@ -64,12 +66,12 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
6466

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

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

7274
return ResourceProvider.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
73-
classLoader, resourcesByProcessKeyAndVersion);
75+
classLoader, resolver, resourcesByProcessKeyAndVersion);
7476
}
7577
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import org.camunda.bpm.engine.delegate.DelegateExecution;
1616
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
17+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1718
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1819
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1920
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -28,9 +29,9 @@
2829
public class SendMedicRequest extends AbstractTaskMessageSend
2930
{
3031
public SendMedicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
31-
OrganizationProvider organizationProvider, FhirContext fhirContext)
32+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
3233
{
33-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
34+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
3435
}
3536

3637
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.stream.Stream;
77

88
import org.camunda.bpm.engine.delegate.DelegateExecution;
9+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
910
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1011
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1112
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -20,9 +21,9 @@
2021
public class SendMultiMedicErrors extends AbstractTaskMessageSend
2122
{
2223
public SendMultiMedicErrors(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
23-
OrganizationProvider organizationProvider, FhirContext fhirContext)
24+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
2425
{
25-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
26+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2627
}
2728

2829
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.camunda.bpm.engine.delegate.DelegateExecution;
1515
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
1616
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
17+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1718
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1819
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1920
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -29,9 +30,9 @@
2930
public class SendMultiMedicResults extends AbstractTaskMessageSend
3031
{
3132
public SendMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
32-
OrganizationProvider organizationProvider, FhirContext fhirContext)
33+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
3334
{
34-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
35+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
3536
}
3637

3738
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.camunda.bpm.engine.delegate.DelegateExecution;
1212
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
1313
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
14+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1415
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1516
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1617
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -29,9 +30,9 @@ public class SendSingleMedicResults extends AbstractTaskMessageSend
2930
private static final Logger logger = LoggerFactory.getLogger(SendSingleMedicResults.class);
3031

3132
public SendSingleMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
32-
OrganizationProvider organizationProvider, FhirContext fhirContext)
33+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
3334
{
34-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
35+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
3536
}
3637

3738
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.stream.Stream;
1010

1111
import org.camunda.bpm.engine.delegate.DelegateExecution;
12+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1213
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1314
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1415
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -21,9 +22,9 @@
2122
public class SendTtpRequest extends AbstractTaskMessageSend
2223
{
2324
public SendTtpRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
24-
OrganizationProvider organizationProvider, FhirContext fhirContext)
25+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
2526
{
26-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
27+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2728
}
2829

2930
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
1515
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
1616
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResultsValues;
17+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1718
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1819
import org.highmed.dsf.fhir.task.TaskHelper;
1920

2021
public class CalculateMultiMedicResults extends AbstractServiceDelegate
2122
{
22-
public CalculateMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
23+
public CalculateMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
24+
ReadAccessHelper readAccessHelper)
2325
{
24-
super(clientProvider, taskHelper);
26+
super(clientProvider, taskHelper, readAccessHelper);
2527
}
2628

2729
@Override

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

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

1212
import org.camunda.bpm.engine.delegate.DelegateExecution;
1313
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
14+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1415
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1516
import org.highmed.dsf.fhir.task.TaskHelper;
1617
import org.highmed.dsf.fhir.variables.FhirResourcesList;
@@ -20,9 +21,10 @@
2021

2122
public class CheckFeasibilityResources extends AbstractServiceDelegate
2223
{
23-
public CheckFeasibilityResources(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
24+
public CheckFeasibilityResources(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
25+
ReadAccessHelper readAccessHelper)
2426
{
25-
super(clientProvider, taskHelper);
27+
super(clientProvider, taskHelper, readAccessHelper);
2628
}
2729

2830
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
1515
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResult;
1616
import org.highmed.dsf.bpe.variables.FinalFeasibilityQueryResults;
17+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1718
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1819
import org.highmed.dsf.fhir.task.TaskHelper;
1920
import org.hl7.fhir.r4.model.Extension;
@@ -25,9 +26,10 @@
2526

2627
public class CheckMultiMedicResults extends AbstractServiceDelegate
2728
{
28-
public CheckMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper)
29+
public CheckMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
30+
ReadAccessHelper readAccessHelper)
2931
{
30-
super(clientProvider, taskHelper);
32+
super(clientProvider, taskHelper, readAccessHelper);
3133
}
3234

3335
@Override

0 commit comments

Comments
 (0)