From 36babba90c5a70cea6e92307a58bfa1091f41687 Mon Sep 17 00:00:00 2001
From: Chris O Riordan <chris.oriordan@smilecdr.com>
Date: Fri, 18 Jul 2025 11:53:43 -0700
Subject: [PATCH 1/2] Add TerminologySeverClientSettings to CR Properties &
 Config

---
 .../ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java     |  6 ++++++
 .../java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java  | 10 ++++++++++
 src/main/resources/application.yaml                    |  5 +++++
 src/main/resources/cds.application.yaml                |  5 +++++
 4 files changed, 26 insertions(+)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java
index 1822340..af3768b 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java
+++ b/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,
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
index 8ba5ccf..8a986b3 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
+++ b/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,10 @@ public class CrProperties {
 	public void setCql(CqlProperties cql) {
 		this.cql = cql;
 	}
+
+	public TerminologyServerClientSettings getTerminologyServerClientSettings() { return terminologyServerClientSettings; }
+
+	public void setTerminologyServerClientSettings(TerminologyServerClientSettings terminologyServerClientSettings) {
+		this.terminologyServerClientSettings = terminologyServerClientSettings;
+	}
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index cb0c0ce..10787ce 100644
--- a/src/main/resources/application.yaml
+++ b/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:
diff --git a/src/main/resources/cds.application.yaml b/src/main/resources/cds.application.yaml
index 2d98309..dd2d349 100644
--- a/src/main/resources/cds.application.yaml
+++ b/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:

From 0e17b198d04b236952fd729b4a825f186a7d0c5c Mon Sep 17 00:00:00 2001
From: Chris O Riordan <chris.oriordan@smilecdr.com>
Date: Fri, 1 Aug 2025 07:38:53 -0700
Subject: [PATCH 2/2] Apply spotless

---
 src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
index 8a986b3..e4af126 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
@@ -34,7 +34,9 @@ public class CrProperties {
 		this.cql = cql;
 	}
 
-	public TerminologyServerClientSettings getTerminologyServerClientSettings() { return terminologyServerClientSettings; }
+	public TerminologyServerClientSettings getTerminologyServerClientSettings() {
+		return terminologyServerClientSettings;
+	}
 
 	public void setTerminologyServerClientSettings(TerminologyServerClientSettings terminologyServerClientSettings) {
 		this.terminologyServerClientSettings = terminologyServerClientSettings;