Transformation Engine To Use Map<String,Object> As Args

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/CustomFhirTransformation.java

@@ -8,5 +8,5 @@
  * implemented by classes in the custom/ folder.
  */
 public interface CustomFhirTransformation {
-    void transform(FhirResource<?> resource, Map<String, String> args);
+    void transform(FhirResource<?> resource, Map<String, Object> args);
 }

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/TransformationRule.java

@@ -48,7 +48,7 @@ public void runRule(FhirResource<?> resource) {
     private void applyTransformation(
             TransformationRuleMethod transformation, FhirResource<?> resource) {
         String name = transformation.name();
-        Map<String, String> args = transformation.args();
+        Map<String, Object> args = transformation.args();
         logger.logInfo("Applying transformation: " + name);
 
         CustomFhirTransformation transformationInstance = getTransformationInstance(name);

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/TransformationRuleMethod.java

@@ -8,4 +8,4 @@
  * @param name The name of the transformation.
  * @param args The arguments to pass to the transformation method.
  */
-public record TransformationRuleMethod(String name, Map<String, String> args) {}
+public record TransformationRuleMethod(String name, Map<String, Object> args) {}

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/AddContactSectionToPatientResource.java

@@ -19,7 +19,7 @@ public class AddContactSectionToPatientResource implements CustomFhirTransformat
             ApplicationContext.getImplementation(MetricMetadata.class);
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
 
         HapiHelper.resourcesInBundle(bundle, Patient.class)

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/AddEtorProcessingTag.java

@@ -16,7 +16,7 @@ public class AddEtorProcessingTag implements CustomFhirTransformation {
             ApplicationContext.getImplementation(MetricMetadata.class);
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
 
         var system = "http://localcodes.org/ETOR";

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/ConvertToOmlOrder.java

@@ -16,7 +16,7 @@ public class ConvertToOmlOrder implements CustomFhirTransformation {
             ApplicationContext.getImplementation(MetricMetadata.class);
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         HapiHelper.setMSH9Coding(bundle, HapiHelper.OML_CODING);
         metadata.put(bundle.getId(), EtorMetadataStep.ORDER_CONVERTED_TO_OML);

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/CopyOrcOrderProviderToObrOrderProvider.java

@@ -13,7 +13,7 @@
 public class CopyOrcOrderProviderToObrOrderProvider implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         DiagnosticReport diagnosticReport = HapiHelper.getDiagnosticReport(bundle);
         if (diagnosticReport == null) {

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/MapLocalObservationCodes.java

@@ -31,7 +31,7 @@ public MapLocalObservationCodes() {
     }
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         var bundle = (Bundle) resource.getUnderlyingResource();
         var observations = HapiHelper.resourcesInBundle(bundle, Observation.class);
 

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/RemoveMessageTypeStructure.java

@@ -13,7 +13,7 @@
 public class RemoveMessageTypeStructure implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         String msh9_3 = HapiHelper.getMSH9_3Value(bundle);
         if (msh9_3 == null) {

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/RemoveObservationRequests.java

@@ -22,10 +22,11 @@
 public class RemoveObservationRequests implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
+        // Let it fail if it is not a String
+        String universalServiceIdentifier = (String) args.get("universalServiceIdentifier");
 
-        String universalServiceIdentifier = args.get("universalServiceIdentifier");
         Set<Resource> resourcesToRemove = new HashSet<>();
         List<Reference> observationReferences = new ArrayList<>();
         DiagnosticReport singleDiagnosticReport = null;

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/RemovePatientIdentifiers.java

@@ -13,7 +13,7 @@
 public class RemovePatientIdentifiers implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         HapiHelper.setPID3_4Value(bundle, ""); // remove PID.3-4
         HapiHelper.setPID3_5Value(bundle, ""); // remove PID.3-5

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/RemovePatientNameTypeCode.java

@@ -10,7 +10,7 @@
 public class RemovePatientNameTypeCode implements CustomFhirTransformation {
 
     @Override
-    public void transform(final FhirResource<?> resource, final Map<String, String> args) {
+    public void transform(final FhirResource<?> resource, final Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         // Need to set the value for extension to empty instead of removing the extension,
         // otherwise RS will set its own value in its place

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/SwapPlacerOrderAndGroupNumbers.java

@@ -17,7 +17,7 @@
 public class SwapPlacerOrderAndGroupNumbers implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         var serviceRequests = HapiHelper.resourcesInBundle(bundle, ServiceRequest.class);
 

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/UpdateReceivingApplicationNamespace.java

@@ -13,11 +13,18 @@
 public class UpdateReceivingApplicationNamespace implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
+        // Let it fail if it is not a string
+        String name = (String) args.get("name");
         var receivingApplication = HapiHelper.getMSH5MessageDestinationComponent(bundle);
+
+        if (receivingApplication == null) {
+            return;
+        }
+
         receivingApplication.removeExtension(HapiHelper.EXTENSION_UNIVERSAL_ID_URL);
         receivingApplication.removeExtension(HapiHelper.EXTENSION_UNIVERSAL_ID_TYPE_URL);
-        receivingApplication.setName(args.get("name"));
+        receivingApplication.setName(name);
     }
 }

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/UpdateReceivingFacilityWithOrderingFacilityIdentifier.java

@@ -16,7 +16,7 @@ public class UpdateReceivingFacilityWithOrderingFacilityIdentifier
         implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         DiagnosticReport diagnosticReport = HapiHelper.getDiagnosticReport(bundle);
         if (diagnosticReport == null) {

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/UpdateSendingFacilityNamespace.java

@@ -5,6 +5,7 @@
 import gov.hhs.cdc.trustedintermediary.external.hapi.HapiHelper;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Identifier;
 
@@ -15,14 +16,18 @@
 public class UpdateSendingFacilityNamespace implements CustomFhirTransformation {
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         Identifier namespaceIdentifier = HapiHelper.getMSH4_1Identifier(bundle);
         if (namespaceIdentifier == null) {
             return;
         }
-        namespaceIdentifier.setValue(args.get("name"));
-        HapiHelper.getMSH4Organization(bundle)
+
+        // Let it fail if it is not a string
+        String name = (String) args.get("name");
+
+        namespaceIdentifier.setValue(name);
+        Objects.requireNonNull(HapiHelper.getMSH4Organization(bundle))
                 .setIdentifier(Collections.singletonList(namespaceIdentifier));
     }
 }

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/UpdateUniversalServiceIdentifier.java

@@ -23,33 +23,41 @@ public class UpdateUniversalServiceIdentifier implements CustomFhirTransformatio
     public static final String ALTERNATE_ID_NAME = "alternateId";
 
     @Override
-    public void transform(FhirResource<?> resource, Map<String, String> args) {
+    public void transform(FhirResource<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource();
         var serviceRequests = HapiHelper.resourcesInBundle(bundle, ServiceRequest.class);
 
         serviceRequests.forEach(
                 it -> {
                     var allCodings = it.getCode().getCoding();
                     var codingSystemContainer =
-                            getCodingSystemContainer(allCodings, args.get(CHECK_VALUE_NAME));
+                            getCodingSystemContainer(
+                                    allCodings, castToString(args.get(CHECK_VALUE_NAME)));
 
                     if (codingSystemContainer == null) {
                         // we're only interested in coding that matches the checkValue argument
                         return;
                     }
 
                     // check for the coding system label and create or override it
-                    updateCodingSystemLabel(codingSystemContainer, args.get(CODING_SYSTEM_NAME));
+                    updateCodingSystemLabel(
+                            codingSystemContainer, castToString(args.get(CODING_SYSTEM_NAME)));
 
                     // the alt id is stored on a separate coding object, so we need to filter
                     // for it
-                    String alternateId = args.get(ALTERNATE_ID_NAME);
+                    String alternateId = castToString(args.get(ALTERNATE_ID_NAME));
                     if (alternateId != null) {
                         updateAlternateCodingId(allCodings, alternateId);
                     }
                 });
     }
 
+    // Returns null if it is not a String
+    private String castToString(Object obj) {
+        // Let it fail if it is not a string
+        return (String) obj;
+    }
+
     /**
      * Extract the first "Coding System" object that matches a given string from a given list of
      * Codings

etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/HappyPathCustomTransformationMockClass.groovy

@@ -9,7 +9,7 @@ import org.hl7.fhir.r4.model.Coding
 class HappyPathCustomTransformationMockClass implements CustomFhirTransformation {
 
     @Override
-    public void transform(final FhirResource<?> resource, final Map<String, String> args) {
+    public void transform(final FhirResource<?> resource, final Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingResource()
 
         def system = "http://terminology.hl7.org/CodeSystem/v2-0003"