From 6d5ee3036d692ca124cc9783459ed2ddf76e2d11 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 17 Feb 2021 14:22:52 -0500 Subject: [PATCH] Fix broken test and loading --- .../uhn/fhir/jpa/starter/EnvironmentHelper.java | 15 ++++++++++----- .../fhir/jpa/starter/ElasticsearchLastNR4IT.java | 2 +- .../uhn/fhir/jpa/starter/ExampleServerR4IT.java | 6 ++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java index b5b2279..3df2c53 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java @@ -36,11 +36,16 @@ public class EnvironmentHelper { properties.putIfAbsent("hibernate.cache.use_structured_entries", "false"); properties.putIfAbsent("hibernate.cache.use_minimal_puts", "false"); - properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_TYPE), "local-filesystem"); - 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"); + if (jpaProps.getOrDefault("spring.jpa.properties.hibernate.search.enabled", "false").toString() == "true") { + properties.putIfAbsent(HibernateOrmMapperSettings.ENABLED, true); + properties.putIfAbsent(BackendSettings.backendKey(LuceneIndexSettings.DIRECTORY_TYPE), "local-filesystem"); + 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 entry : jpaProps.entrySet()) { String strippedKey = entry.getKey().replace("spring.jpa.properties.", ""); diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java index 271a4ad..902abbe 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java @@ -60,7 +60,7 @@ public class ElasticsearchLastNR4IT { private IGenericClient ourClient; private FhirContext ourCtx; - private static final String ELASTIC_VERSION = "7.10.0"; + private static final String ELASTIC_VERSION = "7.10.1"; private static final String ELASTIC_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTIC_VERSION; private static ElasticsearchContainer embeddedElastic; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java index 16950e1..72091e7 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java @@ -75,10 +75,8 @@ public class ExampleServerR4IT { assertEquals(methodName, pt2.getName().get(0).getFamily()); - // Test MDM - // Wait until the MDM message has been processed - await().until(() -> getPatients().size(), equalTo(3)); + await().until(() -> getPatients().size(), equalTo(2)); List persons = getPatients(); Patient goldenRecord = persons.get(0); @@ -165,6 +163,6 @@ public class ExampleServerR4IT { ourCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000); String ourServerBase = "http://localhost:" + port + "/fhir/"; ourClient = ourCtx.newRestfulGenericClient(ourServerBase); - ourClient.registerInterceptor(new LoggingInterceptor(true)); +// ourClient.registerInterceptor(new LoggingInterceptor(false)); } }