Merge branch 'cr-3-23-0' into cr-3-24-0

src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java

@@ -22,6 +22,7 @@ import org.opencds.cqf.fhir.cr.hapi.common.ElmCacheResourceChangeListener;
 import org.opencds.cqf.fhir.cr.measure.CareGapsProperties;
 import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions;
 import org.opencds.cqf.fhir.utility.ValidationProfile;
+import org.opencds.cqf.fhir.utility.client.TerminologyServerClientSettings;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -57,6 +58,11 @@ public class CrCommonConfig {
 		return theCrProperties.getCql().getTerminology();
 	}
 
+	@Bean
+	TerminologyServerClientSettings terminologyServerClientSettings(CrProperties theCrProperties) {
+		return theCrProperties.getTerminologyServerClientSettings();
+	}
+
 	@Bean
 	public EvaluationSettings evaluationSettings(
 			CrProperties theCrProperties,

src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java

@@ -1,11 +1,15 @@
 package ca.uhn.fhir.jpa.starter.cr;
 
+import org.opencds.cqf.fhir.utility.client.TerminologyServerClientSettings;
+
 public class CrProperties {
 	private Boolean enabled;
 
 	private CareGapsProperties careGaps = new CareGapsProperties();
 	private CqlProperties cql = new CqlProperties();
 
+	private TerminologyServerClientSettings terminologyServerClientSettings = new TerminologyServerClientSettings();
+
 	public Boolean getEnabled() {
 		return enabled;
 	}
@@ -29,4 +33,12 @@ public class CrProperties {
 	public void setCql(CqlProperties cql) {
 		this.cql = cql;
 	}
+
+	public TerminologyServerClientSettings getTerminologyServerClientSettings() {
+		return terminologyServerClientSettings;
+	}
+
+	public void setTerminologyServerClientSettings(TerminologyServerClientSettings terminologyServerClientSettings) {
+		this.terminologyServerClientSettings = terminologyServerClientSettings;
+	}
 }

src/main/resources/application.yaml

@@ -89,6 +89,11 @@ hapi:
       caregaps:
         reporter: "default"
         section_author: "default"
+      terminologyServerClientSettings:
+        maxRetryCount: 3
+        retryIntervalMillis: 1000
+        timeoutSeconds: 30
+        socketTimeout: 60
       cql:
         use_embedded_libraries: true
         compiler:

src/main/resources/cds.application.yaml

@@ -87,6 +87,11 @@ hapi:
       caregaps:
         reporter: "default"
         section_author: "default"
+      terminologyServerClientSettings:
+        maxRetryCount: 3
+        retryIntervalMillis: 1000
+        timeoutSeconds: 30
+        socketTimeout: 60
       cql:
         use_embedded_libraries: true
         compiler: