Extract Subscription Settings from Storage Settings (#5887)

* first cut * first cut * cleanup * that took way too long * fix test * licenses * merge master * merge master * changelog * review feedback * bump version
hapifhir · Jun 15, 2024 · 57d1815 · 57d1815
1 parent 024d848
commit 57d1815
Show file tree

Hide file tree

Showing 149 changed files with 727 additions and 542 deletions.
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5887-subscription-settings.yaml b/...-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5887-subscription-settings.yaml
@@ -0,0 +1,4 @@
+---
+type: change
+issue: 5887
+title: "Extract Subscription Settings from Storage Settings so they can be managed independently."
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java b/...-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java
@@ -37,6 +37,7 @@
 import ca.uhn.fhir.jpa.dao.SearchBuilderFactory;
 import ca.uhn.fhir.jpa.dao.mdm.MdmExpansionCacheSvc;
 import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import ca.uhn.fhir.jpa.model.search.SearchBuilderLoadIncludesParameters;
 import ca.uhn.fhir.jpa.model.search.SearchRuntimeDetails;
@@ -109,9 +110,8 @@ public class JpaBulkExportProcessor implements IBulkExportProcessor<JpaPid> {
  @Autowired
  private IIdHelperService<JpaPid> myIdHelperService;
 
- @SuppressWarnings("rawtypes")
  @Autowired
- protected IMdmLinkDao myMdmLinkDao;
+ protected IMdmLinkDao<JpaPid, MdmLink> myMdmLinkDao;
 
  @Autowired
  private MdmExpansionCacheSvc myMdmExpansionCacheSvc;

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java
@@ -22,13 +22,14 @@
 import ca.uhn.fhir.jpa.bulk.export.api.IBulkExportProcessor;
 import ca.uhn.fhir.jpa.bulk.export.svc.BulkExportHelperService;
 import ca.uhn.fhir.jpa.bulk.export.svc.JpaBulkExportProcessor;
+import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class JpaBulkExportConfig {
  @Bean
- public IBulkExportProcessor jpaBulkExportProcessor() {
+ public IBulkExportProcessor<JpaPid> jpaBulkExportProcessor() {
  return new JpaBulkExportProcessor();
  }
 

diff --git a/...hir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java b/...hir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java
@@ -36,6 +36,8 @@ public class RequestPartitionHelperSvc extends BaseRequestPartitionHelperSvc {
  @Autowired
  IPartitionLookupSvc myPartitionConfigSvc;
 
+ public RequestPartitionHelperSvc() {}
+
  @Override
  public RequestPartitionId validateAndNormalizePartitionIds(RequestPartitionId theRequestPartitionId) {
  List<String> names = null;

diff --git a/...jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java b/...jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaCapabilityStatementProvider.java
@@ -91,24 +91,6 @@ protected void postProcess(FhirTerser theTerser, IBaseConformance theCapabilityS
  theTerser.addElement(theCapabilityStatement, "patchFormat", Constants.CT_XML_PATCH);
  }
 
- @Override
- protected void postProcessRest(FhirTerser theTerser, IBase theRest) {
- super.postProcessRest(theTerser, theRest);
-
- if (myStorageSettings
- .getSupportedSubscriptionTypes()
- .contains(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.WEBSOCKET)) {
- if (isNotBlank(myStorageSettings.getWebsocketContextPath())) {
- ExtensionUtil.setExtension(
- myContext,
- theRest,
- Constants.CAPABILITYSTATEMENT_WEBSOCKET_URL,
- "uri",
- myStorageSettings.getWebsocketContextPath());
- }
- }
- }
-
  @Override
  protected void postProcessRestResource(FhirTerser theTerser, IBase theResource, String theResourceName) {
  super.postProcessRestResource(theTerser, theResource, theResourceName);

diff --git a/...ir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java b/...ir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java
@@ -25,7 +25,6 @@
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
 import ca.uhn.fhir.jpa.util.ResourceCountCache;
-import ca.uhn.fhir.model.api.ExtensionDt;
 import ca.uhn.fhir.model.dstu2.composite.MetaDt;
 import ca.uhn.fhir.model.dstu2.resource.Bundle;
 import ca.uhn.fhir.model.dstu2.resource.Conformance;
@@ -37,15 +36,12 @@
 import ca.uhn.fhir.model.dstu2.valueset.SearchParamTypeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.UriDt;
-import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.provider.dstu2.ServerConformanceProvider;
 import ca.uhn.fhir.util.CoverageIgnore;
 import ca.uhn.fhir.util.ExtensionConstants;
 import jakarta.servlet.http.HttpServletRequest;
-import org.hl7.fhir.dstu2.model.Subscription;
 
 import java.util.Collections;
 import java.util.List;
@@ -135,17 +131,6 @@ public Conformance getServerConformance(HttpServletRequest theRequest, RequestDe
  }
  }
 
- if (myStorageSettings
- .getSupportedSubscriptionTypes()
- .contains(Subscription.SubscriptionChannelType.WEBSOCKET)) {
- if (isNotBlank(myStorageSettings.getWebsocketContextPath())) {
- ExtensionDt websocketExtension = new ExtensionDt();
- websocketExtension.setUrl(Constants.CAPABILITYSTATEMENT_WEBSOCKET_URL);
- websocketExtension.setValue(new UriDt(myStorageSettings.getWebsocketContextPath()));
- retVal.getRestFirstRep().addUndeclaredExtension(websocketExtension);
- }
- }
-
  if (isNotBlank(myImplementationDescription)) {
  retVal.getImplementation().setDescription(myImplementationDescription);
  }

diff --git a/...server-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java b/...server-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java
@@ -43,7 +43,6 @@
 import org.hl7.fhir.dstu3.model.Enumerations.SearchParamType;
 import org.hl7.fhir.dstu3.model.Extension;
 import org.hl7.fhir.dstu3.model.Meta;
-import org.hl7.fhir.dstu3.model.UriType;
 
 import java.util.Collections;
 import java.util.List;
@@ -176,17 +175,6 @@ public CapabilityStatement getServerConformance(HttpServletRequest theRequest, R
 
  massage(retVal);
 
- if (myStorageSettings
- .getSupportedSubscriptionTypes()
- .contains(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.WEBSOCKET)) {
- if (isNotBlank(myStorageSettings.getWebsocketContextPath())) {
- Extension websocketExtension = new Extension();
- websocketExtension.setUrl(Constants.CAPABILITYSTATEMENT_WEBSOCKET_URL);
- websocketExtension.setValue(new UriType(myStorageSettings.getWebsocketContextPath()));
- retVal.getRestFirstRep().addExtension(websocketExtension);
- }
- }
-
  retVal.getImplementation().setDescription(myImplementationDescription);
  myCachedValue = retVal;
  return retVal;

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaHapiTransactionService.java
@@ -28,6 +28,8 @@ public class JpaHapiTransactionService extends HapiTransactionService {
 
  private volatile Boolean myCustomIsolationSupported;
 
+ public JpaHapiTransactionService() {}
+
  @Override
  public boolean isCustomIsolationSupported() {
  if (myCustomIsolationSupported == null) {

diff --git a/...server-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java b/...server-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java
@@ -16,6 +16,7 @@
 import ca.uhn.fhir.jpa.dao.mdm.MdmExpansionCacheSvc;
 import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
 import ca.uhn.fhir.jpa.dao.tx.NonTransactionalHapiTransactionService;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import ca.uhn.fhir.jpa.model.search.SearchBuilderLoadIncludesParameters;
 import ca.uhn.fhir.jpa.model.search.SearchRuntimeDetails;
@@ -138,7 +139,7 @@ public JpaPid next() {
  private IIdHelperService<JpaPid> myIdHelperService;
 
  @Mock
- private IMdmLinkDao<JpaPid,?> myMdmLinkDao;
+ private IMdmLinkDao<JpaPid, MdmLink> myMdmLinkDao;
 
  @Mock
  private MdmExpansionCacheSvc myMdmExpansionCacheSvc;

diff --git a/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml b/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-hfql/pom.xml b/hapi-fhir-jpaserver-hfql/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/...-fhir-jpaserver-hfql/src/test/java/ca/uhn/fhir/jpa/fql/executor/BaseHfqlExecutorTest.java b/...-fhir-jpaserver-hfql/src/test/java/ca/uhn/fhir/jpa/fql/executor/BaseHfqlExecutorTest.java
@@ -24,7 +24,7 @@
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/hapi-fhir-jpaserver-ips/pom.xml b/hapi-fhir-jpaserver-ips/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.5-SNAPSHOT</version>
+ <version>7.3.6-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java
@@ -2,6 +2,7 @@
 
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.mdm.helper.MdmHelperR4;
+import ca.uhn.fhir.jpa.model.config.SubscriptionSettings;
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
 import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig;
 import ca.uhn.fhir.jpa.test.config.TestSubscriptionMatcherInterceptorConfig;
@@ -19,8 +20,8 @@ MdmHelperR4 mdmHelperR4() {
 
  @Primary
  @Bean
- public JpaStorageSettings storageSettings() {
- JpaStorageSettings retVal = new JpaStorageSettings();
+ public SubscriptionSettings subscriptionSettings() {
+ SubscriptionSettings retVal = new SubscriptionSettings();
 
  retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.MESSAGE);