Merge branch 'azure-load-tests' of https://github.com/CDCgov/trusted-intermediary into azure-load-tests

Author: jherrflexion

app/build.gradle

@@ -23,12 +23,12 @@ dependencies {
     implementation project(':etor')
     testImplementation testFixtures(project(':shared'))
 
-    implementation 'io.javalin:javalin:6.3.0'
+    implementation 'io.javalin:javalin:6.4.0'
 
     testImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation 'com.openpojo:openpojo:0.9.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.5'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.18'
 }
 
 jacocoTestCoverageVerification {

app/src/main/java/gov/hhs/cdc/trustedintermediary/external/javalin/App.java

@@ -48,7 +48,12 @@ public static void main(String[] args) {
 
         // apply this security header to all responses, but allow it to be overwritten by a specific
         // endpoint by using `before` if needed
-        app.before(ctx -> ctx.header("X-Content-Type-Options", "nosniff"));
+        app.before(
+                ctx -> {
+                    ctx.header("X-Content-Type-Options", "nosniff");
+                    // Fix for https://www.zaproxy.org/docs/alerts/90004
+                    ctx.header("Cross-Origin-Resource-Policy", "cross-origin");
+                });
 
         try {
             app.get(HEALTH_API_ENDPOINT, ctx -> ctx.result("Operational"));

app/src/main/java/gov/hhs/cdc/trustedintermediary/external/javalin/DomainsRegistration.java

@@ -122,7 +122,9 @@ static DomainConnector constructNewDomainConnector(Class<? extends DomainConnect
     static Handler createHandler(
             Function<DomainRequest, DomainResponse> handler, boolean isProtected) {
         return (Context ctx) -> {
-            ApplicationContext.clearThreadRegistrations();
+            ApplicationContext
+                    .clearThreadRegistrations(); // clear this thread's specific registrations from
+            // its previous use
 
             LOGGER.logInfo(ctx.method().name() + " " + ctx.url());
 

e2e/build.gradle

@@ -19,10 +19,10 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
 
     //fhir
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.6.0'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.6.0'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.6.0'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.6.0'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.6.1'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.6.1'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.6.1'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:7.6.1'
     implementation 'org.fhir:ucum:1.0.9'
 
     testImplementation 'org.apache.groovy:groovy:4.0.24'

etor/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     testImplementation 'org.apache.groovy:groovy:4.0.24'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation 'com.openpojo:openpojo:0.9.1'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17.5'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.18'
 }
 
 jacocoTestCoverageVerification {

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/EtorDomainRegistration.java

@@ -134,7 +134,6 @@ public Map<HttpEndpoint, Function<DomainRequest, DomainResponse>> domainRegistra
                     MessageLinkStorage.class, FileMessageLinkStorage.getInstance());
         }
 
-        // these are default implementations
         if (ApplicationContext.isPropertyPresent("REPORT_STREAM_URL_PREFIX")) {
             ApplicationContext.register(
                     RSEndpointClient.class, ReportStreamEndpointClient.getInstance());
@@ -174,6 +173,14 @@ DomainResponse handleResults(DomainRequest request) {
     }
 
     DomainResponse handleMetadata(DomainRequest request) {
+        if (Boolean.parseBoolean(request.getHeaders().get("load-test"))
+                && ApplicationContext.isPropertyPresent("REPORT_STREAM_URL_PREFIX")) {
+            // register the mock RS endpoint for this HTTP request because we don't want to call RS
+            // for real when doing a load test.
+            ApplicationContext.registerForThread(
+                    RSEndpointClient.class, MockRSEndpointClient.getInstance());
+        }
+
         try {
             String metadataId = request.getPathParams().get("id");
             Optional<PartnerMetadata> metadataOptional =
@@ -227,8 +234,10 @@ protected DomainResponse handleMessageRequest(
         boolean markMetadataAsFailed = false;
         String errorMessage = "";
 
-        if ("True".equals(request.getHeaders().get("load-test"))
+        if (Boolean.parseBoolean(request.getHeaders().get("load-test"))
                 && ApplicationContext.isPropertyPresent("REPORT_STREAM_URL_PREFIX")) {
+            // register the mock RS endpoint for this HTTP request because we don't want to call RS
+            // for real when doing a load test.
             ApplicationContext.registerForThread(
                     RSEndpointClient.class, MockRSEndpointClient.getInstance());
         }

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/metadata/partner/PartnerMetadataOrchestrator.java

@@ -32,7 +32,6 @@ public class PartnerMetadataOrchestrator {
 
     @Inject PartnerMetadataStorage partnerMetadataStorage;
     @Inject MessageLinkStorage messageLinkStorage;
-    //    @Inject RSEndpointClient rsclient;
     @Inject Formatter formatter;
     @Inject Logger logger;
 
@@ -45,6 +44,7 @@ private PartnerMetadataOrchestrator() {}
     public void updateMetadataForInboundMessage(PartnerMetadata partnerMetadata)
             throws PartnerMetadataException {
 
+        // can't @Inject because the implementation can be different for this specific thread
         RSEndpointClient rsclient = ApplicationContext.getImplementation(RSEndpointClient.class);
 
         logger.logInfo(
@@ -134,6 +134,7 @@ public Optional<PartnerMetadata> getMetadata(String inboundReportId)
         var outboundReportId = partnerMetadata.outboundReportId();
         if (metadataIsStale(partnerMetadata) && outboundReportId != null) {
 
+            // can't @Inject because the implementation can be different for this specific thread
             RSEndpointClient rsclient =
                     ApplicationContext.getImplementation(RSEndpointClient.class);
 

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

@@ -28,16 +28,8 @@ public void transform(HealthData<?> resource, Map<String, Object> args) {
             return;
         }
 
-        // Extract or create the OBR-16 extension from the ServiceRequest
         Extension obrExtension =
                 HapiHelper.ensureExtensionExists(serviceRequest, HapiHelper.EXTENSION_OBR_URL);
-
-        // Extract or create the OBR-16 data type extension
-        Extension obr16Extension =
-                HapiHelper.ensureSubExtensionExists(
-                        obrExtension, HapiHelper.EXTENSION_OBR16_DATA_TYPE.toString());
-
-        // Set the ORC-12 Practitioner in the OBR-16 extension
-        HapiHelper.setOBR16WithPractitioner(obr16Extension, practitionerRole);
+        HapiHelper.setOBR16WithPractitioner(obrExtension, practitionerRole);
     }
 }

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

@@ -15,7 +15,8 @@ public class RemovePatientIdentifiers implements CustomFhirTransformation {
     @Override
     public void transform(HealthData<?> resource, Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingData();
-        HapiHelper.setPID3_4Value(bundle, ""); // remove PID.3-4
-        HapiHelper.setPID3_5Value(bundle, ""); // remove PID.3-5
+
+        HapiHelper.setPID3_4Value(bundle, null);
+        HapiHelper.removePID3_5Value(bundle);
     }
 }

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

@@ -12,8 +12,6 @@ public class RemovePatientNameTypeCode implements CustomFhirTransformation {
     @Override
     public void transform(final HealthData<?> resource, final Map<String, Object> args) {
         Bundle bundle = (Bundle) resource.getUnderlyingData();
-        // Need to set the value for extension to empty instead of removing the extension,
-        // otherwise RS will set its own value in its place
-        HapiHelper.setPID5_7ExtensionValue(bundle, null);
+        HapiHelper.removePID5_7Value(bundle);
     }
 }