From 2fead63542e1023ee794ea362a490e2eb9d1f9b1 Mon Sep 17 00:00:00 2001 From: Michael Buckley Date: Thu, 31 Aug 2023 10:47:55 -0400 Subject: [PATCH 1/8] Start tracking 6.9.x-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b38277..a87eb92 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.8.0 + 6.9.4-SNAPSHOT hapi-fhir-jpaserver-starter From 4f6f3162f18c2fb37ff8b9cff435482e77665895 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 12 Oct 2023 10:03:16 -0400 Subject: [PATCH 2/8] Fix ExampleServerDstu3IT --- .../jpa/starter/ExampleServerDstu3IT.java | 10 ++++++++-- .../jpa/starter/MeasureEvaluationConfig.java | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java 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 0d20bab..b5a69fc 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.cr.config.RepositoryConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.api.CacheControlDirective; @@ -38,7 +39,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = {Application.class, JpaStarterWebsocketDispatcherConfig.class}, properties = +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = { + Application.class, + JpaStarterWebsocketDispatcherConfig.class, + RepositoryConfig.class + }, properties = { "spring.datasource.url=jdbc:h2:mem:dbr3", "hapi.fhir.cr_enabled=true", @@ -61,7 +67,7 @@ class ExampleServerDstu3IT implements IServerSupport { @LocalServerPort private int port; - @BeforeEach + @BeforeEach void beforeEach() { ourCtx = FhirContext.forDstu3(); ourCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER); diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java new file mode 100644 index 0000000..fc98e1b --- /dev/null +++ b/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java @@ -0,0 +1,19 @@ +package ca.uhn.fhir.jpa.starter; + +import org.opencds.cqf.fhir.cql.EvaluationSettings; +import org.opencds.cqf.fhir.cr.measure.MeasureEvaluationOptions; +import org.opencds.cqf.fhir.utility.ValidationProfile; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Map; + +@Configuration + +public class MeasureEvaluationConfig { + + @Bean + public MeasureEvaluationOptions measureEvaluationOptions(){ + return new MeasureEvaluationOptions(); + } +} From 6b8c702f2a8ca21b1d550bea4cda2d63b5b16ad7 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 12 Oct 2023 10:03:49 -0400 Subject: [PATCH 3/8] Bump HAPI version to 6.9.9-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a87eb92..18f00f6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.9.4-SNAPSHOT + 6.9.9-SNAPSHOT hapi-fhir-jpaserver-starter From bcd10350fe2656b468e07e489de75f425652645a Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 12 Oct 2023 10:27:27 -0400 Subject: [PATCH 4/8] Formatting --- .../java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java index fc98e1b..7f10750 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/MeasureEvaluationConfig.java @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Configuration; import java.util.Map; @Configuration - public class MeasureEvaluationConfig { @Bean From ce0d7d43d27f25f4513e9d43a4303389f51c8abc Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 12 Oct 2023 10:53:46 -0400 Subject: [PATCH 5/8] Fix ExampleServerR4IT, restrict config to specific tests --- .../jpa/starter/ElasticsearchLastNR4IT.java | 1 + .../jpa/starter/ExampleServerDstu3IT.java | 1 + .../fhir/jpa/starter/ExampleServerR4IT.java | 10 ++++++++- .../jpa/starter/JpaStorageSettingsConfig.java | 22 +++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/test/java/ca/uhn/fhir/jpa/starter/JpaStorageSettingsConfig.java 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 6f358d4..a7e6644 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.LocalServerPort; 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 b5a69fc..2d9d182 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -46,6 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; RepositoryConfig.class }, properties = { + "spring.profiles.include=storageSettingsTest", "spring.datasource.url=jdbc:h2:mem:dbr3", "hapi.fhir.cr_enabled=true", "hapi.fhir.fhir_version=dstu3", 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 26f27f6..3efd998 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.cr.config.RepositoryConfig; import ca.uhn.fhir.jpa.searchparam.config.NicknameServiceConfig; import ca.uhn.fhir.rest.api.CacheControlDirective; import ca.uhn.fhir.rest.api.EncodingEnum; @@ -31,7 +32,14 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = {Application.class, JpaStarterWebsocketDispatcherConfig.class, NicknameServiceConfig.class}, properties = { +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = { + Application.class, + JpaStarterWebsocketDispatcherConfig.class, + NicknameServiceConfig.class, + RepositoryConfig.class + }, properties = { + "spring.profiles.include=storageSettingsTest", "spring.datasource.url=jdbc:h2:mem:dbr4", "hapi.fhir.enable_repository_validating_interceptor=true", "hapi.fhir.fhir_version=r4", diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/JpaStorageSettingsConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStorageSettingsConfig.java new file mode 100644 index 0000000..8ed4bce --- /dev/null +++ b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStorageSettingsConfig.java @@ -0,0 +1,22 @@ +package ca.uhn.fhir.jpa.starter; + +import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; +import org.hl7.fhir.dstu2.model.Subscription; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; + +@Profile("storageSettingsTest") +@Configuration +public class JpaStorageSettingsConfig { + @Primary + @Bean + public JpaStorageSettings storageSettings() { + JpaStorageSettings retVal = new JpaStorageSettings(); + + retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET); + retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.MESSAGE); + return retVal; + } +} From 0afe6ae0509d6d70279e4d29df2a5b6df7e03f13 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 12 Oct 2023 16:01:12 -0400 Subject: [PATCH 6/8] Fix formatting --- src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d9d182..0be5db1 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -68,7 +68,7 @@ class ExampleServerDstu3IT implements IServerSupport { @LocalServerPort private int port; - @BeforeEach + @BeforeEach void beforeEach() { ourCtx = FhirContext.forDstu3(); ourCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER); From afce59e5ad14701923bd32ee9b926ec9ff93aaf4 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 24 Oct 2023 14:40:59 -0400 Subject: [PATCH 7/8] Bump to 6.9.10-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe3f017..1c0118c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.9.9-SNAPSHOT + 6.9.10-SNAPSHOT hapi-fhir-jpaserver-starter From d55aa31145bb67f51cc9f47418458af3a90fc333 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 22 Nov 2023 13:24:28 -0500 Subject: [PATCH 8/8] Bump parent pom to version 6.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c0118c..25964e6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 6.9.10-SNAPSHOT + 6.10.0 hapi-fhir-jpaserver-starter