Skip to content

Commit 3e24adc

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/release/1.0.0.0' into main
2 parents 8834c32 + d276c5b commit 3e24adc

18 files changed

+216
-57
lines changed

‎pom.xml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
<groupId>dev.dsf</groupId>
77
<artifactId>dsf-process-ping-pong</artifactId>
8-
<version>1.0.0.0-M1</version>
8+
<version>1.0.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<compileSource>17</compileSource>
1414
<compileTarget>17</compileTarget>
1515

16-
<dsf.version>1.0.0-M1</dsf.version>
16+
<dsf.version>1.1.0</dsf.version>
1717
<dsf.location>../dsf</dsf.location>
1818
</properties>
1919

@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.springframework</groupId>
4747
<artifactId>spring-web</artifactId>
48-
<version>6.0.9</version>
48+
<version>6.0.10</version>
4949
<scope>provided</scope>
5050
</dependency>
5151

@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>3.1.0</version>
95+
<version>3.1.2</version>
9696
</plugin>
9797
<plugin>
9898
<groupId>org.apache.maven.plugins</groupId>
@@ -114,21 +114,22 @@
114114
<plugin>
115115
<groupId>org.apache.maven.plugins</groupId>
116116
<artifactId>maven-shade-plugin</artifactId>
117-
<version>3.4.1</version>
117+
<version>3.5.0</version>
118118
</plugin>
119119
<plugin>
120120
<groupId>org.apache.maven.plugins</groupId>
121121
<artifactId>maven-dependency-plugin</artifactId>
122-
<version>3.5.0</version>
122+
<version>3.6.0</version>
123123
</plugin>
124124
<plugin>
125125
<groupId>org.apache.maven.plugins</groupId>
126126
<artifactId>maven-clean-plugin</artifactId>
127-
<version>3.2.0</version>
127+
<version>3.3.1</version>
128128
</plugin>
129129
<plugin>
130130
<groupId>org.codehaus.mojo</groupId>
131131
<artifactId>buildnumber-maven-plugin</artifactId>
132+
<!-- 3.1.0 not working, no git commit hash as buildnumber -->
132133
<version>1.4</version>
133134
<executions>
134135
<execution>
@@ -146,7 +147,7 @@
146147
<plugin>
147148
<groupId>net.revelc.code.formatter</groupId>
148149
<artifactId>formatter-maven-plugin</artifactId>
149-
<version>2.22.0</version>
150+
<version>2.23.0</version>
150151
<configuration>
151152
<configFile>eclipse-formatter-config.xml</configFile>
152153
</configuration>
@@ -294,7 +295,7 @@
294295
</configuration>
295296
</execution>
296297
<execution>
297-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic1</id>
298+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic1</id>
298299
<phase>package</phase>
299300
<goals>
300301
<goal>copy</goal>
@@ -307,11 +308,11 @@
307308
<version>${project.version}</version>
308309
</artifactItem>
309310
</artifactItems>
310-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</outputDirectory>
311+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</outputDirectory>
311312
</configuration>
312313
</execution>
313314
<execution>
314-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic2</id>
315+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic2</id>
315316
<phase>package</phase>
316317
<goals>
317318
<goal>copy</goal>
@@ -324,11 +325,11 @@
324325
<version>${project.version}</version>
325326
</artifactItem>
326327
</artifactItems>
327-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</outputDirectory>
328+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic2/bpe/process</outputDirectory>
328329
</configuration>
329330
</execution>
330331
<execution>
331-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic3</id>
332+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic3</id>
332333
<phase>package</phase>
333334
<goals>
334335
<goal>copy</goal>
@@ -341,11 +342,11 @@
341342
<version>${project.version}</version>
342343
</artifactItem>
343344
</artifactItems>
344-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</outputDirectory>
345+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic3/bpe/process</outputDirectory>
345346
</configuration>
346347
</execution>
347348
<execution>
348-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/ttp</id>
349+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/ttp</id>
349350
<phase>package</phase>
350351
<goals>
351352
<goal>copy</goal>
@@ -358,7 +359,7 @@
358359
<version>${project.version}</version>
359360
</artifactItem>
360361
</artifactItems>
361-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</outputDirectory>
362+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/ttp/bpe/process</outputDirectory>
362363
</configuration>
363364
</execution>
364365
</executions>
@@ -376,28 +377,28 @@
376377
<followSymlinks>false</followSymlinks>
377378
</fileset>
378379
<fileset>
379-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</directory>
380+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</directory>
380381
<includes>
381382
<include>${project.artifactId}-${project.version}.jar</include>
382383
</includes>
383384
<followSymlinks>false</followSymlinks>
384385
</fileset>
385386
<fileset>
386-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</directory>
387+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic2/bpe/process</directory>
387388
<includes>
388389
<include>${project.artifactId}-${project.version}.jar</include>
389390
</includes>
390391
<followSymlinks>false</followSymlinks>
391392
</fileset>
392393
<fileset>
393-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</directory>
394+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic3/bpe/process</directory>
394395
<includes>
395396
<include>${project.artifactId}-${project.version}.jar</include>
396397
</includes>
397398
<followSymlinks>false</followSymlinks>
398399
</fileset>
399400
<fileset>
400-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</directory>
401+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/ttp/bpe/process</directory>
401402
<includes>
402403
<include>${project.artifactId}-${project.version}.jar</include>
403404
</includes>

‎src/main/java/dev/dsf/bpe/PingProcessPluginDefinition.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class PingProcessPluginDefinition implements ProcessPluginDefinition
1212
{
1313
public static final String VERSION = "1.0.0.0";
14-
public static final LocalDate RELEASE_DATE = LocalDate.of(2023, 5, 20);
14+
public static final LocalDate RELEASE_DATE = LocalDate.of(2023, 8, 22);
1515

1616
@Override
1717
public String getName()
@@ -61,16 +61,19 @@ public Map<String, List<String>> getFhirResourcesByProcessId()
6161
var sStopPingAutostart = "fhir/StructureDefinition/dsf-task-stop-ping-autostart.xml";
6262

6363
var tStartPing = "fhir/Task/dsf-task-start-ping.xml";
64+
var tStartPingAutoStart = "fhir/Task/dsf-task-start-ping-autostart.xml";
65+
var tStopPingAutoStart = "fhir/Task/dsf-task-stop-ping-autostart.xml";
6466

6567
var vPing = "fhir/ValueSet/dsf-ping.xml";
6668
var vPingStatus = "fhir/ValueSet/dsf-ping-status.xml";
6769
var vPongStatus = "fhir/ValueSet/dsf-pong-status.xml";
6870

6971
return Map.of(ConstantsPing.PROCESS_NAME_FULL_PING,
70-
Arrays.asList(aPing, cPing, cPingStatus, sPingStatus, sStartPing, sPong, tStartPing, vPing,
71-
vPingStatus),
72+
Arrays.asList(
73+
aPing, cPing, cPingStatus, sPingStatus, sStartPing, sPong, tStartPing, vPing, vPingStatus),
7274
ConstantsPing.PROCESS_NAME_FULL_PING_AUTOSTART,
73-
Arrays.asList(aPingAutostart, cPing, sStartPingAutostart, sStopPingAutostart, vPing),
75+
Arrays.asList(aPingAutostart, cPing, sStartPingAutostart, sStopPingAutostart, tStartPingAutoStart,
76+
tStopPingAutoStart, vPing),
7477
ConstantsPing.PROCESS_NAME_FULL_PONG,
7578
Arrays.asList(aPong, cPing, cPingStatus, sPingStatus, sPing, vPing, vPongStatus));
7679
}

‎src/main/java/dev/dsf/bpe/service/SelectPingTargets.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public SelectPingTargets(ProcessPluginApi api)
5252
protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception
5353
{
5454
Stream<Endpoint> targetEndpoints = getTargetEndpointsSearchParameter(variables).map(this::searchForEndpoints)
55-
.orElse(allEndpointsNotLocal());
55+
.orElse(allEndpoints()).filter(isLocalEndpoint().negate());
5656

5757
List<Organization> remoteOrganizations = api.getOrganizationProvider().getRemoteOrganizations();
5858
Map<String, Identifier> organizationIdentifierByOrganizationId = remoteOrganizations.stream().collect(
@@ -132,9 +132,9 @@ private Optional<Class<? extends Resource>> getResourceType(UriComponents search
132132
}
133133
}
134134

135-
private Stream<Endpoint> allEndpointsNotLocal()
135+
private Stream<Endpoint> allEndpoints()
136136
{
137-
return allEndpoints(1, 0).filter(isLocalEndpoint().negate());
137+
return allEndpoints(1, 0);
138138
}
139139

140140
private Predicate<? super Endpoint> isLocalEndpoint()
@@ -144,8 +144,10 @@ private Predicate<? super Endpoint> isLocalEndpoint()
144144

145145
private Stream<Endpoint> allEndpoints(int page, int currentTotal)
146146
{
147-
Bundle searchResult = api.getFhirWebserviceClientProvider().getLocalWebserviceClient()
148-
.searchWithStrictHandling(Endpoint.class, Map.of("status", Collections.singletonList("active"), "_page",
147+
Bundle searchResult = api.getFhirWebserviceClientProvider().getLocalWebserviceClient().searchWithStrictHandling(
148+
Endpoint.class,
149+
Map.of("status", Collections.singletonList("active"), "identifier",
150+
Collections.singletonList("http://dsf.dev/sid/endpoint-identifier|"), "_page",
149151
Collections.singletonList(String.valueOf(page))));
150152

151153
if (searchResult.getTotal() > currentTotal + searchResult.getEntry().size())

‎src/main/resources/fhir/ActivityDefinition/dsf-ping-autostart.xml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
<code value="LOCAL_ALL" />
1919
</valueCoding>
2020
</extension>
21+
<extension url="requester">
22+
<valueCoding>
23+
<extension url="http://dsf.dev/fhir/StructureDefinition/extension-process-authorization-practitioner">
24+
<valueCoding>
25+
<system value="http://dsf.dev/fhir/CodeSystem/practitioner-role" />
26+
<code value="DSF_ADMIN" />
27+
</valueCoding>
28+
</extension>
29+
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />
30+
<code value="LOCAL_ALL_PRACTITIONER" />
31+
</valueCoding>
32+
</extension>
2133
<extension url="recipient">
2234
<valueCoding>
2335
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />
@@ -38,6 +50,18 @@
3850
<code value="LOCAL_ALL" />
3951
</valueCoding>
4052
</extension>
53+
<extension url="requester">
54+
<valueCoding>
55+
<extension url="http://dsf.dev/fhir/StructureDefinition/extension-process-authorization-practitioner">
56+
<valueCoding>
57+
<system value="http://dsf.dev/fhir/CodeSystem/practitioner-role" />
58+
<code value="DSF_ADMIN" />
59+
</valueCoding>
60+
</extension>
61+
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />
62+
<code value="LOCAL_ALL_PRACTITIONER" />
63+
</valueCoding>
64+
</extension>
4165
<extension url="recipient">
4266
<valueCoding>
4367
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />
@@ -48,7 +72,7 @@
4872
<url value="http://dsf.dev/bpe/Process/pingAutostart" />
4973
<!-- version managed by bpe -->
5074
<version value="#{version}" />
51-
<name value="Ping Autostart" />
75+
<name value="PingAutostart" />
5276
<title value="PING Autostart process" />
5377
<subtitle value="Autostart Communication Testing Process" />
5478
<!-- status managed by bpe -->

‎src/main/resources/fhir/ActivityDefinition/dsf-ping.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
<code value="LOCAL_ALL" />
1919
</valueCoding>
2020
</extension>
21+
<extension url="requester">
22+
<valueCoding>
23+
<extension url="http://dsf.dev/fhir/StructureDefinition/extension-process-authorization-practitioner">
24+
<valueCoding>
25+
<system value="http://dsf.dev/fhir/CodeSystem/practitioner-role" />
26+
<code value="DSF_ADMIN" />
27+
</valueCoding>
28+
</extension>
29+
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />
30+
<code value="LOCAL_ALL_PRACTITIONER" />
31+
</valueCoding>
32+
</extension>
2133
<extension url="recipient">
2234
<valueCoding>
2335
<system value="http://dsf.dev/fhir/CodeSystem/process-authorization" />

‎src/main/resources/fhir/Task/dsf-task-start-ping-autostart.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<Task xmlns="http://hl7.org/fhir">
2+
<meta>
3+
<profile value="http://dsf.dev/fhir/StructureDefinition/task-start-ping-autostart|#{version}"/>
4+
</meta>
5+
<identifier>
6+
<system value="http://dsf.dev/sid/task-identifier"/>
7+
<value value="http://dsf.dev/bpe/Process/pingAutostart/#{version}/task-start-ping-autostart"/>
8+
</identifier>
9+
<instantiatesCanonical value="http://dsf.dev/bpe/Process/pingAutostart|#{version}"/>
10+
<status value="draft"/>
11+
<intent value="order"/>
12+
<authoredOn value="#{date}"/>
13+
<requester>
14+
<type value="Organization"/>
15+
<identifier>
16+
<system value="http://dsf.dev/sid/organization-identifier"/>
17+
<value value="#{organization}"/>
18+
</identifier>
19+
</requester>
20+
<restriction>
21+
<recipient>
22+
<type value="Organization"/>
23+
<identifier>
24+
<system value="http://dsf.dev/sid/organization-identifier"/>
25+
<value value="#{organization}"/>
26+
</identifier>
27+
</recipient>
28+
</restriction>
29+
<input>
30+
<type>
31+
<coding>
32+
<system value="http://dsf.dev/fhir/CodeSystem/bpmn-message"/>
33+
<code value="message-name"/>
34+
</coding>
35+
</type>
36+
<valueString value="startPingAutostart"/>
37+
</input>
38+
<input>
39+
<type>
40+
<coding>
41+
<system value="http://dsf.dev/fhir/CodeSystem/ping"></system>
42+
<code value="target-endpoints"></code>
43+
</coding>
44+
</type>
45+
<valueString value="Endpoint?status=active&amp;identifier=http://dsf.dev/sid/endpoint-identifier|"></valueString>
46+
</input>
47+
<input>
48+
<type>
49+
<coding>
50+
<system value="http://dsf.dev/fhir/CodeSystem/ping"></system>
51+
<code value="timer-interval"></code>
52+
</coding>
53+
</type>
54+
<valueString value="PT24H"></valueString>
55+
</input>
56+
</Task>

‎src/main/resources/fhir/Task/dsf-task-start-ping.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@
3535
</type>
3636
<valueString value="startPing"/>
3737
</input>
38+
<input>
39+
<type>
40+
<coding>
41+
<system value="http://dsf.dev/fhir/CodeSystem/ping"></system>
42+
<code value="target-endpoints"></code>
43+
</coding>
44+
</type>
45+
<valueString value="Endpoint?status=active&amp;identifier=http://dsf.dev/sid/endpoint-identifier|"></valueString>
46+
</input>
3847
</Task>

0 commit comments

Comments
 (0)