Merge branch 'main' into golden-tests

CDCgov · Jan 3, 2025 · c4b79e9 · c4b79e9
2 parents 1232ae4 + 0288de9
commit c4b79e9
Show file tree

Hide file tree

Showing 32 changed files with 951 additions and 625 deletions.
diff --git a/rs-e2e/README.md b/rs-e2e/README.md
@@ -10,6 +10,7 @@ Information on how to set up the sample files evaluated by the tests can be foun
 
 - The output files generated by the framework are stored in an Azure blob storage container. Every time the tests are run, a cleanup task moves the files to a folder with the year/month/day format for better organization. The files are retained in the container for 90 days before being deleted
 - The code that organizes the files is using EST time zone. This means that if you are in PST, you may run into an issue if you submit a run before 9 PM PST and then run the tests after 9pm. You'd need to make sure to run both tasks before or after 9pm so the files are where they are expected to be
+- The HL7 parser and expression evaluator returns an empty string when the value is not found. It will only throw an exception if the path is not a valid HL7 notation
 
 ## Running the tests
 

diff --git a/rs-e2e/build.gradle b/rs-e2e/build.gradle
@@ -20,10 +20,6 @@ dependencies {
     // azure
     implementation 'com.azure:azure-storage-blob:12.29.0'
 
-    // hapi hl7
-    implementation 'ca.uhn.hapi:hapi-base:2.5.1'
-    implementation 'ca.uhn.hapi:hapi-structures-v251:2.5.1'
-
     testImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 }

diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/FileFetcher.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/FileFetcher.java
@@ -1,5 +1,6 @@
 package gov.hhs.cdc.trustedintermediary.rse2e;
 
+import gov.hhs.cdc.trustedintermediary.rse2e.hl7.HL7FileStream;
 import java.util.List;
 
 /**

diff --git a/...ermediary/rse2e/AzureBlobFileFetcher.java → .../external/azure/AzureBlobFileFetcher.java b/...ermediary/rse2e/AzureBlobFileFetcher.java → .../external/azure/AzureBlobFileFetcher.java
@@ -1,10 +1,12 @@
-package gov.hhs.cdc.trustedintermediary.rse2e;
+package gov.hhs.cdc.trustedintermediary.rse2e.external.azure;
 
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobContainerClient;
 import com.azure.storage.blob.BlobContainerClientBuilder;
 import com.azure.storage.blob.models.BlobItem;
 import com.azure.storage.blob.models.ListBlobsOptions;
+import gov.hhs.cdc.trustedintermediary.rse2e.FileFetcher;
+import gov.hhs.cdc.trustedintermediary.rse2e.hl7.HL7FileStream;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZoneOffset;

diff --git a/...edintermediary/rse2e/AzureBlobHelper.java → ...rse2e/external/azure/AzureBlobHelper.java b/...edintermediary/rse2e/AzureBlobHelper.java → ...rse2e/external/azure/AzureBlobHelper.java
@@ -1,4 +1,4 @@
-package gov.hhs.cdc.trustedintermediary.rse2e;
+package gov.hhs.cdc.trustedintermediary.rse2e.external.azure;
 
 import java.time.LocalDate;
 

diff --git a/...ntermediary/rse2e/AzureBlobOrganizer.java → ...2e/external/azure/AzureBlobOrganizer.java b/...ntermediary/rse2e/AzureBlobOrganizer.java → ...2e/external/azure/AzureBlobOrganizer.java
@@ -1,4 +1,4 @@
-package gov.hhs.cdc.trustedintermediary.rse2e;
+package gov.hhs.cdc.trustedintermediary.rse2e.external.azure;
 
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobContainerClient;

diff --git a/.../java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7ExpressionEvaluator.java b/.../java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7ExpressionEvaluator.java
diff --git a/...src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7FileMatcher.java b/...src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7FileMatcher.java
diff --git a/...java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7FileMatcherException.java b/...java/gov/hhs/cdc/trustedintermediary/rse2e/external/hapi/HapiHL7FileMatcherException.java