Add a custom executor that sets JAXB correctly

plugin/cql/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
@@ -17,5 +18,9 @@
 			<groupId>org.opencds.cqf.cql</groupId>
 			<artifactId>evaluator.spring</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-core</artifactId>
+		</dependency>
 	</dependencies>
 </project>

plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java

@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
 
 import org.cqframework.cql.cql2elm.CqlTranslatorOptions;
 import org.cqframework.cql.cql2elm.LibraryManager;
@@ -48,6 +50,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.security.concurrent.DelegatingSecurityContextExecutor;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
@@ -321,4 +325,14 @@ public ITermReadSvcR4 termReadSvcR4() {
 	public ITermReadSvcR5 termReadSvcR5() {
 		return new PreExpandedTermReadSvcR5();
 	}
+
+	@Bean(name = "cqlExecutor")
+	public Executor cqlExecutor() {
+		CqlForkJoinWorkerThreadFactory factory = new CqlForkJoinWorkerThreadFactory();
+		ForkJoinPool myCommonPool = new ForkJoinPool(Math.min(32767, Runtime.getRuntime().availableProcessors()), factory,
+				null, false);
+
+		return new DelegatingSecurityContextExecutor(myCommonPool,
+				SecurityContextHolder.getContext());
+	}
 }

plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlForkJoinWorkerThreadFactory.java

@@ -0,0 +1,24 @@
+package org.opencds.cqf.ruler.cql;
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory;
+import java.util.concurrent.ForkJoinWorkerThread;
+
+// This class resolves issues with loading JAXB in a server environment and using CompleteableFutures
+// https://stackoverflow.com/questions/49113207/completablefuture-forkjoinpool-set-class-loader
+class CqlForkJoinWorkerThreadFactory implements ForkJoinWorkerThreadFactory {
+
+	@Override
+	public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
+		return new CqlForkJoinWorkerThread(pool);
+	}
+
+	private static class CqlForkJoinWorkerThread extends ForkJoinWorkerThread {
+
+		private CqlForkJoinWorkerThread(final ForkJoinPool pool) {
+			super(pool);
+			// set the correct classloader here
+			setContextClassLoader(Thread.currentThread().getContextClassLoader());
+		}
+	}
+}

plugin/cr/src/main/java/org/opencds/cqf/ruler/cr/r4/provider/CareGapsProvider.java

@@ -9,10 +9,9 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.regex.Pattern;
 
-import com.google.common.base.Strings;
-
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.MutablePair;
@@ -52,6 +51,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.google.common.base.Strings;
+
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.rest.annotation.Operation;
 import ca.uhn.fhir.rest.annotation.OperationParam;
@@ -130,6 +131,9 @@ public String toDisplayString() {
 	@Autowired
 	private CrProperties crProperties;
 
+	@Autowired
+	private Executor cqlExecutor;
+
 	/**
 	 * Implements the <a href=
 	 * "http://build.fhir.org/ig/HL7/davinci-deqm/OperationDefinition-care-gaps.html">$care-gaps</a>
@@ -209,29 +213,29 @@ public Parameters careGapsReport(RequestDetails theRequestDetails,
 			throw new NotImplementedException("Non subject parameters have not been implemented.");
 		}
 
-      List<CompletableFuture<Parameters.ParametersParameterComponent>> futures = new ArrayList<>();
+		List<CompletableFuture<Parameters.ParametersParameterComponent>> futures = new ArrayList<>();
 
 		Parameters result = initializeResult();
 
 		if (crProperties.getThreadedCareGapsEnabled()) {
 			(patients)
-				.forEach(
-					patient -> {
-						futures.add(CompletableFuture.supplyAsync(() -> patientReports(theRequestDetails,
-							periodStart, periodEnd, patient, status, measures, organization)));
-					});
+					.forEach(
+							patient -> {
+								futures.add(CompletableFuture.supplyAsync(() -> patientReports(theRequestDetails,
+										periodStart, periodEnd, patient, status, measures, organization), cqlExecutor));
+							});
 
 			futures.forEach(x -> result.addParameter(x.join()));
 		} else {
 			(patients)
-				.forEach(
-					patient -> {
-						Parameters.ParametersParameterComponent patientParameter = patientReports(theRequestDetails,
-							periodStart, periodEnd, patient, status, measures, organization);
-						if (patientParameter != null) {
-							result.addParameter(patientParameter);
-						}
-					});
+					.forEach(
+							patient -> {
+								Parameters.ParametersParameterComponent patientParameter = patientReports(theRequestDetails,
+										periodStart, periodEnd, patient, status, measures, organization);
+								if (patientParameter != null) {
+									result.addParameter(patientParameter);
+								}
+							});
 		}
 
 		return result;