From 40252952615f1b35d8a1ed013cc6fc9ae1e9de67 Mon Sep 17 00:00:00 2001 From: jvi Date: Wed, 25 Aug 2021 16:55:18 +0200 Subject: [PATCH 1/4] Bumped version to 5.5.0 - still gotta talk with the SmileCDR folks --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9766342..80dc78f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.4.2 + 5.5.0 hapi-fhir-jpaserver-starter From d94aa8ba3bb1879d66350382f0ba8de2a9d3118d Mon Sep 17 00:00:00 2001 From: jvi Date: Wed, 25 Aug 2021 19:43:18 +0200 Subject: [PATCH 2/4] Renamed according to convention --- ...lasticsearchLastNR4IT.java => ElasticsearchLastNR4ITTest.java} | 0 .../{ExampleServerDstu2IT.java => ExampleServerDstu2ITTest.java} | 0 .../{ExampleServerDstu3IT.java => ExampleServerDstu3ITTest.java} | 0 .../{ExampleServerR4IT.java => ExampleServerR4ITTest.java} | 0 .../{ExampleServerR5IT.java => ExampleServerR5ITTest.java} | 0 ...{MultitenantServerR4IT.java => MultitenantServerR4ITTest.java} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename src/test/java/ca/uhn/fhir/jpa/starter/{ElasticsearchLastNR4IT.java => ElasticsearchLastNR4ITTest.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerDstu2IT.java => ExampleServerDstu2ITTest.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerDstu3IT.java => ExampleServerDstu3ITTest.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerR4IT.java => ExampleServerR4ITTest.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerR5IT.java => ExampleServerR5ITTest.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{MultitenantServerR4IT.java => MultitenantServerR4ITTest.java} (100%) diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4ITTest.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2ITTest.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3ITTest.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4ITTest.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5ITTest.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4ITTest.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java rename to src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4ITTest.java From eec1ab8649dbdd50c27c776339bda3fb99152dce Mon Sep 17 00:00:00 2001 From: jkv Date: Thu, 26 Aug 2021 20:57:23 +0200 Subject: [PATCH 3/4] Revert "Renamed according to convention" This reverts commit d94aa8ba3bb1879d66350382f0ba8de2a9d3118d. --- ...lasticsearchLastNR4ITTest.java => ElasticsearchLastNR4IT.java} | 0 .../{ExampleServerDstu2ITTest.java => ExampleServerDstu2IT.java} | 0 .../{ExampleServerDstu3ITTest.java => ExampleServerDstu3IT.java} | 0 .../{ExampleServerR4ITTest.java => ExampleServerR4IT.java} | 0 .../{ExampleServerR5ITTest.java => ExampleServerR5IT.java} | 0 ...{MultitenantServerR4ITTest.java => MultitenantServerR4IT.java} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename src/test/java/ca/uhn/fhir/jpa/starter/{ElasticsearchLastNR4ITTest.java => ElasticsearchLastNR4IT.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerDstu2ITTest.java => ExampleServerDstu2IT.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerDstu3ITTest.java => ExampleServerDstu3IT.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerR4ITTest.java => ExampleServerR4IT.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{ExampleServerR5ITTest.java => ExampleServerR5IT.java} (100%) rename src/test/java/ca/uhn/fhir/jpa/starter/{MultitenantServerR4ITTest.java => MultitenantServerR4IT.java} (100%) diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4ITTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java similarity index 100% rename from src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4ITTest.java rename to src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java From 09a5a5758c2cb4e33c9b35321cf72ad5822f8897 Mon Sep 17 00:00:00 2001 From: jkv Date: Thu, 26 Aug 2021 21:47:18 +0200 Subject: [PATCH 4/4] Allowed overriding of Reindex bean for now --- .../jpa/starter/ElasticsearchLastNR4IT.java | 24 ++++++++----------- .../jpa/starter/ExampleServerDstu2IT.java | 7 +++--- .../jpa/starter/ExampleServerDstu3IT.java | 15 ++++++------ .../fhir/jpa/starter/ExampleServerR5IT.java | 11 +++++---- .../jpa/starter/MultitenantServerR4IT.java | 3 ++- 5 files changed, 30 insertions(+), 30 deletions(-) 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 2dcf32d..24dfada 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java @@ -1,11 +1,18 @@ package ca.uhn.fhir.jpa.starter; -import ca.uhn.fhir.context.ConfigurationException; +import static org.junit.jupiter.api.Assertions.assertEquals; + import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; +import java.io.IOException; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import java.util.Date; +import java.util.GregorianCalendar; +import javax.annotation.PreDestroy; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.DateTimeType; @@ -27,18 +34,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.testcontainers.elasticsearch.ElasticsearchContainer; -import org.testcontainers.junit.jupiter.Container; - -import javax.annotation.PreDestroy; -import java.io.IOException; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = @@ -52,7 +47,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; // "elasticsearch.rest_url='http://localhost:9200'", "elasticsearch.username=SomeUsername", "elasticsearch.password=SomePassword", - "elasticsearch.protocol=http" + "elasticsearch.protocol=http", + "spring.main.allow-bean-definition-overriding=true" }) @ContextConfiguration(initializers = ElasticsearchLastNR4IT.Initializer.class) public class ElasticsearchLastNR4IT { diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java index 3aa1556..0b408de 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java @@ -18,9 +18,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { - "spring.batch.job.enabled=false", - "hapi.fhir.fhir_version=dstu2", - "spring.datasource.url=jdbc:h2:mem:dbr2" + "spring.batch.job.enabled=false", + "hapi.fhir.fhir_version=dstu2", + "spring.datasource.url=jdbc:h2:mem:dbr2", + "spring.main.allow-bean-definition-overriding=true" }) public class ExampleServerDstu2IT { diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java index 41a4126..91cb4ba 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -39,13 +39,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { - "spring.batch.job.enabled=false", - "spring.datasource.url=jdbc:h2:mem:dbr3", - "hapi.fhir.cql_enabled=true", - "hapi.fhir.fhir_version=dstu3", - "hapi.fhir.subscription.websocket_enabled=true", - "hapi.fhir.allow_external_references=true", - "hapi.fhir.allow_placeholder_references=true", + "spring.batch.job.enabled=false", + "spring.datasource.url=jdbc:h2:mem:dbr3", + "hapi.fhir.cql_enabled=true", + "hapi.fhir.fhir_version=dstu3", + "hapi.fhir.subscription.websocket_enabled=true", + "hapi.fhir.allow_external_references=true", + "hapi.fhir.allow_placeholder_references=true", + "spring.main.allow-bean-definition-overriding=true" }) diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java index 56b7316..6a7fc52 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java @@ -34,11 +34,12 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = { - "spring.batch.job.enabled=false", - "spring.datasource.url=jdbc:h2:mem:dbr5", - "hapi.fhir.fhir_version=r5", - "hapi.fhir.subscription.websocket_enabled=true", - "hapi.fhir.subscription.websocket_enabled=true" + "spring.batch.job.enabled=false", + "spring.datasource.url=jdbc:h2:mem:dbr5", + "hapi.fhir.fhir_version=r5", + "hapi.fhir.subscription.websocket_enabled=true", + "hapi.fhir.subscription.websocket_enabled=true", + "spring.main.allow-bean-definition-overriding=true" }) public class ExampleServerR5IT { diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java index f13a11a..d8ae7cf 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java @@ -24,7 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; "spring.datasource.url=jdbc:h2:mem:dbr4-mt", "hapi.fhir.fhir_version=r4", "hapi.fhir.subscription.websocket_enabled=true", - "hapi.fhir.partitioning.partitioning_include_in_search_hashes=false" + "hapi.fhir.partitioning.partitioning_include_in_search_hashes=false", + "spring.main.allow-bean-definition-overriding=true" }) public class MultitenantServerR4IT {