Made the EnvironmentHelper a bit more typesafe - thx to @ttntrifork
This commit is contained in:
@@ -1,170 +1,182 @@
|
|||||||
package ca.uhn.fhir.jpa.starter;
|
package ca.uhn.fhir.jpa.starter;
|
||||||
|
|
||||||
|
import ca.uhn.fhir.jpa.config.HapiFhirLocalContainerEntityManagerFactoryBean;
|
||||||
import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer;
|
import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer;
|
||||||
import ca.uhn.fhir.jpa.search.elastic.ElasticsearchHibernatePropertiesBuilder;
|
import ca.uhn.fhir.jpa.search.elastic.ElasticsearchHibernatePropertiesBuilder;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.lucene.util.Version;
|
||||||
import org.elasticsearch.action.admin.indices.stats.IndexStats;
|
import org.hibernate.cfg.AvailableSettings;
|
||||||
|
import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
|
||||||
import org.hibernate.search.backend.elasticsearch.index.IndexStatus;
|
import org.hibernate.search.backend.elasticsearch.index.IndexStatus;
|
||||||
import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings;
|
import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings;
|
||||||
import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings;
|
import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings;
|
||||||
|
import org.hibernate.search.backend.lucene.lowlevel.directory.impl.LocalFileSystemDirectoryProvider;
|
||||||
import org.hibernate.search.engine.cfg.BackendSettings;
|
import org.hibernate.search.engine.cfg.BackendSettings;
|
||||||
import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategyNames;
|
import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategyNames;
|
||||||
import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
|
import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
|
||||||
import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName;
|
import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName;
|
||||||
|
import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
|
||||||
|
import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy;
|
||||||
import org.springframework.core.env.CompositePropertySource;
|
import org.springframework.core.env.CompositePropertySource;
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
import org.springframework.core.env.ConfigurableEnvironment;
|
||||||
import org.springframework.core.env.EnumerablePropertySource;
|
import org.springframework.core.env.EnumerablePropertySource;
|
||||||
import org.springframework.core.env.PropertySource;
|
import org.springframework.core.env.PropertySource;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
public class EnvironmentHelper {
|
public class EnvironmentHelper {
|
||||||
|
|
||||||
public static Properties getHibernateProperties(ConfigurableEnvironment environment) {
|
public static Properties getHibernateProperties(ConfigurableEnvironment environment) {
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
|
Map<String, Object> jpaProps = getPropertiesStartingWith(environment, "spring.jpa.properties");
|
||||||
|
for (Map.Entry<String, Object> entry : jpaProps.entrySet()) {
|
||||||
|
String strippedKey = entry.getKey().replace("spring.jpa.properties.", "");
|
||||||
|
properties.put(strippedKey, entry.getValue().toString());
|
||||||
|
}
|
||||||
|
|
||||||
Map<String, Object> jpaProps = getPropertiesStartingWith(environment, "spring.jpa.properties");
|
//Spring Boot Autoconfiguration defaults
|
||||||
properties.putIfAbsent("hibernate.format_sql", "false");
|
properties.putIfAbsent(AvailableSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.DisabledScanner");
|
||||||
properties.putIfAbsent("hibernate.show_sql", "false");
|
properties.putIfAbsent(AvailableSettings.IMPLICIT_NAMING_STRATEGY, SpringImplicitNamingStrategy.class.getName());
|
||||||
properties.putIfAbsent("hibernate.hbm2ddl.auto", "update");
|
properties.putIfAbsent(AvailableSettings.PHYSICAL_NAMING_STRATEGY, SpringPhysicalNamingStrategy.class.getName());
|
||||||
properties.putIfAbsent("hibernate.jdbc.batch_size", "20");
|
//TODO The bean factory should be added as parameter but that requires that it can be injected from the entityManagerFactory bean from xBaseConfig
|
||||||
properties.putIfAbsent("hibernate.cache.use_query_cache", "false");
|
//properties.putIfAbsent(AvailableSettings.BEAN_CONTAINER, new SpringBeanContainer(beanFactory));
|
||||||
properties.putIfAbsent("hibernate.cache.use_second_level_cache", "false");
|
|
||||||
properties.putIfAbsent("hibernate.cache.use_structured_entries", "false");
|
|
||||||
properties.putIfAbsent("hibernate.cache.use_minimal_puts", "false");
|
|
||||||
|
|
||||||
if (jpaProps.getOrDefault("spring.jpa.properties.hibernate.search.enabled", "false").toString() == "true") {
|
//hapi-fhir-jpaserver-base "sensible defaults"
|
||||||
properties.putIfAbsent(HibernateOrmMapperSettings.ENABLED, true);
|
Map<String, Object> hapiJpaPropertyMap = new HapiFhirLocalContainerEntityManagerFactoryBean().getJpaPropertyMap();
|
||||||
properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_TYPE), "local-filesystem");
|
hapiJpaPropertyMap.forEach(properties::putIfAbsent);
|
||||||
properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_ROOT), "target/lucenefiles");
|
|
||||||
properties.putIfAbsent(BackendSettings.backendKey(BackendSettings.TYPE), "lucene");
|
|
||||||
properties.putIfAbsent(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName());
|
|
||||||
properties.putIfAbsent(BackendSettings.backendKey(LuceneBackendSettings.LUCENE_VERSION), "LUCENE_CURRENT");
|
|
||||||
} else {
|
|
||||||
properties.putIfAbsent(HibernateOrmMapperSettings.ENABLED, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Map.Entry<String, Object> entry : jpaProps.entrySet()) {
|
//hapi-fhir-jpaserver-starter defaults
|
||||||
String strippedKey = entry.getKey().replace("spring.jpa.properties.", "");
|
properties.putIfAbsent(AvailableSettings.FORMAT_SQL, false);
|
||||||
properties.put(strippedKey, entry.getValue().toString());
|
properties.putIfAbsent(AvailableSettings.SHOW_SQL, false);
|
||||||
}
|
properties.putIfAbsent(AvailableSettings.HBM2DDL_AUTO, "update");
|
||||||
|
properties.putIfAbsent(AvailableSettings.STATEMENT_BATCH_SIZE, 20);
|
||||||
|
properties.putIfAbsent(AvailableSettings.USE_QUERY_CACHE, false);
|
||||||
|
properties.putIfAbsent(AvailableSettings.USE_SECOND_LEVEL_CACHE, false);
|
||||||
|
properties.putIfAbsent(AvailableSettings.USE_STRUCTURED_CACHE, false);
|
||||||
|
properties.putIfAbsent(AvailableSettings.USE_MINIMAL_PUTS, false);
|
||||||
|
|
||||||
|
//Hibernate Search defaults
|
||||||
|
properties.putIfAbsent(HibernateOrmMapperSettings.ENABLED, true);
|
||||||
|
if (Boolean.parseBoolean(String.valueOf(properties.get(HibernateOrmMapperSettings.ENABLED)))) {
|
||||||
|
properties.putIfAbsent(BackendSettings.backendKey(BackendSettings.TYPE), LuceneBackendSettings.TYPE_NAME);
|
||||||
|
|
||||||
if (environment.getProperty("elasticsearch.enabled", Boolean.class) != null
|
if (properties.get(BackendSettings.backendKey(BackendSettings.TYPE)).equals(LuceneBackendSettings.TYPE_NAME)) {
|
||||||
&& environment.getProperty("elasticsearch.enabled", Boolean.class) == true) {
|
properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_TYPE), LocalFileSystemDirectoryProvider.NAME);
|
||||||
ElasticsearchHibernatePropertiesBuilder builder = new ElasticsearchHibernatePropertiesBuilder();
|
properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_ROOT), "target/lucenefiles");
|
||||||
IndexStatus requiredIndexStatus = environment.getProperty("elasticsearch.required_index_status", IndexStatus.class);
|
properties.putIfAbsent(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName());
|
||||||
if (requiredIndexStatus == null) {
|
properties.putIfAbsent(BackendSettings.backendKey(LuceneBackendSettings.LUCENE_VERSION), Version.LATEST);
|
||||||
builder.setRequiredIndexStatus(IndexStatus.YELLOW);
|
|
||||||
} else {
|
|
||||||
builder.setRequiredIndexStatus(requiredIndexStatus);
|
|
||||||
}
|
|
||||||
|
|
||||||
builder.setRestUrl(getElasticsearchServerUrl(environment));
|
} else if (properties.get(BackendSettings.backendKey(BackendSettings.TYPE)).equals(ElasticsearchBackendSettings.TYPE_NAME)) {
|
||||||
builder.setUsername(getElasticsearchServerUsername(environment));
|
ElasticsearchHibernatePropertiesBuilder builder = new ElasticsearchHibernatePropertiesBuilder();
|
||||||
builder.setPassword(getElasticsearchServerPassword(environment));
|
IndexStatus requiredIndexStatus = environment.getProperty("elasticsearch.required_index_status", IndexStatus.class);
|
||||||
builder.setProtocol(getElasticsearchServerProtocol(environment));
|
builder.setRequiredIndexStatus(requireNonNullElse(requiredIndexStatus, IndexStatus.YELLOW));
|
||||||
SchemaManagementStrategyName indexSchemaManagementStrategy = environment.getProperty("elasticsearch.schema_management_strategy", SchemaManagementStrategyName.class);
|
builder.setRestUrl(getElasticsearchServerUrl(environment));
|
||||||
if (indexSchemaManagementStrategy == null) {
|
builder.setUsername(getElasticsearchServerUsername(environment));
|
||||||
builder.setIndexSchemaManagementStrategy(SchemaManagementStrategyName.CREATE);
|
builder.setPassword(getElasticsearchServerPassword(environment));
|
||||||
} else {
|
builder.setProtocol(getElasticsearchServerProtocol(environment));
|
||||||
builder.setIndexSchemaManagementStrategy(indexSchemaManagementStrategy);
|
SchemaManagementStrategyName indexSchemaManagementStrategy = environment.getProperty("elasticsearch.schema_management_strategy", SchemaManagementStrategyName.class);
|
||||||
}
|
builder.setIndexSchemaManagementStrategy(requireNonNullElse(indexSchemaManagementStrategy, SchemaManagementStrategyName.CREATE));
|
||||||
// pretty_print_json_log: false
|
Boolean refreshAfterWrite = environment.getProperty("elasticsearch.debug.refresh_after_write", Boolean.class);
|
||||||
Boolean refreshAfterWrite = environment.getProperty("elasticsearch.debug.refresh_after_write", Boolean.class);
|
if (refreshAfterWrite == null || !refreshAfterWrite) {
|
||||||
if (refreshAfterWrite == null || refreshAfterWrite == false) {
|
builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.ASYNC);
|
||||||
builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.ASYNC);
|
} else {
|
||||||
} else {
|
builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.READ_SYNC);
|
||||||
builder.setDebugIndexSyncStrategy(AutomaticIndexingSynchronizationStrategyNames.READ_SYNC);
|
}
|
||||||
}
|
builder.setDebugPrettyPrintJsonLog(requireNonNullElse(environment.getProperty("elasticsearch.debug.pretty_print_json_log", Boolean.class), false));
|
||||||
// pretty_print_json_log: false
|
builder.apply(properties);
|
||||||
Boolean prettyPrintJsonLog = environment.getProperty("elasticsearch.debug.pretty_print_json_log", Boolean.class);
|
|
||||||
if (prettyPrintJsonLog == null) {
|
|
||||||
builder.setDebugPrettyPrintJsonLog(false);
|
|
||||||
} else {
|
|
||||||
builder.setDebugPrettyPrintJsonLog(prettyPrintJsonLog);
|
|
||||||
}
|
|
||||||
builder.apply(properties);
|
|
||||||
}
|
|
||||||
return properties;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getElasticsearchServerUrl(ConfigurableEnvironment environment) {
|
} else {
|
||||||
return environment.getProperty("elasticsearch.rest_url", String.class);
|
throw new UnsupportedOperationException("Unsupported Hibernate Search backend: " + properties.get(BackendSettings.backendKey(BackendSettings.TYPE)));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO Removed when we're up on Java 11
|
||||||
|
private static <T> T requireNonNullElse(T obj, T defaultObj) {
|
||||||
|
return (obj != null) ? obj : requireNonNull(defaultObj, "defaultObj");
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO Removed when we're up on Java 11
|
||||||
|
private static <T> T requireNonNull(T obj, String message) {
|
||||||
|
if (obj == null)
|
||||||
|
throw new NullPointerException(message);
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getElasticsearchServerUrl(ConfigurableEnvironment environment) {
|
||||||
|
return environment.getProperty("elasticsearch.rest_url", String.class);
|
||||||
|
}
|
||||||
|
|
||||||
public static String getElasticsearchServerProtocol(ConfigurableEnvironment environment) {
|
public static String getElasticsearchServerProtocol(ConfigurableEnvironment environment) {
|
||||||
return environment.getProperty("elasticsearch.protocol", String.class, "http");
|
return environment.getProperty("elasticsearch.protocol", String.class, "http");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getElasticsearchServerUsername(ConfigurableEnvironment environment) {
|
public static String getElasticsearchServerUsername(ConfigurableEnvironment environment) {
|
||||||
return environment.getProperty("elasticsearch.username");
|
return environment.getProperty("elasticsearch.username");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getElasticsearchServerPassword(ConfigurableEnvironment environment) {
|
public static String getElasticsearchServerPassword(ConfigurableEnvironment environment) {
|
||||||
return environment.getProperty("elasticsearch.password");
|
return environment.getProperty("elasticsearch.password");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Boolean isElasticsearchEnabled(ConfigurableEnvironment environment) {
|
public static Boolean isElasticsearchEnabled(ConfigurableEnvironment environment) {
|
||||||
if (environment.getProperty("elasticsearch.enabled", Boolean.class) != null) {
|
if (environment.getProperty("elasticsearch.enabled", Boolean.class) != null) {
|
||||||
return environment.getProperty("elasticsearch.enabled", Boolean.class);
|
return environment.getProperty("elasticsearch.enabled", Boolean.class);
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Map<String, Object> getPropertiesStartingWith(ConfigurableEnvironment aEnv,
|
public static Map<String, Object> getPropertiesStartingWith(ConfigurableEnvironment aEnv,
|
||||||
String aKeyPrefix) {
|
String aKeyPrefix) {
|
||||||
Map<String, Object> result = new HashMap<>();
|
Map<String, Object> result = new HashMap<>();
|
||||||
|
|
||||||
Map<String, Object> map = getAllProperties(aEnv);
|
Map<String, Object> map = getAllProperties(aEnv);
|
||||||
|
|
||||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
|
|
||||||
if (key.startsWith(aKeyPrefix)) {
|
if (key.startsWith(aKeyPrefix)) {
|
||||||
result.put(key, entry.getValue());
|
result.put(key, entry.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Map<String, Object> getAllProperties(ConfigurableEnvironment aEnv) {
|
public static Map<String, Object> getAllProperties(ConfigurableEnvironment aEnv) {
|
||||||
Map<String, Object> result = new HashMap<>();
|
Map<String, Object> result = new HashMap<>();
|
||||||
aEnv.getPropertySources().forEach(ps -> addAll(result, getAllProperties(ps)));
|
aEnv.getPropertySources().forEach(ps -> addAll(result, getAllProperties(ps)));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Map<String, Object> getAllProperties(PropertySource<?> aPropSource) {
|
public static Map<String, Object> getAllProperties(PropertySource<?> aPropSource) {
|
||||||
Map<String, Object> result = new HashMap<>();
|
Map<String, Object> result = new HashMap<>();
|
||||||
|
|
||||||
if (aPropSource instanceof CompositePropertySource) {
|
if (aPropSource instanceof CompositePropertySource) {
|
||||||
CompositePropertySource cps = (CompositePropertySource) aPropSource;
|
CompositePropertySource cps = (CompositePropertySource) aPropSource;
|
||||||
cps.getPropertySources().forEach(ps -> addAll(result, getAllProperties(ps)));
|
cps.getPropertySources().forEach(ps -> addAll(result, getAllProperties(ps)));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aPropSource instanceof EnumerablePropertySource<?>) {
|
if (aPropSource instanceof EnumerablePropertySource<?>) {
|
||||||
EnumerablePropertySource<?> ps = (EnumerablePropertySource<?>) aPropSource;
|
EnumerablePropertySource<?> ps = (EnumerablePropertySource<?>) aPropSource;
|
||||||
Arrays.asList(ps.getPropertyNames()).forEach(key -> result.put(key, ps.getProperty(key)));
|
Arrays.asList(ps.getPropertyNames()).forEach(key -> result.put(key, ps.getProperty(key)));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addAll(Map<String, Object> aBase, Map<String, Object> aToBeAdded) {
|
private static void addAll(Map<String, Object> aBase, Map<String, Object> aToBeAdded) {
|
||||||
for (Map.Entry<String, Object> entry : aToBeAdded.entrySet()) {
|
for (Map.Entry<String, Object> entry : aToBeAdded.entrySet()) {
|
||||||
if (aBase.containsKey(entry.getKey())) {
|
if (aBase.containsKey(entry.getKey())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
aBase.put(entry.getKey(), entry.getValue());
|
aBase.put(entry.getKey(), entry.getValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user