Merge remote-tracking branch

'origin/issues/349_add_fhir_validation_dependencies' into develop
highmed · Jun 14, 2022 · b183895 · b183895
2 parents 6e90ed6 + 41ecabb
commit b183895
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml
@@ -19,6 +19,10 @@
 			<groupId>org.highmed.dsf</groupId>
 			<artifactId>dsf-fhir-auth</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.highmed.dsf</groupId>
+			<artifactId>dsf-fhir-validation</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.highmed.dsf</groupId>
@@ -56,6 +60,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine</artifactId>
@@ -65,11 +73,18 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>de.hs-heilbronn.mi</groupId>
 			<artifactId>log4j2-utils</artifactId>
-			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
 		</dependency>
 	</dependencies>
 

diff --git a/.../dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java b/.../dsf-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGenerator.java
@@ -1,21 +1,24 @@
 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;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
 
 public interface SnapshotGenerator
 {
-	class SnapshotWithValidationMessages
+	public class SnapshotWithValidationMessages
 	{
 		private final StructureDefinition snapshot;
-		private final List<ValidationMessage> messages;
+		private final List<ValidationMessage> messages = new ArrayList<>();
 
-		SnapshotWithValidationMessages(StructureDefinition snapshot, List<ValidationMessage> messages)
+		public SnapshotWithValidationMessages(StructureDefinition snapshot, List<ValidationMessage> 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<ValidationMessage> getMessages()
 		{
-			return messages;
+			return Collections.unmodifiableList(messages);
 		}
 	}
 

diff --git a/...-fhir-validation/src/main/java/org/highmed/dsf/fhir/validation/SnapshotGeneratorImpl.java b/...-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());