issue #3855 - remove the 'ibm' level from example paths

and rename "ibm-x" index files to "generated-x" Signed-off-by: Lee Surprenant <lmsurpre@merative.com>
LinuxForHealth · Aug 9, 2022 · afd0ed1 · afd0ed1
1 parent 4ddd764
commit afd0ed1
Show file tree

Hide file tree

Showing 2,725 changed files with 2,710 additions and 4,200 deletions.
diff --git a/fhir-examples/README.md b/fhir-examples/README.md
@@ -1,8 +1,8 @@
 # FHIR Examples
 
-This module collects a large number of FHIR examples into a single spot. The examples are organized into directories for convenience and generally follow the pattern `format/source[/category]/filename`
+This module collects a large number of FHIR examples into a single spot. The examples are organized into directories for convenience and generally follow the pattern `format/category/filename`
 
-The resources under `json/spec` and `xml/spec` were downloaded from FHIR version 4.1.0 on 2021-12-06. The JSON spec examples appear as-is, but the XML example filenames were modified (removed parenthetical content) for congruity with the previous (FHIR 4.0.0) XML examples.
+The resources under `json/spec` and `xml/spec` were downloaded from https://build.fhir.org/branches/R4B/downloads.html on 2022-05-11. The JSON spec examples appear as-is, but the XML example filenames were modified (removed parenthetical content) for congruity with the previous (FHIR 4.0.0) XML examples.
 
 Additionally, the fhir-examples module includes Java helpers for working with these examples:
 * `org.linuxforhealth.fhir.examples.Index` is an enum that mirrors the ".txt" files found at `src/main/resources`

diff --git a/fhir-examples/src/main/java/org/linuxforhealth/fhir/examples/ExamplesUtil.java b/fhir-examples/src/main/java/org/linuxforhealth/fhir/examples/ExamplesUtil.java
@@ -52,7 +52,7 @@ public static Reader indexReader(Index index) throws IOException {
 
     /**
      * Return a reader for the specified example resource.
-     * The resource should be an example resource such as "json/ibm/minimal/Account-1.json".
+     * The resource should be an example resource such as "json/minimal/Account-1.json".
      * 
      * @param resource
      *          The relative path to the example resource within fhir-examples

diff --git a/fhir-examples/src/main/java/org/linuxforhealth/fhir/examples/Index.java b/fhir-examples/src/main/java/org/linuxforhealth/fhir/examples/Index.java
@@ -15,15 +15,15 @@ public enum Index {
      * All examples in all formats
      */
     ALL("/spec-json.txt",
-        "/ibm-json.txt",
+        "/generated-json.txt",
         "/spec-xml.txt",
-        "/ibm-xml.txt"),
+        "/generated-xml.txt"),
 
     /**
      * All JSON examples
      */
     ALL_JSON("/spec-json.txt",
-        "/ibm-json.txt"),
+        "/generated-json.txt"),
 
     /**
      * Small mix of spec and IBM examples used for unit tests to keep build times short
@@ -38,7 +38,7 @@ public enum Index {
     /**
      * All IBM generated examples
      */
-    IBM_JSON("/ibm-json.txt"),
+    GENERATED_JSON("/generated-json.txt"),
 
     /**
      * R4 spec and IBM examples less than 1MB - used for concurrency tests
@@ -63,17 +63,17 @@ public enum Index {
     /**
      * All IBM generated examples
      */
-    IBM_XML("/ibm-xml.txt"),
+    GENERATED_XML("/generated-xml.txt"),
 
     /**
      * Bulk Data Location examples in JSON
      */
-    BULKDATA_LOCATION_JSON("/ibm-json-bulk-data-location.txt"),
+    BULKDATA_LOCATION_JSON("/bulk-data-location.txt"),
 
     /**
      * Bulk Data Dynamic Group examples in JSON
      */
-    BULKDATA_GROUP_JSON("/ibm-json-bulk-data-group.txt");
+    BULKDATA_GROUP_JSON("/bulk-data-group.txt");
 
     private List<String> paths = new ArrayList<>();
 

diff --git a/fhir-examples/src/main/resources/bulk-data-group.txt b/fhir-examples/src/main/resources/bulk-data-group.txt
@@ -0,0 +1,12 @@
+OK         json/bulk-data/group/age-range-blood-pressure-group.json
+OK         json/bulk-data/group/age-range-blood-pressure-example.json
+OK         json/bulk-data/group/age-simple-group.json
+OK         json/bulk-data/group/age-simple-example.json
+OK         json/bulk-data/group/age-range-group.json
+OK         json/bulk-data/group/age-range-example.json
+OK         json/bulk-data/group/age-simple-disabled-group.json
+OK         json/bulk-data/group/age-simple-disabled-example.json
+OK         json/bulk-data/group/age-range-with-gender-group.json
+OK         json/bulk-data/group/age-range-with-gender-example.json
+OK         json/bulk-data/group/age-range-with-gender-and-exclude-group.json
+OK         json/bulk-data/group/age-range-with-gender-and-exclude-example.json
diff --git a/fhir-examples/src/main/resources/bulk-data-location.txt b/fhir-examples/src/main/resources/bulk-data-location.txt
@@ -0,0 +1,128 @@
+OK         json/bulk-data/location/synthetic-mass-1.json
+OK         json/bulk-data/location/synthetic-mass-2.json
+OK         json/bulk-data/location/synthetic-mass-3.json
+OK         json/bulk-data/location/synthetic-mass-4.json
+OK         json/bulk-data/location/synthetic-mass-5.json
+OK         json/bulk-data/location/synthetic-mass-6.json
+OK         json/bulk-data/location/synthetic-mass-7.json
+OK         json/bulk-data/location/synthetic-mass-8.json
+OK         json/bulk-data/location/synthetic-mass-9.json
+OK         json/bulk-data/location/synthetic-mass-10.json
+OK         json/bulk-data/location/synthetic-mass-11.json
+OK         json/bulk-data/location/synthetic-mass-12.json
+OK         json/bulk-data/location/synthetic-mass-13.json
+OK         json/bulk-data/location/synthetic-mass-14.json
+OK         json/bulk-data/location/synthetic-mass-15.json
+OK         json/bulk-data/location/synthetic-mass-16.json
+OK         json/bulk-data/location/synthetic-mass-17.json
+OK         json/bulk-data/location/synthetic-mass-18.json
+OK         json/bulk-data/location/synthetic-mass-19.json
+OK         json/bulk-data/location/synthetic-mass-20.json
+OK         json/bulk-data/location/synthetic-mass-21.json
+OK         json/bulk-data/location/synthetic-mass-22.json
+OK         json/bulk-data/location/synthetic-mass-23.json
+OK         json/bulk-data/location/synthetic-mass-24.json
+OK         json/bulk-data/location/synthetic-mass-25.json
+OK         json/bulk-data/location/synthetic-mass-26.json
+OK         json/bulk-data/location/synthetic-mass-27.json
+OK         json/bulk-data/location/synthetic-mass-28.json
+OK         json/bulk-data/location/synthetic-mass-29.json
+OK         json/bulk-data/location/synthetic-mass-30.json
+OK         json/bulk-data/location/synthetic-mass-31.json
+OK         json/bulk-data/location/synthetic-mass-32.json
+OK         json/bulk-data/location/synthetic-mass-33.json
+OK         json/bulk-data/location/synthetic-mass-34.json
+OK         json/bulk-data/location/synthetic-mass-35.json
+OK         json/bulk-data/location/synthetic-mass-36.json
+OK         json/bulk-data/location/synthetic-mass-37.json
+OK         json/bulk-data/location/synthetic-mass-38.json
+OK         json/bulk-data/location/synthetic-mass-39.json
+OK         json/bulk-data/location/synthetic-mass-40.json
+OK         json/bulk-data/location/synthetic-mass-41.json
+OK         json/bulk-data/location/synthetic-mass-42.json
+OK         json/bulk-data/location/synthetic-mass-43.json
+OK         json/bulk-data/location/synthetic-mass-44.json
+OK         json/bulk-data/location/synthetic-mass-45.json
+OK         json/bulk-data/location/synthetic-mass-46.json
+OK         json/bulk-data/location/synthetic-mass-47.json
+OK         json/bulk-data/location/synthetic-mass-48.json
+OK         json/bulk-data/location/synthetic-mass-49.json
+OK         json/bulk-data/location/synthetic-mass-50.json
+OK         json/bulk-data/location/synthetic-mass-51.json
+OK         json/bulk-data/location/synthetic-mass-52.json
+OK         json/bulk-data/location/synthetic-mass-53.json
+OK         json/bulk-data/location/synthetic-mass-54.json
+OK         json/bulk-data/location/synthetic-mass-55.json
+OK         json/bulk-data/location/synthetic-mass-56.json
+OK         json/bulk-data/location/synthetic-mass-57.json
+OK         json/bulk-data/location/synthetic-mass-58.json
+OK         json/bulk-data/location/synthetic-mass-59.json
+OK         json/bulk-data/location/synthetic-mass-60.json
+OK         json/bulk-data/location/synthetic-mass-61.json
+OK         json/bulk-data/location/synthetic-mass-62.json
+OK         json/bulk-data/location/synthetic-mass-63.json
+OK         json/bulk-data/location/synthetic-mass-64.json
+OK         json/bulk-data/location/synthetic-mass-65.json
+OK         json/bulk-data/location/synthetic-mass-66.json
+OK         json/bulk-data/location/synthetic-mass-67.json
+OK         json/bulk-data/location/synthetic-mass-68.json
+OK         json/bulk-data/location/synthetic-mass-69.json
+OK         json/bulk-data/location/synthetic-mass-70.json
+OK         json/bulk-data/location/synthetic-mass-71.json
+OK         json/bulk-data/location/synthetic-mass-72.json
+OK         json/bulk-data/location/synthetic-mass-73.json
+OK         json/bulk-data/location/synthetic-mass-74.json
+OK         json/bulk-data/location/synthetic-mass-75.json
+OK         json/bulk-data/location/synthetic-mass-76.json
+OK         json/bulk-data/location/synthetic-mass-77.json
+OK         json/bulk-data/location/synthetic-mass-78.json
+OK         json/bulk-data/location/synthetic-mass-79.json
+OK         json/bulk-data/location/synthetic-mass-80.json
+OK         json/bulk-data/location/synthetic-mass-81.json
+OK         json/bulk-data/location/synthetic-mass-82.json
+OK         json/bulk-data/location/synthetic-mass-83.json
+OK         json/bulk-data/location/synthetic-mass-84.json
+OK         json/bulk-data/location/synthetic-mass-85.json
+OK         json/bulk-data/location/synthetic-mass-86.json
+OK         json/bulk-data/location/synthetic-mass-87.json
+OK         json/bulk-data/location/synthetic-mass-88.json
+OK         json/bulk-data/location/synthetic-mass-89.json
+OK         json/bulk-data/location/synthetic-mass-90.json
+OK         json/bulk-data/location/synthetic-mass-91.json
+OK         json/bulk-data/location/synthetic-mass-92.json
+OK         json/bulk-data/location/synthetic-mass-93.json
+OK         json/bulk-data/location/synthetic-mass-94.json
+OK         json/bulk-data/location/synthetic-mass-95.json
+OK         json/bulk-data/location/synthetic-mass-96.json
+OK         json/bulk-data/location/synthetic-mass-97.json
+OK         json/bulk-data/location/synthetic-mass-98.json
+OK         json/bulk-data/location/synthetic-mass-99.json
+OK         json/bulk-data/location/synthetic-mass-100.json
+OK         json/bulk-data/location/synthetic-mass-101.json
+OK         json/bulk-data/location/synthetic-mass-102.json
+OK         json/bulk-data/location/synthetic-mass-103.json
+OK         json/bulk-data/location/synthetic-mass-104.json
+OK         json/bulk-data/location/synthetic-mass-105.json
+OK         json/bulk-data/location/synthetic-mass-106.json
+OK         json/bulk-data/location/synthetic-mass-107.json
+OK         json/bulk-data/location/synthetic-mass-108.json
+OK         json/bulk-data/location/synthetic-mass-109.json
+OK         json/bulk-data/location/synthetic-mass-110.json
+OK         json/bulk-data/location/synthetic-mass-111.json
+OK         json/bulk-data/location/synthetic-mass-112.json
+OK         json/bulk-data/location/synthetic-mass-113.json
+OK         json/bulk-data/location/synthetic-mass-114.json
+OK         json/bulk-data/location/synthetic-mass-115.json
+OK         json/bulk-data/location/synthetic-mass-116.json
+OK         json/bulk-data/location/synthetic-mass-117.json
+OK         json/bulk-data/location/synthetic-mass-118.json
+OK         json/bulk-data/location/synthetic-mass-119.json
+OK         json/bulk-data/location/synthetic-mass-120.json
+OK         json/bulk-data/location/synthetic-mass-121.json
+OK         json/bulk-data/location/synthetic-mass-122.json
+OK         json/bulk-data/location/synthetic-mass-123.json
+OK         json/bulk-data/location/synthetic-mass-124.json
+OK         json/bulk-data/location/synthetic-mass-125.json
+OK         json/bulk-data/location/synthetic-mass-126.json
+OK         json/bulk-data/location/synthetic-mass-127.json
+OK         json/bulk-data/location/synthetic-mass-128.json