WIP bump HAPI

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java

@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 		RepositoryConfig.class
 	}, properties =
   {
-	  "spring.profiles.include=storageSettingsTest",
+	  "spring.profiles.include=subscriptionSettingsTest",
      "spring.datasource.url=jdbc:h2:mem:dbr3",
      "hapi.fhir.fhir_version=dstu3",
 	  "hapi.fhir.cr_enabled=true",

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java

@@ -55,7 +55,7 @@ import static org.opencds.cqf.fhir.utility.r4.Parameters.stringPart;
 		NicknameServiceConfig.class,
 		RepositoryConfig.class
 	}, properties = {
-	"spring.profiles.include=storageSettingsTest",
+	"spring.profiles.include=subscriptionSettingsTest",
 	"spring.datasource.url=jdbc:h2:mem:dbr4",
 	"hapi.fhir.enable_repository_validating_interceptor=true",
 	"hapi.fhir.fhir_version=r4",
@@ -237,7 +237,7 @@ class ExampleServerR4IT implements IServerSupport {
 		IIdType mySubscriptionId = methodOutcome.getId();
 
 		// Wait for the subscription to be activated
-		await().atMost(1, TimeUnit.MINUTES).until(()->activeSubscriptionCount(), equalTo(initialActiveSubscriptionCount + 1));
+		await().atMost(1, TimeUnit.MINUTES).until(this::activeSubscriptionCount, equalTo(initialActiveSubscriptionCount + 1));
 
 		/*
 		 * Attach websocket

src/test/java/ca/uhn/fhir/jpa/starter/MdmTest.java

@@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.starter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import ca.uhn.fhir.jpa.model.config.SubscriptionSettings;
 import org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +22,12 @@ class MdmTest {
 	@Autowired
 	JpaStorageSettings jpaStorageSettings;
 
+	@Autowired
+	SubscriptionSettings subscriptionSettings;
+
 	@Test
 	void testApplicationStartedSuccessfully() {
 		assertThat(nicknameService).isNotNull();
-		assertThat(jpaStorageSettings.getSupportedSubscriptionTypes()).contains(SubscriptionChannelType.MESSAGE);
+		assertThat(subscriptionSettings.getSupportedSubscriptionTypes()).contains(SubscriptionChannelType.MESSAGE);
 	}
 }

src/test/java/ca/uhn/fhir/jpa/starter/SubscriptionSettingsConfig.java

@@ -1,19 +1,19 @@
 package ca.uhn.fhir.jpa.starter;
 
-import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
+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("storageSettingsTest")
+@Profile("subscriptionSettingsTest")
 @Configuration
-public class JpaStorageSettingsConfig {
+public class SubscriptionSettingsConfig {
 	@Primary
 	@Bean
-	public JpaStorageSettings storageSettings() {
-		JpaStorageSettings retVal = new JpaStorageSettings();
+	public SubscriptionSettings subscriptionSettings() {
+		SubscriptionSettings retVal = new SubscriptionSettings();
 
 		retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET);
 		retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.MESSAGE);