From db238aa9ec9d1c583d629440d00119d61df57b33 Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 17 Jun 2024 18:46:12 -0400 Subject: [PATCH] Fix subscription settings config in integration tests --- .../jpa/starter/ExampleServerDstu3IT.java | 1 - .../fhir/jpa/starter/ExampleServerR4IT.java | 3 +-- .../starter/SubscriptionSettingsConfig.java | 22 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 src/test/java/ca/uhn/fhir/jpa/starter/SubscriptionSettingsConfig.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 6913d2e..6882e3a 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -43,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; RepositoryConfig.class }, properties = { - "spring.profiles.include=subscriptionSettingsTest", "spring.datasource.url=jdbc:h2:mem:dbr3", "hapi.fhir.fhir_version=dstu3", "hapi.fhir.cr_enabled=true", 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 4854cf2..23953fb 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java +++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java @@ -55,11 +55,10 @@ import static org.opencds.cqf.fhir.utility.r4.Parameters.stringPart; NicknameServiceConfig.class, RepositoryConfig.class }, properties = { - "spring.profiles.include=subscriptionSettingsTest", "spring.datasource.url=jdbc:h2:mem:dbr4", "hapi.fhir.enable_repository_validating_interceptor=true", "hapi.fhir.fhir_version=r4", - //"hapi.fhir.subscription.websocket_enabled=true", + "hapi.fhir.subscription.websocket_enabled=true", //"hapi.fhir.mdm_enabled=true", "hapi.fhir.cr.enabled=true", "hapi.fhir.cr.caregaps_section_author=Organization/alphora-author", diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/SubscriptionSettingsConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/SubscriptionSettingsConfig.java deleted file mode 100644 index cb38d13..0000000 --- a/src/test/java/ca/uhn/fhir/jpa/starter/SubscriptionSettingsConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package ca.uhn.fhir.jpa.starter; - -import ca.uhn.fhir.jpa.model.config.SubscriptionSettings; -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("subscriptionSettingsTest") -@Configuration -public class SubscriptionSettingsConfig { - @Primary - @Bean - public SubscriptionSettings subscriptionSettings() { - SubscriptionSettings retVal = new SubscriptionSettings(); - - retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET); - retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.MESSAGE); - return retVal; - } -}