Skip to content

Commit 91fd738

Browse files
wetretwetret
committed
rename medic to dic, increase version to 1.0.0, add versions to valuesets
1 parent 1bbc572 commit 91fd738

File tree

6 files changed

+40
-39
lines changed

6 files changed

+40
-39
lines changed

‎pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<compileSource>17</compileSource>
1515
<compileTarget>17</compileTarget>
1616

17-
<dsf.version>1.0.0-M1</dsf.version>
17+
<dsf.version>1.0.0-SNAPSHOT</dsf.version>
1818
<dsf.location>../dsf</dsf.location>
1919
</properties>
2020

@@ -272,7 +272,7 @@
272272
</configuration>
273273
</execution>
274274
<execution>
275-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic1</id>
275+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic1</id>
276276
<phase>package</phase>
277277
<goals>
278278
<goal>copy</goal>
@@ -285,11 +285,11 @@
285285
<version>${project.version}</version>
286286
</artifactItem>
287287
</artifactItems>
288-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</outputDirectory>
288+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</outputDirectory>
289289
</configuration>
290290
</execution>
291291
<execution>
292-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic2</id>
292+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic2</id>
293293
<phase>package</phase>
294294
<goals>
295295
<goal>copy</goal>
@@ -302,11 +302,11 @@
302302
<version>${project.version}</version>
303303
</artifactItem>
304304
</artifactItems>
305-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</outputDirectory>
305+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic2/bpe/process</outputDirectory>
306306
</configuration>
307307
</execution>
308308
<execution>
309-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/medic3</id>
309+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic3</id>
310310
<phase>package</phase>
311311
<goals>
312312
<goal>copy</goal>
@@ -319,11 +319,11 @@
319319
<version>${project.version}</version>
320320
</artifactItem>
321321
</artifactItems>
322-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</outputDirectory>
322+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic3/bpe/process</outputDirectory>
323323
</configuration>
324324
</execution>
325325
<execution>
326-
<id>copy-process-plugin-to-docker-test-setup-3medic-ttp/ttp</id>
326+
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/ttp</id>
327327
<phase>package</phase>
328328
<goals>
329329
<goal>copy</goal>
@@ -336,7 +336,7 @@
336336
<version>${project.version}</version>
337337
</artifactItem>
338338
</artifactItems>
339-
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</outputDirectory>
339+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/ttp/bpe/process</outputDirectory>
340340
</configuration>
341341
</execution>
342342
</executions>
@@ -354,28 +354,28 @@
354354
<followSymlinks>false</followSymlinks>
355355
</fileset>
356356
<fileset>
357-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</directory>
357+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</directory>
358358
<includes>
359359
<include>${project.artifactId}-${project.version}.jar</include>
360360
</includes>
361361
<followSymlinks>false</followSymlinks>
362362
</fileset>
363363
<fileset>
364-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</directory>
364+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic2/bpe/process</directory>
365365
<includes>
366366
<include>${project.artifactId}-${project.version}.jar</include>
367367
</includes>
368368
<followSymlinks>false</followSymlinks>
369369
</fileset>
370370
<fileset>
371-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</directory>
371+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic3/bpe/process</directory>
372372
<includes>
373373
<include>${project.artifactId}-${project.version}.jar</include>
374374
</includes>
375375
<followSymlinks>false</followSymlinks>
376376
</fileset>
377377
<fileset>
378-
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</directory>
378+
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/ttp/bpe/process</directory>
379379
<includes>
380380
<include>${project.artifactId}-${project.version}.jar</include>
381381
</includes>

‎src/main/resources/fhir/ValueSet/dsf-allow-list.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<compose>
2222
<include>
2323
<system value="http://dsf.dev/fhir/CodeSystem/allow-list" />
24+
<version value="#{version}" />
2425
</include>
2526
</compose>
2627
</ValueSet>

‎src/test/java/dev/dsf/bpe/start/DownloadAllowListFromTtpViaMedic1ExampleStarter.java‎ renamed to ‎src/test/java/dev/dsf/bpe/start/DownloadAllowListFromTtpExampleStarter.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
import dev.dsf.bpe.v1.constants.NamingSystems;
2020
import dev.dsf.fhir.client.FhirWebserviceClient;
2121

22-
public class DownloadAllowListFromTtpViaMedic1ExampleStarter
22+
public class DownloadAllowListFromTtpExampleStarter
2323
{
24-
private static final Logger logger = LoggerFactory.getLogger(DownloadAllowListFromTtpViaMedic1ExampleStarter.class);
24+
private static final Logger logger = LoggerFactory.getLogger(DownloadAllowListFromTtpExampleStarter.class);
2525

2626
private static final String ALLOW_LIST_FHIR_BASE_URL = ConstantsExampleStarters.TTP_FHIR_BASE_URL;
27-
private static final Map<String, String> MEDIC_IDENTIFIER_URL = Map.of(
28-
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_MEDIC_1,
29-
ConstantsExampleStarters.MEDIC_1_FHIR_BASE_URL,
30-
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_MEDIC_2,
31-
ConstantsExampleStarters.MEDIC_2_FHIR_BASE_URL,
32-
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_MEDIC_3,
33-
ConstantsExampleStarters.MEDIC_3_FHIR_BASE_URL);
27+
private static final Map<String, String> DIC_IDENTIFIER_URL = Map.of(
28+
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_DIC_1,
29+
ConstantsExampleStarters.DIC_1_FHIR_BASE_URL,
30+
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_DIC_2,
31+
ConstantsExampleStarters.DIC_2_FHIR_BASE_URL,
32+
ConstantsExampleStarters.NAMINGSYSTEM_DSF_ORGANIZATION_IDENTIFIER_VALUE_DIC_3,
33+
ConstantsExampleStarters.DIC_3_FHIR_BASE_URL);
3434

3535
// Environment variable "DSF_CLIENT_CERTIFICATE_PATH" or args[0]: the path to the client-certificate
3636
// dsf/dsf-tools/dsf-tools-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12
@@ -39,10 +39,10 @@ public class DownloadAllowListFromTtpViaMedic1ExampleStarter
3939
public static void main(String[] args) throws Exception
4040
{
4141
ExampleStarter starter = ExampleStarter.forServer(args,
42-
MEDIC_IDENTIFIER_URL.entrySet().iterator().next().getValue());
42+
DIC_IDENTIFIER_URL.entrySet().iterator().next().getValue());
4343
IdType allowList = allowList(starter);
4444

45-
MEDIC_IDENTIFIER_URL.forEach((identifier, url) -> start(args, allowList, identifier, url));
45+
DIC_IDENTIFIER_URL.forEach((identifier, url) -> start(args, allowList, identifier, url));
4646
}
4747

4848
private static void start(String[] args, IdType allowList, String identifier, String url)

‎src/test/java/dev/dsf/bpe/start/UpdateAllowList3MedicTtpExampleStarter.java‎ renamed to ‎src/test/java/dev/dsf/bpe/start/UpdateAllowList3DicTtpExampleStarter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import dev.dsf.bpe.v1.constants.CodeSystems;
1313
import dev.dsf.bpe.v1.constants.NamingSystems;
1414

15-
public class UpdateAllowList3MedicTtpExampleStarter
15+
public class UpdateAllowList3DicTtpExampleStarter
1616
{
1717
// Environment variable "DSF_CLIENT_CERTIFICATE_PATH" or args[0]: the path to the client-certificate
1818
// dsf/dsf-tools/dsf-tools-test-data-generator/cert/Webbrowser_Test_User/Webbrowser_Test_User_certificate.p12

‎src/test/java/dev/dsf/fhir/profile/ActivityDefinitionProfileTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ public class ActivityDefinitionProfileTest
2828
@ClassRule
2929
public static final ValidationSupportRule validationRule = new ValidationSupportRule(
3030
AllowListProcessPluginDefinition.VERSION, AllowListProcessPluginDefinition.RELEASE_DATE,
31-
Arrays.asList("dsf-activity-definition-0.5.0.xml", "dsf-extension-process-authorization-0.5.0.xml",
32-
"dsf-extension-process-authorization-consortium-role-0.5.0.xml",
33-
"dsf-extension-process-authorization-organization-0.5.0.xml",
34-
"dsf-coding-process-authorization-local-all-0.5.0.xml",
35-
"dsf-coding-process-authorization-local-consortium-role-0.5.0.xml",
36-
"dsf-coding-process-authorization-local-organization-0.5.0.xml",
37-
"dsf-coding-process-authorization-remote-all-0.5.0.xml",
38-
"dsf-coding-process-authorization-remote-consortium-role-0.5.0.xml",
39-
"dsf-coding-process-authorization-remote-organization-0.5.0.xml"),
40-
Arrays.asList("dsf-read-access-tag-0.5.0.xml", "dsf-process-authorization-0.5.0.xml"),
41-
Arrays.asList("dsf-read-access-tag-0.5.0.xml", "dsf-process-authorization-recipient-0.5.0.xml",
42-
"dsf-process-authorization-requester-0.5.0.xml"));
31+
Arrays.asList("dsf-activity-definition-1.0.0.xml", "dsf-extension-process-authorization-1.0.0.xml",
32+
"dsf-extension-process-authorization-consortium-role-1.0.0.xml",
33+
"dsf-extension-process-authorization-organization-1.0.0.xml",
34+
"dsf-coding-process-authorization-local-all-1.0.0.xml",
35+
"dsf-coding-process-authorization-local-consortium-role-1.0.0.xml",
36+
"dsf-coding-process-authorization-local-organization-1.0.0.xml",
37+
"dsf-coding-process-authorization-remote-all-1.0.0.xml",
38+
"dsf-coding-process-authorization-remote-consortium-role-1.0.0.xml",
39+
"dsf-coding-process-authorization-remote-organization-1.0.0.xml"),
40+
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-process-authorization-1.0.0.xml"),
41+
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-process-authorization-recipient-1.0.0.xml",
42+
"dsf-process-authorization-requester-1.0.0.xml"));
4343

4444
private final ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
4545
validationRule.getValidationSupport());

‎src/test/java/dev/dsf/fhir/profile/TaskProfileTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class TaskProfileTest
3939
def.getReleaseDate(),
4040
Arrays.asList("dsf-task-base-1.0.0.xml", "dsf-task-update-allow-list.xml",
4141
"dsf-task-download-allow-list.xml"),
42-
Arrays.asList("dsf-read-access-tag-0.5.0.xml", "dsf-bpmn-message-1.0.0.xml", "dsf-allow-list.xml"),
43-
Arrays.asList("dsf-read-access-tag-0.5.0.xml", "dsf-bpmn-message-1.0.0.xml", "dsf-allow-list.xml"));
42+
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "dsf-allow-list.xml"),
43+
Arrays.asList("dsf-read-access-tag-1.0.0.xml", "dsf-bpmn-message-1.0.0.xml", "dsf-allow-list.xml"));
4444

4545
private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
4646
validationRule.getValidationSupport());

0 commit comments

Comments
 (0)