From 5b4caa22b4a72f703b51fb5d1eba6f0ee7e92ea1 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 12 Jul 2022 18:02:24 +0200 Subject: [PATCH 1/9] 0.6.0 release --- codex-process-data-transfer/pom.xml | 2 +- codex-processes-ap1-test-data-generator/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codex-process-data-transfer/pom.xml b/codex-process-data-transfer/pom.xml index bf10ba50..d27efad7 100644 --- a/codex-process-data-transfer/pom.xml +++ b/codex-process-data-transfer/pom.xml @@ -6,7 +6,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0-SNAPSHOT + 0.6.0 diff --git a/codex-processes-ap1-test-data-generator/pom.xml b/codex-processes-ap1-test-data-generator/pom.xml index c069dfa1..5040491c 100644 --- a/codex-processes-ap1-test-data-generator/pom.xml +++ b/codex-processes-ap1-test-data-generator/pom.xml @@ -6,7 +6,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0-SNAPSHOT + 0.6.0 diff --git a/pom.xml b/pom.xml index 79a39562..05bea0bf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0-SNAPSHOT + 0.6.0 pom From d363339d81e64dc370cf500b06a2083d9e8b3919 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 11:40:45 +0200 Subject: [PATCH 2/9] version to 0.7.0-SNAPSHOT --- codex-process-data-transfer/pom.xml | 2 +- codex-processes-ap1-test-data-generator/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codex-process-data-transfer/pom.xml b/codex-process-data-transfer/pom.xml index d27efad7..b85456ab 100644 --- a/codex-process-data-transfer/pom.xml +++ b/codex-process-data-transfer/pom.xml @@ -6,7 +6,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0 + 0.7.0-SNAPSHOT diff --git a/codex-processes-ap1-test-data-generator/pom.xml b/codex-processes-ap1-test-data-generator/pom.xml index 5040491c..b3b102d1 100644 --- a/codex-processes-ap1-test-data-generator/pom.xml +++ b/codex-processes-ap1-test-data-generator/pom.xml @@ -6,7 +6,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0 + 0.7.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 05bea0bf..d0939ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.netzwerk-universitaetsmedizin.codex codex-processes-ap1 - 0.6.0 + 0.7.0-SNAPSHOT pom From 080bdd58d416a293e6c1f5e860bb454028ee4fe0 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 11:42:11 +0200 Subject: [PATCH 3/9] DSF version to 0.8.0 --- .../data_transfer/message/ContinueSendProcess.java | 2 +- .../message/ContinueSendProcessWithError.java | 2 +- .../ContinueSendProcessWithValidationError.java | 2 +- .../message/ContinueTranslateProcess.java | 2 +- .../message/ContinueTranslateProcessWithError.java | 2 +- .../ContinueTranslateProcessWithValidationError.java | 2 +- .../data_transfer/service/send/ValidateData.java | 2 +- .../docker-compose.yml | 12 ++++++------ pom.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcess.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcess.java index ca48fb0e..425f1b74 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcess.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcess.java @@ -29,7 +29,7 @@ public ContinueSendProcess(FhirWebserviceClientProvider clientProvider, TaskHelp @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithError.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithError.java index d3691201..91b01ead 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithError.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithError.java @@ -45,7 +45,7 @@ public void afterPropertiesSet() throws Exception @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithValidationError.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithValidationError.java index eababd11..a66b5651 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithValidationError.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueSendProcessWithValidationError.java @@ -31,7 +31,7 @@ public ContinueSendProcessWithValidationError(FhirWebserviceClientProvider clien @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcess.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcess.java index 6957fda9..f071ffb4 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcess.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcess.java @@ -29,7 +29,7 @@ public ContinueTranslateProcess(FhirWebserviceClientProvider clientProvider, Tas @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithError.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithError.java index 9e7b46ad..9673c21f 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithError.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithError.java @@ -45,7 +45,7 @@ public void afterPropertiesSet() throws Exception @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithValidationError.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithValidationError.java index 58d5e0a6..d0c0b8e7 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithValidationError.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/message/ContinueTranslateProcessWithValidationError.java @@ -32,7 +32,7 @@ public ContinueTranslateProcessWithValidationError(FhirWebserviceClientProvider @Override protected Target getTarget() { - return (Target) execution.getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); + return (Target) getExecution().getVariable(BPMN_EXECUTION_VARIABLE_RETURN_TARGET); } @Override diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java index 205323cb..636347ef 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ValidateData.java @@ -222,7 +222,7 @@ private Map removeValidationResultsCollectSourceIdsIntoMap(Bundl e.clearUserData(HAPI_USER_DATA_SOURCE_ID_ELEMENT); e.setResponse(null); }); - execution.setVariable(BPMN_EXECUTION_VARIABLE_BUNDLE, FhirResourceValues.create(bundle)); + getExecution().setVariable(BPMN_EXECUTION_VARIABLE_BUNDLE, FhirResourceValues.create(bundle)); return sourceIdByBundleUuid; } diff --git a/codex-processes-ap1-docker-test-setup/docker-compose.yml b/codex-processes-ap1-docker-test-setup/docker-compose.yml index e51ac4fa..1e2a029d 100644 --- a/codex-processes-ap1-docker-test-setup/docker-compose.yml +++ b/codex-processes-ap1-docker-test-setup/docker-compose.yml @@ -66,7 +66,7 @@ services: dic-fhir: - image: ghcr.io/highmed/fhir:0.7.0 + image: ghcr.io/highmed/fhir:0.8.0 restart: "no" ports: - 127.0.0.1:5000:5000 @@ -113,7 +113,7 @@ services: - db - proxy dic-bpe: - image: ghcr.io/highmed/bpe:0.7.0 + image: ghcr.io/highmed/bpe:0.8.0 restart: "no" ports: - 127.0.0.1:5003:5003 @@ -203,7 +203,7 @@ services: gth-fhir: - image: ghcr.io/highmed/fhir:0.7.0 + image: ghcr.io/highmed/fhir:0.8.0 restart: "no" ports: - 127.0.0.1:5001:5001 @@ -250,7 +250,7 @@ services: - db - proxy gth-bpe: - image: ghcr.io/highmed/bpe:0.7.0 + image: ghcr.io/highmed/bpe:0.8.0 restart: "no" ports: - 127.0.0.1:5004:5004 @@ -310,7 +310,7 @@ services: crr-fhir: - image: ghcr.io/highmed/fhir:0.7.0 + image: ghcr.io/highmed/fhir:0.8.0 restart: "no" ports: - 127.0.0.1:5002:5002 @@ -357,7 +357,7 @@ services: - db - proxy crr-bpe: - image: ghcr.io/highmed/bpe:0.7.0 + image: ghcr.io/highmed/bpe:0.8.0 restart: "no" ports: - 127.0.0.1:5005:5005 diff --git a/pom.xml b/pom.xml index d0939ab7..8bc6f26d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ ${project.basedir} 5.1.0 - 0.7.0 + 0.8.0 Business processes for the NUM CODEX project (AP1) as plugins for the HiGHmed Data Sharing Framework. From 5b416367df13320dd82986c8041bd36e3894641d Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 11:43:41 +0200 Subject: [PATCH 4/9] versioned ValueSet bindings and Profile references --- .../num-codex-extension-error-metadata.xml | 4 ++-- .../num-codex-task-continue-data-send-with-error.xml | 2 +- ...x-task-continue-data-send-with-validation-error.xml | 2 +- ...m-codex-task-continue-data-translate-with-error.xml | 2 +- ...k-continue-data-translate-with-validation-error.xml | 2 +- .../num-codex-task-start-data-receive.xml | 6 +++--- .../num-codex-task-start-data-send.xml | 10 +++++----- .../num-codex-task-start-data-translate.xml | 8 ++++---- .../num-codex-task-start-data-trigger.xml | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-extension-error-metadata.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-extension-error-metadata.xml index d85ec35a..d1c93d5a 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-extension-error-metadata.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-extension-error-metadata.xml @@ -51,7 +51,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-error.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-error.xml index 1c667e11..619ee583 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-error.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-error.xml @@ -73,7 +73,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-validation-error.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-validation-error.xml index b63daf74..46e99010 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-validation-error.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-send-with-validation-error.xml @@ -58,7 +58,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-error.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-error.xml index 58ed0dee..e367a2bb 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-error.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-error.xml @@ -73,7 +73,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-validation-error.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-validation-error.xml index 15a7f1c2..04b4dcd1 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-validation-error.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-continue-data-translate-with-validation-error.xml @@ -58,7 +58,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml index d69cbd1f..38b6fb91 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml @@ -58,7 +58,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -155,7 +155,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml index 52328f3f..3bf33ac6 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml @@ -51,7 +51,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml index ffd9dfc1..51cdb3c5 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml @@ -58,7 +58,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -169,7 +169,7 @@ - + diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml index dae32234..ca1cd234 100644 --- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml +++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml @@ -58,7 +58,7 @@ - + @@ -91,7 +91,7 @@ - + From fcd4019decabdb40749e1e68133b453f10511b72 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 12:16:05 +0200 Subject: [PATCH 5/9] process plugin version to 0.7.0 --- .../data_transfer/DataTransferProcessPluginDefinition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java index 74a6a966..746b50a2 100644 --- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java +++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java @@ -36,8 +36,8 @@ public class DataTransferProcessPluginDefinition implements ProcessPluginDefinit { private static final Logger logger = LoggerFactory.getLogger(DataTransferProcessPluginDefinition.class); - public static final String VERSION = "0.6.0"; - public static final LocalDate DATE = LocalDate.of(2022, 7, 12); + public static final String VERSION = "0.7.0"; + public static final LocalDate DATE = LocalDate.of(2022, 10, 13); @Override public String getName() From d5df71ba14ff4c483f78dfd4cf1554f56228fe10 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 12:16:54 +0200 Subject: [PATCH 6/9] fixed mocking --- .../processes/data_transfer/service/send/ReadDataTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadDataTest.java b/codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadDataTest.java index 541a6512..fc50848f 100644 --- a/codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadDataTest.java +++ b/codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/send/ReadDataTest.java @@ -5,10 +5,10 @@ import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.CODESYSTEM_NUM_CODEX_DATA_TRANSFER; import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.CODESYSTEM_NUM_CODEX_DATA_TRANSFER_VALUE_EXPORT_TO; import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.NAMING_SYSTEM_NUM_CODEX_DIC_PSEUDONYM; -import static org.highmed.dsf.bpe.ConstantsBase.BPMN_EXECUTION_VARIABLE_TASK; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import java.io.FileNotFoundException; @@ -70,7 +70,7 @@ public void testExecuteWithBgaData() throws Exception Mockito.when(execution.getVariable(BPMN_EXECUTION_VARIABLE_PATIENT_REFERENCE)).thenReturn(PatientReference .from(new Identifier().setSystem(NAMING_SYSTEM_NUM_CODEX_DIC_PSEUDONYM).setValue("source/original"))); Task task = createTask(); - Mockito.when(execution.getVariable(BPMN_EXECUTION_VARIABLE_TASK)).thenReturn(task); + Mockito.when(taskHelper.getCurrentTaskFromExecutionVariables(any())).thenReturn(task); readData.execute(execution); From 821787ad6974c90ee3f01b7a854a0cd4407cc58c Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 12:18:41 +0200 Subject: [PATCH 7/9] removed last_event bind mounts --- .gitignore | 1 - .../crr/bpe/last_event/README.md | 1 - .../dic/bpe/last_event/README.md | 1 - codex-processes-ap1-docker-test-setup/docker-compose.yml | 9 --------- .../gth/bpe/last_event/README.md | 1 - 5 files changed, 13 deletions(-) delete mode 100644 codex-processes-ap1-docker-test-setup/crr/bpe/last_event/README.md delete mode 100644 codex-processes-ap1-docker-test-setup/dic/bpe/last_event/README.md delete mode 100644 codex-processes-ap1-docker-test-setup/gth/bpe/last_event/README.md diff --git a/.gitignore b/.gitignore index a0300533..1e256ff3 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,6 @@ codex-processes-ap1-test-data-generator/rsa/*.pem ### codex-processes-ap1-docker-test-setup/**/bpe/log/*.log codex-processes-ap1-docker-test-setup/**/bpe/log/*.log.gz -codex-processes-ap1-docker-test-setup/**/bpe/last_event/time.file codex-processes-ap1-docker-test-setup/**/bpe/plugin/*.jar codex-processes-ap1-docker-test-setup/**/bpe/process/*.jar diff --git a/codex-processes-ap1-docker-test-setup/crr/bpe/last_event/README.md b/codex-processes-ap1-docker-test-setup/crr/bpe/last_event/README.md deleted file mode 100644 index 12fefbfa..00000000 --- a/codex-processes-ap1-docker-test-setup/crr/bpe/last_event/README.md +++ /dev/null @@ -1 +0,0 @@ -empty directory for last-event time.file \ No newline at end of file diff --git a/codex-processes-ap1-docker-test-setup/dic/bpe/last_event/README.md b/codex-processes-ap1-docker-test-setup/dic/bpe/last_event/README.md deleted file mode 100644 index 12fefbfa..00000000 --- a/codex-processes-ap1-docker-test-setup/dic/bpe/last_event/README.md +++ /dev/null @@ -1 +0,0 @@ -empty directory for last-event time.file \ No newline at end of file diff --git a/codex-processes-ap1-docker-test-setup/docker-compose.yml b/codex-processes-ap1-docker-test-setup/docker-compose.yml index 1e2a029d..b3888224 100644 --- a/codex-processes-ap1-docker-test-setup/docker-compose.yml +++ b/codex-processes-ap1-docker-test-setup/docker-compose.yml @@ -138,9 +138,6 @@ services: - type: bind source: ./dic/bpe/log target: /opt/bpe/log - - type: bind - source: ./dic/bpe/last_event - target: /opt/bpe/last_event - type: bind source: ./dic/bpe/cache target: /opt/bpe/cache @@ -274,9 +271,6 @@ services: - type: bind source: ./gth/bpe/log target: /opt/bpe/log - - type: bind - source: ./gth/bpe/last_event - target: /opt/bpe/last_event environment: TZ: Europe/Berlin EXTRA_JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5004 @@ -382,9 +376,6 @@ services: - type: bind source: ./crr/bpe/log target: /opt/bpe/log - - type: bind - source: ./crr/bpe/last_event - target: /opt/bpe/last_event environment: TZ: Europe/Berlin EXTRA_JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 diff --git a/codex-processes-ap1-docker-test-setup/gth/bpe/last_event/README.md b/codex-processes-ap1-docker-test-setup/gth/bpe/last_event/README.md deleted file mode 100644 index 12fefbfa..00000000 --- a/codex-processes-ap1-docker-test-setup/gth/bpe/last_event/README.md +++ /dev/null @@ -1 +0,0 @@ -empty directory for last-event time.file \ No newline at end of file From 4e5892165acd11b3a41f0f62dd001e9784dbfd22 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 12 Oct 2022 12:23:30 +0200 Subject: [PATCH 8/9] process version to 0.7.0 --- .../Task/TaskStartDataSendWithAbsoluteReference.xml | 10 +++++----- .../Task/TaskStartDataSendWithIdentifierReference.xml | 10 +++++----- .../test/resources/fhir/Task/TaskStartDataTrigger.xml | 6 +++--- .../test/resources/fhir/Task/TaskStopDataTrigger.xml | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml index 53e21084..f66e7f86 100644 --- a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml +++ b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml @@ -1,11 +1,11 @@ - + - + - + @@ -54,7 +54,7 @@ - +