Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add empty map for tester

Browse Source
This commit is contained in:
Jonathan Percival
2023-06-16 10:36:52 -06:00
parent 300a21fcb4
commit d6c152c524
1 changed files with 642 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
View File

@@ -1,11 +1,11 @@
package ca.uhn.fhir.jpa.starter; package ca.uhn.fhir.jpa.starter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import ca.uhn.fhir.context.FhirVersionEnum;
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.ClientIdStrategyEnum;
import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel;
import ca.uhn.fhir.rest.api.EncodingEnum;
import com.google.common.collect.ImmutableList;
import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.CqlCompilerException;
import org.cqframework.cql.cql2elm.CqlTranslator; import org.cqframework.cql.cql2elm.CqlTranslator;
import org.cqframework.cql.cql2elm.CqlTranslatorOptions; import org.cqframework.cql.cql2elm.CqlTranslatorOptions;
@@ -17,10 +17,12 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import java.util.ArrayList; import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Map; import ca.uhn.fhir.context.FhirVersionEnum;
import java.util.Objects; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings.ClientIdStrategyEnum;
import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel;
import ca.uhn.fhir.rest.api.EncodingEnum;
@ConfigurationProperties(prefix = "hapi.fhir") @ConfigurationProperties(prefix = "hapi.fhir")
@Configuration @Configuration
@@ -74,8 +76,10 @@ public class AppProperties {
private Boolean cql_compiler_disable_default_model_info_load = false; private Boolean cql_compiler_disable_default_model_info_load = false;
//private CqlEngineOptions cqlEngineOptions = CqlEngineOptions.defaultOptions(); // private CqlEngineOptions cqlEngineOptions =
//private CqlTranslatorOptions cqlTranslatorOptions = CqlTranslatorOptions.defaultOptions(); // CqlEngineOptions.defaultOptions();
// private CqlTranslatorOptions cqlTranslatorOptions =
// CqlTranslatorOptions.defaultOptions();
private Boolean cr_enabled = false; private Boolean cr_enabled = false;
private Boolean ips_enabled = false; private Boolean ips_enabled = false;
private Boolean openapi_enabled = false; private Boolean openapi_enabled = false;
@@ -120,7 +124,7 @@ public class AppProperties {
private Boolean narrative_enabled = true; private Boolean narrative_enabled = true;
private Validation validation = new Validation(); private Validation validation = new Validation();
private Map<String, Tester> tester = null; private Map<String, Tester> tester = new HashMap<>();
private Logger logger = new Logger(); private Logger logger = new Logger();
private Subscription subscription = new Subscription(); private Subscription subscription = new Subscription();
private Cors cors = null; private Cors cors = null;
@@ -148,7 +152,6 @@ public class AppProperties {
return custom_interceptor_classes; return custom_interceptor_classes;
} }
public String getStaticLocation() { public String getStaticLocation() {
return staticLocation; return staticLocation;
} }
@@ -157,7 +160,6 @@ public class AppProperties {
this.staticLocation = staticLocation; this.staticLocation = staticLocation;
} }
public Boolean getOpenapi_enabled() { public Boolean getOpenapi_enabled() {
return openapi_enabled; return openapi_enabled;
} }
@@ -405,8 +407,8 @@ public class AppProperties {
public void setCqlTranslatorFormat(CqlTranslator.Format cqlTranslatorFormat) { public void setCqlTranslatorFormat(CqlTranslator.Format cqlTranslatorFormat) {
this.cql_compiler_translator_format = cqlTranslatorFormat; this.cql_compiler_translator_format = cqlTranslatorFormat;
} }
private CqlTranslatorOptions cqlTranslatorOptions =
new CqlTranslatorOptions( private CqlTranslatorOptions cqlTranslatorOptions = new CqlTranslatorOptions(
getCqlTranslatorFormat(), getCqlTranslatorFormat(),
cql_compiler_enable_date_range_optimization, cql_compiler_enable_date_range_optimization,
cql_compiler_enable_annotations, cql_compiler_enable_annotations,
@@ -425,8 +427,8 @@ public class AppProperties {
isCqlCompilerValidateUnits(), isCqlCompilerValidateUnits(),
cql_compiler_disable_default_model_info_load, cql_compiler_disable_default_model_info_load,
getCqlCompilerSignatureLevel(), getCqlCompilerSignatureLevel(),
getCqlCompilerCompatibilityLevel() getCqlCompilerCompatibilityLevel());
);
public CqlTranslatorOptions getCqlTranslatorOptions() { public CqlTranslatorOptions getCqlTranslatorOptions() {
return this.cqlTranslatorOptions; return this.cqlTranslatorOptions;
} }
@@ -434,6 +436,7 @@ public class AppProperties {
public void setCqlTranslator(CqlTranslatorOptions translator) { public void setCqlTranslator(CqlTranslatorOptions translator) {
this.cqlTranslatorOptions = translator; this.cqlTranslatorOptions = translator;
} }
public CqlEngineOptions getCqlEngineOptions() { public CqlEngineOptions getCqlEngineOptions() {
return this.cqlEngineOptions; return this.cqlEngineOptions;
} }
@@ -450,8 +453,6 @@ public class AppProperties {
return cqlOptions; return cqlOptions;
} }
public Boolean getCr_enabled() { public Boolean getCr_enabled() {
return cr_enabled; return cr_enabled;
} }
@@ -468,7 +469,6 @@ public class AppProperties {
this.ips_enabled = ips_enabled; this.ips_enabled = ips_enabled;
} }
public Boolean getMdm_enabled() { public Boolean getMdm_enabled() {
return mdm_enabled; return mdm_enabled;
} }
@@ -806,13 +806,11 @@ public class AppProperties {
this.tester = tester; this.tester = tester;
} }
public Boolean getNarrative_enabled() public Boolean getNarrative_enabled() {
{
return narrative_enabled; return narrative_enabled;
} }
public void setNarrative_enabled(Boolean narrative_enabled) public void setNarrative_enabled(Boolean narrative_enabled) {
{
this.narrative_enabled = narrative_enabled; this.narrative_enabled = narrative_enabled;
} }
@@ -896,7 +894,6 @@ public class AppProperties {
this.allow_Credentials = allow_Credentials; this.allow_Credentials = allow_Credentials;
} }
} }
public static class Logger { public static class Logger {
@@ -939,7 +936,6 @@ public class AppProperties {
} }
} }
public static class Tester { public static class Tester {
private String name; private String name;
@@ -980,8 +976,7 @@ public class AppProperties {
} }
} }
public static class ImplementationGuide public static class ImplementationGuide {
{
private String url; private String url;
private String name; private String name;
private String version; private String version;
@@ -1045,6 +1040,7 @@ public class AppProperties {
public void setPartitioning_include_in_search_hashes(Boolean partitioning_include_in_search_hashes) { public void setPartitioning_include_in_search_hashes(Boolean partitioning_include_in_search_hashes) {
this.partitioning_include_in_search_hashes = partitioning_include_in_search_hashes; this.partitioning_include_in_search_hashes = partitioning_include_in_search_hashes;
} }
public Boolean getAllow_references_across_partitions() { public Boolean getAllow_references_across_partitions() {
return allow_references_across_partitions; return allow_references_across_partitions;
} }
@@ -1084,7 +1080,6 @@ public class AppProperties {
this.email = email; this.email = email;
} }
public static class Email { public static class Email {
public String getFrom() { public String getFrom() {
return from; return from;