Fixes for configuration properties

.vscode/launch.json

@@ -7,7 +7,7 @@
  "cwd": "${workspaceFolder}",
  "mainClass": "ca.uhn.fhir.jpa.starter.Application",
  "projectName": "hapi-fhir-jpaserver-starter",
- "args": "",
+ "args": "-Ddebug=true",
  "envFile": "${workspaceFolder}/.env"
  }
  ]

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksProcessor.java

@@ -2,15 +2,10 @@
 
 import ca.uhn.hapi.fhir.cdshooks.api.json.CdsServiceRequestJson;
 import org.hl7.fhir.r4.model.Bundle;
-import org.hl7.fhir.r4.model.IdType;
-import org.hl7.fhir.r4.model.PlanDefinition;
 import org.hl7.fhir.r4.model.Resource;
 import org.opencds.cqf.fhir.api.Repository;
 import org.opencds.cqf.fhir.cql.engine.retrieve.RepositoryRetrieveProvider;
-import org.opencds.cqf.fhir.cql.engine.retrieve.RetrieveSettings;
 import org.opencds.cqf.fhir.cql.engine.terminology.RepositoryTerminologyProvider;
-import org.opencds.cqf.fhir.utility.repository.InMemoryFhirRepository;
-
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/ProviderConfiguration.java

@@ -3,10 +3,6 @@
 import ca.uhn.fhir.jpa.starter.cr.CrProperties;
 
 public class ProviderConfiguration {
-
- public static final ProviderConfiguration DEFAULT_PROVIDER_CONFIGURATION =
- new ProviderConfiguration(false, "client_id");
-
  private final String clientIdHeaderName;
  private final boolean cqlLoggingEnabled;
 
@@ -16,8 +12,7 @@ public ProviderConfiguration(boolean cqlLoggingEnabled, String clientIdHeaderNam
  }
 
  public ProviderConfiguration(CdsHooksProperties cdsProperties, CrProperties crProperties) {
- this.clientIdHeaderName = cdsProperties.getClientIdHeaderName();
- this.cqlLoggingEnabled = crProperties.isCqlRuntimeDebugLoggingEnabled();
+ this(crProperties.getCql().getRuntime().isDebugLoggingEnabled(), cdsProperties.getClientIdHeaderName());
  }
 
  public String getClientIdHeaderName() {

src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java

@@ -1,5 +1,6 @@
 package ca.uhn.fhir.jpa.starter.cdshooks;
 
+import ca.uhn.fhir.jpa.starter.cr.CrCommonConfig;
 import ca.uhn.fhir.jpa.starter.cr.CrConfigCondition;
 import ca.uhn.fhir.jpa.starter.cr.CrProperties;
 import ca.uhn.hapi.fhir.cdshooks.api.ICdsHooksDaoAuthorizationSvc;
@@ -23,7 +24,7 @@
 
 @Configuration
 @Conditional({CdsHooksConfigCondition.class, CrConfigCondition.class})
-@Import(CdsHooksConfig.class)
+@Import({CdsHooksConfig.class, CrCommonConfig.class})
 public class StarterCdsHooksConfig {
 
  @Bean

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

@@ -0,0 +1,22 @@
+package ca.uhn.fhir.jpa.starter.cr;
+
+public class CareGapsProperties {
+ private String reporter = "default";
+ private String section_author = "default";
+
+ public String getReporter() {
+ return reporter;
+ }
+
+ public void setReporter(String reporter) {
+ this.reporter = reporter;
+ }
+
+ public String getSection_author() {
+ return section_author;
+ }
+
+ public void setSection_author(String section_author) {
+ this.section_author = section_author;
+ }
+}

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

@@ -0,0 +1,198 @@
+package ca.uhn.fhir.jpa.starter.cr;
+
+import org.cqframework.cql.cql2elm.CqlCompilerException;
+import org.cqframework.cql.cql2elm.CqlTranslator;
+import org.cqframework.cql.cql2elm.LibraryBuilder;
+
+public class CqlCompilerProperties {
+ private Boolean validate_units = true;
+ private Boolean verify_only = false;
+ private String compatibility_level = "1.5";
+ private CqlCompilerException.ErrorSeverity error_level = CqlCompilerException.ErrorSeverity.Info;
+ private LibraryBuilder.SignatureLevel signature_level = LibraryBuilder.SignatureLevel.All;
+ private Boolean analyze_data_requirements = false;
+ private Boolean collapse_data_requirements = false;
+ private CqlTranslator.Format translator_format = CqlTranslator.Format.JSON;
+ private Boolean enable_date_range_optimization = true;
+ private Boolean enable_annotations = true;
+ private Boolean enable_locators = true;
+ private Boolean enable_results_type = true;
+ private Boolean enable_detailed_errors = true;
+ private Boolean disable_list_traversal = false;
+ private Boolean disable_list_demotion = false;
+ private Boolean disable_list_promotion = false;
+ private Boolean enable_interval_demotion = false;
+ private Boolean enable_interval_promotion = false;
+ private Boolean disable_method_invocation = false;
+ private Boolean require_from_keyword = false;
+ private Boolean disable_default_model_info_load = false;
+
+
+ public boolean isValidateUnits() {
+ return validate_units;
+ }
+
+ public void setValidateUnits(boolean validateUnits) {
+ this.validate_units = validateUnits;
+ }
+
+ public boolean isVerifyOnly() {
+ return verify_only;
+ }
+
+ public void setVerifyOnly(boolean verifyOnly) {
+ this.verify_only = verifyOnly;
+ }
+
+ public String getCompatibilityLevel() {
+ return compatibility_level;
+ }
+
+ public void setCompatibilityLevel(String compatibilityLevel) {
+ this.compatibility_level = compatibilityLevel;
+ }
+
+ public CqlCompilerException.ErrorSeverity getErrorSeverityLevel() {
+ return error_level;
+ }
+
+ public void setErrorSeverityLevel(CqlCompilerException.ErrorSeverity errorSeverityLevel) {
+ this.error_level = errorSeverityLevel;
+ }
+
+ public LibraryBuilder.SignatureLevel getSignatureLevel() {
+ return signature_level;
+ }
+
+ public void setSignatureLevel(LibraryBuilder.SignatureLevel signatureLevel) {
+ this.signature_level = signatureLevel;
+ }
+
+ public boolean isAnalyzeDataRequirements() {
+ return analyze_data_requirements;
+ }
+
+ public void setAnalyzeDataRequirements(boolean analyzeDataRequirements) {
+ this.analyze_data_requirements = analyzeDataRequirements;
+ }
+
+ public boolean isCollapseDataRequirements() {
+ return collapse_data_requirements;
+ }
+
+ public void setCollapseDataRequirements(boolean collapseDataRequirements) {
+ this.collapse_data_requirements = collapseDataRequirements;
+ }
+
+ public boolean isEnableDateRangeOptimization() {
+ return enable_date_range_optimization;
+ }
+
+ public void setEnableDateRangeOptimization(boolean enableDateRangeOptimization) {
+ this.enable_date_range_optimization = enableDateRangeOptimization;
+ }
+
+ public boolean isEnableAnnotations() {
+ return enable_annotations;
+ }
+
+ public void setEnableAnnotations(boolean enableAnnotations) {
+ this.enable_annotations = enableAnnotations;
+ }
+
+ public boolean isEnableLocators() {
+ return enable_locators;
+ }
+
+ public void setEnableLocators(boolean enableLocators) {
+ this.enable_locators = enableLocators;
+ }
+
+ public boolean isEnableResultsType() {
+ return enable_results_type;
+ }
+
+ public void setEnableResultsType(boolean enableResultsType) {
+ this.enable_results_type = enableResultsType;
+ }
+
+ public boolean isEnableDetailedErrors() {
+ return enable_detailed_errors;
+ }
+
+ public void setEnableDetailedErrors(boolean enableDetailedErrors) {
+ this.enable_detailed_errors = enableDetailedErrors;
+ }
+
+ public boolean isDisableListTraversal() {
+ return disable_list_traversal;
+ }
+
+ public void setDisableListTraversal(boolean disableListTraversal) {
+ this.disable_list_traversal = disableListTraversal;
+ }
+
+ public boolean isDisableListDemotion() {
+ return disable_list_demotion;
+ }
+
+ public void setDisableListDemotion(boolean disableListDemotion) {
+ this.disable_list_demotion = disableListDemotion;
+ }
+
+ public boolean isDisableListPromotion() {
+ return disable_list_promotion;
+ }
+
+ public void setDisableListPromotion(boolean disableListPromotion) {
+ this.disable_list_promotion = disableListPromotion;
+ }
+
+ public boolean isEnableIntervalPromotion() {
+ return enable_interval_promotion;
+ }
+
+ public void setEnableIntervalPromotion(boolean enableIntervalPromotion) {
+ this.enable_interval_promotion = enableIntervalPromotion;
+ }
+
+ public boolean isEnableIntervalDemotion() {
+ return enable_interval_demotion;
+ }
+
+ public void setEnableIntervalDemotion(boolean enableIntervalDemotion) {
+ this.enable_interval_demotion = enableIntervalDemotion;
+ }
+
+ public boolean isDisableMethodInvocation() {
+ return disable_method_invocation;
+ }
+
+ public void setDisableMethodInvocation(boolean disableMethodInvocation) {
+ this.disable_method_invocation = disableMethodInvocation;
+ }
+
+ public boolean isRequireFromKeyword() {
+ return require_from_keyword;
+ }
+
+ public void setRequireFromKeyword(boolean requireFromKeyword) {
+ this.require_from_keyword = requireFromKeyword;
+ }
+
+ public boolean isDisableDefaultModelInfoLoad() {
+ return disable_default_model_info_load;
+ }
+
+ public void setDisableDefaultModelInfoLoad(boolean disableDefaultModelInfoLoad) {
+ this.disable_default_model_info_load = disableDefaultModelInfoLoad;
+ }
+
+ public CqlTranslator.Format getTranslatorFormat() {
+ return translator_format;
+ }
+
+ public void setTranslatorFormat(CqlTranslator.Format translatorFormat) {
+ this.translator_format = translatorFormat;
+ } 
+}

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

@@ -0,0 +1,53 @@
+package ca.uhn.fhir.jpa.starter.cr;
+
+import org.opencds.cqf.fhir.cql.engine.retrieve.RetrieveSettings;
+import org.opencds.cqf.fhir.cql.engine.terminology.TerminologySettings;
+
+public class CqlProperties {
+
+ private Boolean use_embedded_libraries = true;
+ private CqlCompilerProperties compiler = new CqlCompilerProperties();
+ private CqlRuntimeProperties runtime = new CqlRuntimeProperties();
+ private TerminologySettings terminology = new TerminologySettings();
+ private RetrieveSettings data = new RetrieveSettings();
+
+ public Boolean getUse_embedded_libraries() {
+ return use_embedded_libraries;
+ }
+
+ public void setUse_embedded_libraries(Boolean use_embedded_libraries) {
+ this.use_embedded_libraries = use_embedded_libraries;
+ }
+
+ public CqlCompilerProperties getCompiler() {
+ return compiler;
+ }
+
+ public void setCompiler(CqlCompilerProperties compiler) {
+ this.compiler = compiler;
+ }
+
+ public CqlRuntimeProperties getRuntime() {
+ return runtime;
+ }
+
+ public void setRuntime(CqlRuntimeProperties runtime) {
+ this.runtime = runtime;
+ }
+
+ public TerminologySettings getTerminology() {
+ return terminology;
+ }
+
+ public void setTerminology(TerminologySettings terminology) {
+ this.terminology = terminology;
+ }
+
+ public RetrieveSettings getData() {
+ return data;
+ }
+
+ public void setData(RetrieveSettings data) {
+ this.data = data;
+ }
+}

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

@@ -0,0 +1,35 @@
+package ca.uhn.fhir.jpa.starter.cr;
+
+public class CqlRuntimeProperties {
+
+ private Boolean debug_logging_enabled = false;
+ private Boolean enable_validation = false;
+ private Boolean enable_expression_caching = true;
+
+ public boolean isDebugLoggingEnabled() {
+ return debug_logging_enabled;
+ }
+
+ public void setDebugLoggingEnabled(boolean debug_logging_enabled) {
+ this.debug_logging_enabled = debug_logging_enabled;
+ }
+
+
+ public boolean isEnableExpressionCaching() {
+ return enable_expression_caching;
+ }
+
+ public void setEnableExpressionCaching(boolean enable_expression_caching) {
+ this.enable_expression_caching = enable_expression_caching;
+ }
+
+ public boolean isEnableValidation() {
+ return enable_validation;
+ }
+
+ public void EnableValidation(boolean enable_validation) {
+ this.enable_validation = enable_validation;
+ }
+
+
+}