Merge pull request #3651 from IBM/issue-3650

issue #3650 - add PDEX PlanNet 1.1.0
LinuxForHealth · Jun 9, 2022 · 1df15e0 · 1df15e0
2 parents daa1f05 + af2b923
commit 1df15e0
Show file tree

Hide file tree

Showing 504 changed files with 125,958 additions and 286 deletions.
diff --git a/conformance/fhir-ig-davinci-pdex-plan-net/CHANGELOG.md b/conformance/fhir-ig-davinci-pdex-plan-net/CHANGELOG.md
@@ -1,4 +1,28 @@
+# Changes 
+
+## PDEX PlanNet 1.0.0
 Source - https://build.fhir.org/ig/HL7/davinci-pdex-plan-net
 Corresponding to https://github.com/HL7/davinci-pdex-plan-net/commit/2c561128f864e87f50a00a478aa5dbccba6865fc
 - Modified CapabilityStatement-plan-net.json to remove <br/> tags between list items in the narrative text (which is invalid XHTML)
-- Modified ig-r4.json to remove parameters that aren't valid in FHIR R4
+- Modified ig-r4.json to remove parameters that aren't valid in FHIR R4
+- Stripped narrative text to reduce the size and formatted the JSON contents (both via the ResourceProcessor tool)
+- Added version id to each targetProfile canonical reference (e.g. `http://hl7.org/fhir/us/davinci-pdex-plan-net/StructureDefinition/plannet-Organization` -> `http://hl7.org/fhir/us/davinci-pdex-plan-net/StructureDefinition/plannet-Organization|1.0.0`)
+- Added version id to each valueSet binding target (e.g. `http://hl7.org/fhir/us/davinci-pdex-plan-net/ValueSet/InsuranceProductTypeVS` -> `http://hl7.org/fhir/us/davinci-pdex-plan-net/ValueSet/InsuranceProductTypeVS|1.0.0`)
+
+Note: the examples were subsequently retrieved from http://hl7.org/fhir/us/davinci-pdex-plan-net/STU1/package.tgz on May 19, 2022.
+
+## PDEX PlanNet 1.1.0
+Source - http://hl7.org/fhir/us/davinci-pdex-plan-net/STU1.1/package.tgz retrieved on May 19, 2022.
+- Modified CapabilityStatement-plan-net.json to remove <br/> tags between list items in the narrative text (which is invalid XHTML)
+- Modified ig-r4.json to remove parameters that aren't valid in FHIR R4
+- Stripped narrative text to reduce the size and formatted the JSON contents (both via the ResourceProcessor tool)
+
+# Steps to update
+1. download the npm package for whatever version of PDEX PlanNet you want (and note what downloads we used from where in this file)
+2. update `src/main/resources` with the latest conformance artifacts and `src/test/resources` with the latest examples
+3. if its a new version
+   - ensure references from the previous package are version-specific (e.g. to avoid a 1.0.0 profile from picking up a 1.1.0 valueset during validation)
+   - add a new provider (`src/main/java` and `src/main/resources/META-INF`)
+   - create tests for this new version (update ConstraintGeneratorTest and PlanNetResourceProviderTest)
+4. execute ResourceProcessor from src/test/java with the proper arguments
+5. execute SearchParameterAugmenter from src/test/java with the proper arguments
diff --git a/conformance/fhir-ig-davinci-pdex-plan-net/pom.xml b/conformance/fhir-ig-davinci-pdex-plan-net/pom.xml
@@ -20,11 +20,6 @@
             <artifactId>fhir-registry</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fhir-ig-us-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -43,6 +38,13 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fhir-registry</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>fhir-examples</artifactId>

diff --git a/...an-net/src/main/java/com/ibm/fhir/ig/davinci/pdex/plannet/PlanNet100ResourceProvider.java b/...an-net/src/main/java/com/ibm/fhir/ig/davinci/pdex/plannet/PlanNet100ResourceProvider.java
@@ -0,0 +1,16 @@
+/*
+ * (C) Copyright IBM Corp. 2020, 2022
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ibm.fhir.ig.davinci.pdex.plannet;
+
+import com.ibm.fhir.registry.util.PackageRegistryResourceProvider;
+
+public class PlanNet100ResourceProvider extends PackageRegistryResourceProvider {
+    @Override
+    public String getPackageId() {
+        return "hl7.fhir.us.davinci-pdex-plan-net.100";
+    }
+}
diff --git a/...pdex/plannet/PlanNetResourceProvider.java → ...x/plannet/PlanNet110ResourceProvider.java b/...pdex/plannet/PlanNetResourceProvider.java → ...x/plannet/PlanNet110ResourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2020
+ * (C) Copyright IBM Corp. 2022
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,9 +8,9 @@
 
 import com.ibm.fhir.registry.util.PackageRegistryResourceProvider;
 
-public class PlanNetResourceProvider extends PackageRegistryResourceProvider {
+public class PlanNet110ResourceProvider extends PackageRegistryResourceProvider {
     @Override
     public String getPackageId() {
-        return "hl7.fhir.us.davinci-pdex-plan-net";
+        return "hl7.fhir.us.davinci-pdex-plan-net.110";
     }
 }
diff --git a/...c/main/resources/META-INF/services/com.ibm.fhir.registry.spi.FHIRRegistryResourceProvider b/...c/main/resources/META-INF/services/com.ibm.fhir.registry.spi.FHIRRegistryResourceProvider
@@ -1 +1,2 @@
-com.ibm.fhir.ig.davinci.pdex.plannet.PlanNetResourceProvider
+com.ibm.fhir.ig.davinci.pdex.plannet.PlanNet100ResourceProvider
+com.ibm.fhir.ig.davinci.pdex.plannet.PlanNet110ResourceProvider