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

Commit ae2a9fd

Browse files
DiCanioDiCanio
authored
Merge pull request #33 from num-codex/update-dsf-dependencies
Update dsf dependencies
2 parents 264091d + b13d5b2 commit ae2a9fd

137 files changed

Lines changed: 1856 additions & 2112 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,7 @@ jobs:
7777
key: maven-repo
7878

7979
- name: Build with Maven
80-
run: mvn -B package -DskipTests --file pom.xml
80+
run: mvn -B deploy -DskipTests --file pom.xml
8181
env:
8282
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8383
USENAME: ${{ github.actor }}
84-
85-
- name: Login to GitHub Docker Registry
86-
uses: docker/login-action@v1
87-
with:
88-
registry: ghcr.io
89-
username: ${{ github.actor }}
90-
password: ${{ secrets.GITHUB_TOKEN }}
91-
92-
- name: Build and push BPE image
93-
uses: docker/build-push-action@v2
94-
with:
95-
context: docker/bpe
96-
tags: ghcr.io/num-codex/codex-processes-ap2/bpe:${{ steps.prep.outputs.version }}
97-
push: true
98-
99-
- name: Build and push FHIR image
100-
uses: docker/build-push-action@v2
101-
with:
102-
context: docker/fhir
103-
tags: ghcr.io/num-codex/codex-processes-ap2/fhir:${{ steps.prep.outputs.version }}
104-
push: true

‎.gitignore‎

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,38 @@
33
/codex-processes-ap2-docker-test-setup/certs/*.pem
44
/codex-processes-ap2-docker-test-setup/certs/*.p12
55

6-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/conf/*.p12
7-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/last_event/time.file
8-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/log/*.log
9-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/log/*.log.gz
10-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/plugin/*.jar
11-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/app/process/*.jar
12-
/codex-processes-ap2-docker-test-setup/dic-1/bpe/proxy/ssl/*.pem
13-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/app/conf/bundle.xml
14-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/app/conf/config.properties
15-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/app/conf/*.p12
16-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/app/log/*.log
17-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/app/log/*.log.gz
18-
/codex-processes-ap2-docker-test-setup/dic-1/fhir/proxy/ssl/*.pem
6+
/codex-processes-ap2-docker-test-setup/.env
7+
/codex-processes-ap2-docker-test-setup/secrets/*.pem
198

20-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/conf/*.p12
21-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/last_event/time.file
22-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/log/*.log
23-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/log/*.log.gz
24-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/plugin/*.jar
25-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/app/process/*.jar
26-
/codex-processes-ap2-docker-test-setup/dic-2/bpe/proxy/ssl/*.pem
27-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/app/conf/bundle.xml
28-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/app/conf/config.properties
29-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/app/conf/*.p12
30-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/app/log/*.log
31-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/app/log/*.log.gz
32-
/codex-processes-ap2-docker-test-setup/dic-2/fhir/proxy/ssl/*.pem
9+
/codex-processes-ap2-docker-test-setup/dic-1/bpe/last_event/time.file
10+
/codex-processes-ap2-docker-test-setup/dic-1/bpe/log/*.log
11+
/codex-processes-ap2-docker-test-setup/dic-1/bpe/log/*.log.gz
12+
/codex-processes-ap2-docker-test-setup/dic-1/bpe/plugin/*.jar
13+
/codex-processes-ap2-docker-test-setup/dic-1/bpe/process/*.jar
14+
/codex-processes-ap2-docker-test-setup/dic-1/fhir/conf/bundle.xml
15+
/codex-processes-ap2-docker-test-setup/dic-1/fhir/conf/config.properties
16+
/codex-processes-ap2-docker-test-setup/dic-1/fhir/log/*.log
17+
/codex-processes-ap2-docker-test-setup/dic-1/fhir/log/*.log.gz
3318

34-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/conf/*.p12
35-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/last_event/time.file
36-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/log/*.log
37-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/log/*.log.gz
38-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/plugin/*.jar
39-
/codex-processes-ap2-docker-test-setup/zars/bpe/app/process/*.jar
40-
/codex-processes-ap2-docker-test-setup/zars/bpe/proxy/ssl/*.pem
41-
/codex-processes-ap2-docker-test-setup/zars/fhir/app/conf/bundle.xml
42-
/codex-processes-ap2-docker-test-setup/zars/fhir/app/conf/config.properties
43-
/codex-processes-ap2-docker-test-setup/zars/fhir/app/conf/*.p12
44-
/codex-processes-ap2-docker-test-setup/zars/fhir/app/log/*.log
45-
/codex-processes-ap2-docker-test-setup/zars/fhir/app/log/*.log.gz
46-
/codex-processes-ap2-docker-test-setup/zars/fhir/proxy/ssl/*.pem
19+
/codex-processes-ap2-docker-test-setup/dic-2/bpe/last_event/time.file
20+
/codex-processes-ap2-docker-test-setup/dic-2/bpe/log/*.log
21+
/codex-processes-ap2-docker-test-setup/dic-2/bpe/log/*.log.gz
22+
/codex-processes-ap2-docker-test-setup/dic-2/bpe/plugin/*.jar
23+
/codex-processes-ap2-docker-test-setup/dic-2/bpe/process/*.jar
24+
/codex-processes-ap2-docker-test-setup/dic-2/fhir/conf/bundle.xml
25+
/codex-processes-ap2-docker-test-setup/dic-2/fhir/conf/config.properties
26+
/codex-processes-ap2-docker-test-setup/dic-2/fhir/log/*.log
27+
/codex-processes-ap2-docker-test-setup/dic-2/fhir/log/*.log.gz
28+
29+
/codex-processes-ap2-docker-test-setup/zars/bpe/last_event/time.file
30+
/codex-processes-ap2-docker-test-setup/zars/bpe/log/*.log
31+
/codex-processes-ap2-docker-test-setup/zars/bpe/log/*.log.gz
32+
/codex-processes-ap2-docker-test-setup/zars/bpe/plugin/*.jar
33+
/codex-processes-ap2-docker-test-setup/zars/bpe/process/*.jar
34+
/codex-processes-ap2-docker-test-setup/zars/fhir/conf/bundle.xml
35+
/codex-processes-ap2-docker-test-setup/zars/fhir/conf/config.properties
36+
/codex-processes-ap2-docker-test-setup/zars/fhir/log/*.log
37+
/codex-processes-ap2-docker-test-setup/zars/fhir/log/*.log.gz
4738

4839
/codex-processes-ap2-tools/codex-processes-ap2-test-data-generator/bundle/*.xml
4940
/codex-processes-ap2-tools/codex-processes-ap2-test-data-generator/cert/*/

‎codex-process-feasibility/pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>org.highmed.dsf</groupId>
2020
<artifactId>dsf-bpe-process-base</artifactId>
21-
<version>0.5.0-SNAPSHOT</version>
21+
<version>0.5.0</version>
2222
<scope>provided</scope>
2323
</dependency>
2424
<dependency>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.highmed.dsf</groupId>
4747
<artifactId>dsf-fhir-validation</artifactId>
48-
<version>0.5.0-SNAPSHOT</version>
48+
<version>0.5.0</version>
4949
<scope>test</scope>
5050
</dependency>
5151
</dependencies>
@@ -106,7 +106,7 @@
106106
<version>${project.version}</version>
107107
</artifactItem>
108108
</artifactItems>
109-
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/app/process
109+
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/process
110110
</outputDirectory>
111111
</configuration>
112112
</execution>
@@ -123,7 +123,7 @@
123123
<artifactId>hapi-fhir-client</artifactId>
124124
</artifactItem>
125125
</artifactItems>
126-
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/app/plugin</outputDirectory>
126+
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/plugin</outputDirectory>
127127
</configuration>
128128
</execution>
129129
<execution>
@@ -140,7 +140,7 @@
140140
<version>${project.version}</version>
141141
</artifactItem>
142142
</artifactItems>
143-
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/app/process
143+
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/process
144144
</outputDirectory>
145145
</configuration>
146146
</execution>
@@ -157,7 +157,7 @@
157157
<artifactId>hapi-fhir-client</artifactId>
158158
</artifactItem>
159159
</artifactItems>
160-
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/app/plugin</outputDirectory>
160+
<outputDirectory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/plugin</outputDirectory>
161161
</configuration>
162162
</execution>
163163
<execution>
@@ -174,7 +174,7 @@
174174
<version>${project.version}</version>
175175
</artifactItem>
176176
</artifactItems>
177-
<outputDirectory>../codex-processes-ap2-docker-test-setup/zars/bpe/app/process</outputDirectory>
177+
<outputDirectory>../codex-processes-ap2-docker-test-setup/zars/bpe/process</outputDirectory>
178178
</configuration>
179179
</execution>
180180
<execution>
@@ -190,7 +190,7 @@
190190
<artifactId>hapi-fhir-client</artifactId>
191191
</artifactItem>
192192
</artifactItems>
193-
<outputDirectory>../codex-processes-ap2-docker-test-setup/zars/bpe/app/plugin</outputDirectory>
193+
<outputDirectory>../codex-processes-ap2-docker-test-setup/zars/bpe/plugin</outputDirectory>
194194
</configuration>
195195
</execution>
196196
</executions>
@@ -215,42 +215,42 @@
215215
<followSymlinks>false</followSymlinks>
216216
</fileset>
217217
<fileset>
218-
<directory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/app/plugin</directory>
218+
<directory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/plugin</directory>
219219
<includes>
220220
<include>*.jar</include>
221221
</includes>
222222
<followSymlinks>false</followSymlinks>
223223
</fileset>
224224
<fileset>
225-
<directory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/app/process</directory>
225+
<directory>../codex-processes-ap2-docker-test-setup/dic-1/bpe/process</directory>
226226
<includes>
227227
<include>*.jar</include>
228228
</includes>
229229
<followSymlinks>false</followSymlinks>
230230
</fileset>
231231
<fileset>
232-
<directory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/app/plugin</directory>
232+
<directory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/plugin</directory>
233233
<includes>
234234
<include>*.jar</include>
235235
</includes>
236236
<followSymlinks>false</followSymlinks>
237237
</fileset>
238238
<fileset>
239-
<directory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/app/process</directory>
239+
<directory>../codex-processes-ap2-docker-test-setup/dic-2/bpe/process</directory>
240240
<includes>
241241
<include>*.jar</include>
242242
</includes>
243243
<followSymlinks>false</followSymlinks>
244244
</fileset>
245245
<fileset>
246-
<directory>../codex-processes-ap2-docker-test-setup/zars/bpe/app/plugin</directory>
246+
<directory>../codex-processes-ap2-docker-test-setup/zars/bpe/plugin</directory>
247247
<includes>
248248
<include>*.jar</include>
249249
</includes>
250250
<followSymlinks>false</followSymlinks>
251251
</fileset>
252252
<fileset>
253-
<directory>../codex-processes-ap2-docker-test-setup/zars/bpe/app/process</directory>
253+
<directory>../codex-processes-ap2-docker-test-setup/zars/bpe/process</directory>
254254
<includes>
255255
<include>*.jar</include>
256256
</includes>

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/EnhancedFhirWebserviceClientProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ public interface EnhancedFhirWebserviceClientProvider extends FhirWebserviceClie
1515
* @param reference A FHIR ID Type that points either to a local or a remote resource.
1616
* @return A FHIR webservice client.
1717
*/
18-
FhirWebserviceClient getWebserviceClient(IdType reference);
18+
FhirWebserviceClient getWebserviceClientByReference(IdType reference);
1919
}

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/EnhancedFhirWebserviceClientProviderImpl.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public EnhancedFhirWebserviceClientProviderImpl(FhirWebserviceClientProvider fhi
1313
}
1414

1515
@Override
16-
public FhirWebserviceClient getWebserviceClient(IdType reference) {
16+
public FhirWebserviceClient getWebserviceClientByReference(IdType reference) {
1717
if (reference.getBaseUrl() == null || reference.getBaseUrl().equals(getLocalBaseUrl())) {
1818
return getLocalWebserviceClient();
1919
} else {
20-
return getRemoteWebserviceClient(reference.getBaseUrl());
20+
return getWebserviceClient(reference.getBaseUrl());
2121
}
2222
}
2323

@@ -32,19 +32,7 @@ public FhirWebserviceClient getLocalWebserviceClient() {
3232
}
3333

3434
@Override
35-
public FhirWebserviceClient getRemoteWebserviceClient(IdType organizationReference) {
36-
return this.fhirClientProvider.getRemoteWebserviceClient(organizationReference);
37-
}
38-
39-
@Override
40-
public FhirWebserviceClient getRemoteWebserviceClient(String organizationIdentifierSystem,
41-
String organizationIdentifierValue) {
42-
return this.fhirClientProvider.getRemoteWebserviceClient(organizationIdentifierSystem,
43-
organizationIdentifierValue);
44-
}
45-
46-
@Override
47-
public FhirWebserviceClient getRemoteWebserviceClient(String webserviceUrl) {
48-
return this.fhirClientProvider.getRemoteWebserviceClient(webserviceUrl);
35+
public FhirWebserviceClient getWebserviceClient(String webserviceUrl) {
36+
return this.fhirClientProvider.getWebserviceClient(webserviceUrl);
4937
}
5038
}

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/FeasibilityProcessPluginDefinition.java‎

Lines changed: 6 additions & 4 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 java.util.Arrays;
1819
import java.util.List;
@@ -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 propertyResolver) {
4951
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/executeSimpleFeasibility.xml");
5052
var aReq = ActivityDefinitionResource.file("fhir/ActivityDefinition/requestSimpleFeasibility.xml");
5153

@@ -71,13 +73,13 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
7173
var vF = ValueSetResource.file("fhir/ValueSet/feasibility.xml");
7274

7375
Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
74-
"executeSimpleFeasibility/" + VERSION,
76+
"wwwnetzwerk-universitaetsmedizinde_executeSimpleFeasibility/" + VERSION,
7577
Arrays.asList(aExe, sTExe, sTResS, vF, cF, sMeasure, sMeasureReport, sLibrary),
76-
"requestSimpleFeasibility/" + VERSION,
78+
"wwwnetzwerk-universitaetsmedizinde_requestSimpleFeasibility/" + VERSION,
7779
Arrays.asList(aReq, sTReq, sExtDic, vF, cF, sMeasure, sMeasureReport, sLibrary));
7880

7981
return ResourceProvider.read(VERSION,
8082
() -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
81-
classLoader, resourcesByProcessKeyAndVersion);
83+
classLoader, propertyResolver, resourcesByProcessKeyAndVersion);
8284
}
8385
}

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/message/SendDicRequest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import ca.uhn.fhir.context.FhirContext;
44
import de.netzwerk_universitaetsmedizin.codex.processes.feasibility.variables.ConstantsFeasibility;
55
import org.camunda.bpm.engine.delegate.DelegateExecution;
6+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
67
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
78
import org.highmed.dsf.fhir.organization.OrganizationProvider;
89
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -20,8 +21,9 @@ public class SendDicRequest extends AbstractTaskMessageSend {
2021
private static final Logger logger = LoggerFactory.getLogger(SendDicRequest.class);
2122

2223
public SendDicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
23-
OrganizationProvider organizationProvider, FhirContext fhirContext) {
24-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
24+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider,
25+
FhirContext fhirContext) {
26+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2527
}
2628

2729
protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateExecution execution) {

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/message/SendDicResponse.java‎

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

33
import ca.uhn.fhir.context.FhirContext;
44
import org.camunda.bpm.engine.delegate.DelegateExecution;
5+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
56
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
67
import org.highmed.dsf.fhir.organization.OrganizationProvider;
78
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -18,8 +19,9 @@
1819
public class SendDicResponse extends AbstractTaskMessageSend {
1920

2021
public SendDicResponse(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
21-
OrganizationProvider organizationProvider, FhirContext fhirContext) {
22-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
22+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider,
23+
FhirContext fhirContext) {
24+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2325
}
2426

2527
@Override

‎codex-process-feasibility/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/feasibility/service/AggregateMeasureReports.java‎

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

33
import org.camunda.bpm.engine.delegate.DelegateExecution;
44
import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
5+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
56
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
67
import org.highmed.dsf.fhir.task.TaskHelper;
78
import org.hl7.fhir.r4.model.MeasureReport;
@@ -26,8 +27,9 @@ public class AggregateMeasureReports extends AbstractServiceDelegate implements
2627
* @param clientProvider the client provider
2728
* @param taskHelper the task helper
2829
*/
29-
public AggregateMeasureReports(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper) {
30-
super(clientProvider, taskHelper);
30+
public AggregateMeasureReports(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
31+
ReadAccessHelper readAccessHelper) {
32+
super(clientProvider, taskHelper, readAccessHelper);
3133
}
3234

3335
@Override

0 commit comments

Comments
 (0)