diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml
index 5742d8a3f..d5844ec56 100755
--- a/dsf-bpe/dsf-bpe-process-base/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-base/pom.xml
@@ -19,6 +19,10 @@
org.highmed.dsf
dsf-fhir-auth
+
+ org.highmed.dsf
+ dsf-fhir-validation
+
org.highmed.dsf
@@ -56,6 +60,10 @@
org.springframework
spring-context
+
+ org.springframework
+ spring-web
+
org.camunda.bpm
camunda-engine
@@ -65,11 +73,18 @@
commons-io
commons-io
+
+ org.apache.commons
+ commons-compress
+
de.hs-heilbronn.mi
log4j2-utils
- test
+
+
+ org.slf4j
+ jul-to-slf4j
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java b/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java
index f2ffe050b..58eadac17 100755
--- a/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java
+++ b/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java
@@ -1,5 +1,7 @@
package org.highmed.dsf.fhir.validation;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.hl7.fhir.r4.model.StructureDefinition;
@@ -7,15 +9,16 @@
public interface SnapshotGenerator
{
- class SnapshotWithValidationMessages
+ public class SnapshotWithValidationMessages
{
private final StructureDefinition snapshot;
- private final List messages;
+ private final List messages = new ArrayList<>();
- SnapshotWithValidationMessages(StructureDefinition snapshot, List messages)
+ public SnapshotWithValidationMessages(StructureDefinition snapshot, List messages)
{
this.snapshot = snapshot;
- this.messages = messages;
+ if (messages != null)
+ this.messages.addAll(messages);
}
public StructureDefinition getSnapshot()
@@ -25,7 +28,7 @@ public StructureDefinition getSnapshot()
public List getMessages()
{
- return messages;
+ return Collections.unmodifiableList(messages);
}
}
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGeneratorImpl.java b/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGeneratorImpl.java
index 733501854..695182aac 100755
--- a/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGeneratorImpl.java
+++ b/dsf-fhir/dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGeneratorImpl.java
@@ -26,7 +26,7 @@ public SnapshotGeneratorImpl(FhirContext fhirContext, IValidationSupport validat
worker = createWorker(fhirContext, validationSupport);
}
- protected HapiWorkerContext createWorker(FhirContext context, IValidationSupport validationSupport)
+ protected IWorkerContext createWorker(FhirContext context, IValidationSupport validationSupport)
{
HapiWorkerContext workerContext = new HapiWorkerContext(context, validationSupport);
workerContext.setLocale(context.getLocalizer().getLocale());