From dc8966817fc590e291dee41c6481c8fff4aafacd Mon Sep 17 00:00:00 2001
From: Reto Wettstein <Reto.Wettstein@med.uni-heidelberg.de>
Date: Fri, 31 Oct 2025 08:29:20 +0100
Subject: [PATCH 1/2] add quantity and choice examples, update dependencies

---
 pom.xml                                       |  8 ++---
 .../HelloWorldProcessPluginDefinition.java    |  2 +-
 .../fhir/CodeSystem/dsf-hello-world.xml       |  5 +++
 .../fhir/Questionnaire/dsf-hello-user.xml     | 14 +++++++-
 .../dsf-task-hello-world.xml                  | 35 +++++++++++++++++++
 .../fhir/Task/dsf-task-hello-world.xml        | 15 ++++++++
 .../dev/dsf/fhir/profile/TaskProfileTest.java |  6 ++++
 7 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bf7d5d..00f7f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>dev.dsf</groupId>
 	<artifactId>dsf-process-hello-world</artifactId>
-	<version>1.5.0.0-SNAPSHOT</version>
+	<version>2.0.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -13,7 +13,7 @@
 		<compileSource>17</compileSource>
 		<compileTarget>17</compileTarget>
 
-		<dsf.version>1.5.0-SNAPSHOT</dsf.version>
+		<dsf.version>1.9.0</dsf.version>
 		<dsf.location>../dsf</dsf.location>
 	</properties>
 
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.12</version>
+			<version>2.0.17</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j2-impl</artifactId>
-			<version>2.22.1</version>
+			<version>2.25.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java b/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java
index 72293ff..6026ce9 100644
--- a/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java
+++ b/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java
@@ -10,7 +10,7 @@
 
 public class HelloWorldProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "1.5.0.0";
+	public static final String VERSION = "2.0.0.0";
 	public static final LocalDate RELEASE_DATE = LocalDate.of(2023, 5, 20);
 
 	@Override
diff --git a/src/main/resources/fhir/CodeSystem/dsf-hello-world.xml b/src/main/resources/fhir/CodeSystem/dsf-hello-world.xml
index 4b8a18a..0a9b0ec 100644
--- a/src/main/resources/fhir/CodeSystem/dsf-hello-world.xml
+++ b/src/main/resources/fhir/CodeSystem/dsf-hello-world.xml
@@ -86,4 +86,9 @@
 		<display value="Coding Example" />
 		<definition value="Example coding input value" />
 	</concept>
+	<concept>
+		<code value="quantity-example" />
+		<display value="Quantity Example" />
+		<definition value="Example quantity input value" />
+	</concept>
 </CodeSystem> 
\ No newline at end of file
diff --git a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
index f298789..9e4ff12 100644
--- a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
+++ b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
@@ -1,6 +1,6 @@
 <Questionnaire xmlns="http://hl7.org/fhir">
 	<meta>
-		<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire|1.5.0"/>
+		<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire|2.0.0"/>
 		<tag>
 			<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag"/>
 			<code value="ALL"/>
@@ -90,4 +90,16 @@
 		<text value="Do you approve the release of the data-set?"/>
 		<required value="false"/>
 	</item>
+	<item>
+		<linkId value="choice-example"/>
+		<type value="choice"/>
+		<text value="Add a coding to test the choice type"/>
+		<required value="false"/>
+	</item>
+	<item>
+		<linkId value="quantity-example"/>
+		<type value="quantity"/>
+		<text value="Add a quantity to test the quantity type"/>
+		<required value="false"/>
+	</item>
 </Questionnaire>
\ No newline at end of file
diff --git a/src/main/resources/fhir/StructureDefinition/dsf-task-hello-world.xml b/src/main/resources/fhir/StructureDefinition/dsf-task-hello-world.xml
index 40a6b57..0ff6096 100644
--- a/src/main/resources/fhir/StructureDefinition/dsf-task-hello-world.xml
+++ b/src/main/resources/fhir/StructureDefinition/dsf-task-hello-world.xml
@@ -544,5 +544,40 @@
     <element id="Task.input:coding-example.value[x].code">
       <path value="Task.input.value[x].code" />
     </element>
+    <element id="Task.input:quantity-example">
+      <path value="Task.input" />
+      <sliceName value="quantity-example" />
+      <min value="0" />
+      <max value="1" />
+    </element>
+    <element id="Task.input:quantity-example.type">
+      <path value="Task.input.type" />
+      <binding>
+        <strength value="required" />
+        <valueSet value="http://dsf.dev/fhir/ValueSet/hello-world|#{version}" />
+      </binding>
+    </element>
+    <element id="Task.input:quantity-example.type.coding">
+      <path value="Task.input.type.coding" />
+      <min value="1" />
+      <max value="1" />
+    </element>
+    <element id="Task.input:quantity-example.system">
+      <path value="Task.input.type.coding.system" />
+      <min value="1" />
+      <fixedUri value="http://dsf.dev/fhir/CodeSystem/hello-world" />
+    </element>
+    <element id="Task.input:quantity-example.type.coding.code">
+      <path value="Task.input.type.coding.code" />
+      <min value="1" />
+      <fixedCode value="quantity-example" />
+    </element>
+    <element id="Task.input:quantity-example.value[x]">
+      <path value="Task.input.value[x]" />
+      <type>
+        <code value="Quantity" />
+      </type>
+      <min value="1" />
+    </element>
   </differential>
 </StructureDefinition>
\ No newline at end of file
diff --git a/src/main/resources/fhir/Task/dsf-task-hello-world.xml b/src/main/resources/fhir/Task/dsf-task-hello-world.xml
index 1db9e48..51e1532 100644
--- a/src/main/resources/fhir/Task/dsf-task-hello-world.xml
+++ b/src/main/resources/fhir/Task/dsf-task-hello-world.xml
@@ -166,4 +166,19 @@
       <code value="coding-example" />
     </valueCoding>
   </input>
+  <input>
+    <type>
+      <coding>
+        <system value="http://dsf.dev/fhir/CodeSystem/hello-world" />
+        <code value="quantity-example" />
+      </coding>
+    </type>
+    <valueQuantity>
+      <comparator value="&lt;=" />
+      <value value="10" />
+      <unit value="m" />
+      <system value="http://unitsofmeasure.org" />
+      <code value="m" />
+    </valueQuantity>
+  </input>
 </Task>
\ No newline at end of file
diff --git a/src/test/java/dev/dsf/fhir/profile/TaskProfileTest.java b/src/test/java/dev/dsf/fhir/profile/TaskProfileTest.java
index 200b798..88b89a5 100644
--- a/src/test/java/dev/dsf/fhir/profile/TaskProfileTest.java
+++ b/src/test/java/dev/dsf/fhir/profile/TaskProfileTest.java
@@ -13,6 +13,7 @@
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.InstantType;
 import org.hl7.fhir.r4.model.IntegerType;
+import org.hl7.fhir.r4.model.Quantity;
 import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.StringType;
@@ -101,6 +102,11 @@ public void testMaximalTaskHelloWorldValid()
 						new Coding().setSystem("http://dsf.dev/fhir/CodeSystem/hello-world").setCode("coding-example"))
 				.getType().addCoding(
 						new Coding().setSystem("http://dsf.dev/fhir/CodeSystem/hello-world").setCode("coding-example"));
+		task.addInput()
+				.setValue(new Quantity().setSystem("http://unitsofmeasure.org").setCode("m").setUnit("m").setValue(1)
+						.setComparator(Quantity.QuantityComparator.LESS_OR_EQUAL))
+				.getType().addCoding(new Coding().setSystem("http://dsf.dev/fhir/CodeSystem/hello-world")
+						.setCode("quantity-example"));
 
 		ValidationResult result = resourceValidator.validate(task);
 		ValidationSupportRule.logValidationMessages(logger, result);

From 8c4ff0505cbe8307e1f96ddbb4d119fecf98ffba Mon Sep 17 00:00:00 2001
From: Reto Wettstein <Reto.Wettstein@med.uni-heidelberg.de>
Date: Fri, 31 Oct 2025 10:20:58 +0100
Subject: [PATCH 2/2] DSF 2.0.0 does not deploy questionnaire with profile
 version set

---
 src/main/resources/fhir/Questionnaire/dsf-hello-user.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
index 9e4ff12..f87831a 100644
--- a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
+++ b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
@@ -1,6 +1,6 @@
 <Questionnaire xmlns="http://hl7.org/fhir">
 	<meta>
-		<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire|2.0.0"/>
+		<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire"/>
 		<tag>
 			<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag"/>
 			<code value="ALL"/>