From 7c6024fa14576d8a3a953d6eac8b877d6ed549b0 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Fri, 3 Apr 2020 07:43:21 -0400 Subject: [PATCH] More work on subscriptions --- hapi-fhir-dist/pom.xml | 1 - .../ca/uhn/fhir/jpa/api/config/DaoConfig.java | 2 +- .../ca/uhn/fhir/jpa/api/dao/DaoRegistry.java | 2 +- .../java/ca/uhn/fhir/jpa/api/dao/IDao.java | 2 +- .../fhir/jpa/api/dao/IFhirResourceDao.java | 2 +- .../api/dao/IFhirResourceDaoCodeSystem.java | 2 +- .../api/dao/IFhirResourceDaoComposition.java | 2 +- .../api/dao/IFhirResourceDaoConceptMap.java | 2 +- .../api/dao/IFhirResourceDaoEncounter.java | 2 +- .../dao/IFhirResourceDaoMessageHeader.java | 2 +- .../jpa/api/dao/IFhirResourceDaoPatient.java | 2 +- .../dao/IFhirResourceDaoSearchParameter.java | 2 +- .../IFhirResourceDaoStructureDefinition.java | 2 +- .../api/dao/IFhirResourceDaoSubscription.java | 2 +- .../jpa/api/dao/IFhirResourceDaoValueSet.java | 2 +- .../uhn/fhir/jpa/api/dao/IFhirSystemDao.java | 2 +- .../java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java | 2 +- .../dao/MetadataKeyCurrentlyReindexing.java | 2 +- .../jpa/api/dao/MetadataKeyResourcePid.java | 2 +- .../fhir/jpa/api/model/DaoMethodOutcome.java | 2 +- .../fhir/jpa/api/model/DeleteConflict.java | 2 +- .../jpa/api/model/DeleteConflictList.java | 2 +- .../jpa/api/model/DeleteMethodOutcome.java | 2 +- .../fhir/jpa/api/model/ExpungeOptions.java | 2 +- .../fhir/jpa/api/model/ExpungeOutcome.java | 2 +- .../fhir/jpa/api/model/TranslationMatch.java | 2 +- .../fhir/jpa/api/model/TranslationQuery.java | 2 +- .../jpa/api/model/TranslationRequest.java | 2 +- .../fhir/jpa/api/model/TranslationResult.java | 2 +- .../fhir/jpa/api/model/WarmCacheEntry.java | 2 +- .../jpa/api/svc/ISearchCoordinatorSvc.java | 2 +- .../ca/uhn/fhir/jpa/config/BaseConfig.java | 15 +++--- .../uhn/fhir/jpa/config/BaseDstu2Config.java | 5 -- .../jpa/config/dstu3/BaseDstu3Config.java | 5 -- .../uhn/fhir/jpa/config/r4/BaseR4Config.java | 5 -- .../uhn/fhir/jpa/config/r5/BaseR5Config.java | 5 -- .../search/PersistedJpaBundleProvider.java | 2 +- .../PersistedJpaBundleProviderFactory.java | 20 ++++++++ .../fhir/jpa/searchparam/MatchUrlService.java | 1 - .../searchparam/config/SearchParamConfig.java | 46 ++++++++++++++++++- .../extractor/ResourceLinkExtractor.java | 1 - .../SearchParamExtractorService.java | 2 - .../matcher/InMemoryResourceMatcher.java | 1 - .../matcher/IndexedSearchParamExtractor.java | 1 - .../matcher/InlineResourceLinkResolver.java | 1 - .../matcher/SearchParamMatcher.java | 1 - .../config/SubscriptionChannelConfig.java | 20 ++++++++ .../config/SubscriptionProcessorConfig.java | 28 +++++++++++ .../process/deliver/DaoResourceRetriever.java | 2 +- ...SubscriptionDeliveringEmailSubscriber.java | 1 - ...scriptionDeliveringRestHookSubscriber.java | 8 +++- ...mpositeInMemoryDaoSubscriptionMatcher.java | 2 +- .../matching/DaoSubscriptionMatcher.java | 2 +- .../matching/IResourceModifiedConsumer.java | 2 +- ...aseSubscriberForSubscriptionResources.java | 20 ++++++++ .../SubscriptionActivatingSubscriber.java | 2 +- .../SubscriptionRegisteringSubscriber.java | 2 +- .../registry/DaoSubscriptionProvider.java | 2 +- .../config/SubscriptionSubmitterConfig.java | 20 ++++++++ .../interceptor/SubmitInterceptorLoader.java | 2 +- .../SubscriptionMatcherInterceptor.java | 2 +- .../SubscriptionValidatingInterceptor.java | 20 ++++++++ .../ISubscriptionTriggeringSvc.java | 2 +- .../SubscriptionTriggeringSvcImpl.java | 2 +- .../autoconfigure/FhirAutoConfiguration.java | 10 ++++ 65 files changed, 240 insertions(+), 81 deletions(-) diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index 872836b3024..2496d5582e6 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -271,7 +271,6 @@ false ${project.basedir}/src/assembly/hapi-fhir-standard-distribution.xml - ${project.basedir}/src/assembly/hapi-fhir-jpaserver-example.xml ${project.basedir}/src/assembly/hapi-fhir-android-distribution.xml ${project.basedir}/src/assembly/hapi-fhir-cli.xml diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/config/DaoConfig.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/config/DaoConfig.java index d0d877dd346..ae9f47c6c3e 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/config/DaoConfig.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/config/DaoConfig.java @@ -23,7 +23,7 @@ import java.util.TreeSet; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java index d8c3b245039..1a0e12bb6e8 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/DaoRegistry.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java index c4a108425ce..f341f294426 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IDao.java @@ -10,7 +10,7 @@ import java.util.Collection; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java index f550922133a..f6893a810e0 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java index 7279a604f8a..ba957e00542 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java @@ -15,7 +15,7 @@ import java.util.List; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java index 88b353ae90c..cabe7d62ef0 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoComposition.java @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java index bf2642f162c..04f7f53dfad 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoConceptMap.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java index 10721239479..b94396b1495 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoEncounter.java @@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoMessageHeader.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoMessageHeader.java index ebb834adee0..691fd063459 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoMessageHeader.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoMessageHeader.java @@ -4,7 +4,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java index 5d1d39d1f34..57fbe535d24 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoPatient.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java index afe13c6cf9c..a8d3f12e55b 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSearchParameter.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java index da3cb9022c0..7864e3310cb 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoStructureDefinition.java @@ -4,7 +4,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java index 9baebbf7b63..f2f94f30b82 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoSubscription.java @@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.api.IIdType; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java index c37c9201cc8..fa30e3576de 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoValueSet.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java index c48bfebd110..b1d43426689 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirSystemDao.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java index 5824cbf141e..f9ac5d9bd10 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IJpaDao.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java index 071e29fa2c6..c5778090d84 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyCurrentlyReindexing.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java index e90a4b8edcc..4c39cad0785 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/MetadataKeyResourcePid.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.dao; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java index 52a8c823fc4..4a9247efb38 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java index dc0c6eccb1a..b53bcd46004 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflict.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java index 792e586eebd..6aaf63547de 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java index 9f140cb1a72..e1ab49e8263 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteMethodOutcome.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java index a3ec0576961..162fd114658 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOptions.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java index 05e56610a4d..757a2ecf335 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/ExpungeOutcome.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationMatch.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationMatch.java index d6f7a5cbd07..a52421a0916 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationMatch.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationMatch.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java index 4e8569a4276..6aefcf9ae3a 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationQuery.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java index 752b4fcfeee..19d6388b96c 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationRequest.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationResult.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationResult.java index 7744e47cd07..8e305b241ad 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationResult.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/TranslationResult.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /* * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java index a5401a86e9e..81411ac4cf8 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/WarmCacheEntry.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.model; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java index ebfcd3f0830..b9f38397ff3 100644 --- a/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java +++ b/hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/svc/ISearchCoordinatorSvc.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.api.svc; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR JPA API * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java index 82182d21b3e..af01c6165ae 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java @@ -32,6 +32,7 @@ import ca.uhn.fhir.jpa.search.cache.ISearchCacheSvc; import ca.uhn.fhir.jpa.search.cache.ISearchResultCacheSvc; import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc; import ca.uhn.fhir.jpa.search.reindex.ResourceReindexingSvcImpl; +import ca.uhn.fhir.jpa.searchparam.config.SearchParamConfig; import ca.uhn.fhir.jpa.searchparam.registry.ISearchParamRegistry; import ca.uhn.fhir.jpa.searchparam.registry.SearchParamRegistryImpl; import ca.uhn.fhir.rest.api.server.RequestDetails; @@ -43,6 +44,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; import org.springframework.core.env.Environment; @@ -83,7 +85,12 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer; @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = WebSocketConfigurer.class), @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*\\.test\\..*"), @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*Test.*"), - @ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.subscription.module.standalone.*")}) + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.subscription.*"), + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.searchparam.*") +}) +@Import({ + SearchParamConfig.class +}) public abstract class BaseConfig { public static final String JPA_VALIDATION_SUPPORT_CHAIN = "myJpaValidationSupportChain"; @@ -133,12 +140,6 @@ public abstract class BaseConfig { return b; } - @Bean - public ISearchParamRegistry searchParamRegistry() { - return new SearchParamRegistryImpl(); - } - - @Bean(name = "mySubscriptionTriggeringProvider") @Lazy public SubscriptionTriggeringProvider subscriptionTriggeringProvider() { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java index 2814ddb95d0..8e85e7e02ab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java @@ -124,11 +124,6 @@ public class BaseDstu2Config extends BaseConfig { return searchDao; } - @Bean(autowire = Autowire.BY_TYPE) - public SearchParamExtractorDstu2 searchParamExtractor() { - return new SearchParamExtractorDstu2(); - } - @Bean(name = "mySystemDaoDstu2", autowire = Autowire.BY_NAME) public IFhirSystemDao systemDaoDstu2() { ca.uhn.fhir.jpa.dao.FhirSystemDaoDstu2 retVal = new ca.uhn.fhir.jpa.dao.FhirSystemDaoDstu2(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java index a2106cd7d99..13e19195641 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java @@ -101,11 +101,6 @@ public class BaseDstu3Config extends BaseConfigDstu3Plus { return new FulltextSearchSvcImpl(); } - @Bean - public SearchParamExtractorDstu3 searchParamExtractor() { - return new SearchParamExtractorDstu3(); - } - @Bean(name = "mySystemDaoDstu3") public IFhirSystemDao systemDaoDstu3() { return new ca.uhn.fhir.jpa.dao.dstu3.FhirSystemDaoDstu3(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java index e2bf083d923..bf53a64685f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java @@ -103,11 +103,6 @@ public class BaseR4Config extends BaseConfigDstu3Plus { return searchDao; } - @Bean(autowire = Autowire.BY_TYPE) - public SearchParamExtractorR4 searchParamExtractor() { - return new SearchParamExtractorR4(); - } - @Bean(name = "mySystemDaoR4", autowire = Autowire.BY_NAME) public IFhirSystemDao systemDaoR4() { ca.uhn.fhir.jpa.dao.r4.FhirSystemDaoR4 retVal = new ca.uhn.fhir.jpa.dao.r4.FhirSystemDaoR4(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/BaseR5Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/BaseR5Config.java index 3d694551dcc..78b6327e92d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/BaseR5Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/BaseR5Config.java @@ -103,11 +103,6 @@ public class BaseR5Config extends BaseConfigDstu3Plus { return searchDao; } - @Bean(autowire = Autowire.BY_TYPE) - public SearchParamExtractorR5 searchParamExtractor() { - return new SearchParamExtractorR5(); - } - @Bean(name = "mySystemDaoR5", autowire = Autowire.BY_NAME) public IFhirSystemDao systemDaoR5() { ca.uhn.fhir.jpa.dao.r5.FhirSystemDaoR5 retVal = new ca.uhn.fhir.jpa.dao.r5.FhirSystemDaoR5(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java index c011678ea41..ac5e0e6932e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProvider.java @@ -96,6 +96,7 @@ public class PersistedJpaBundleProvider implements IBundleProvider { @Autowired private ISearchCoordinatorSvc mySearchCoordinatorSvc; @Autowired + private ISearchCacheSvc mySearchCacheSvc; /* * Non autowired fields (will be different for every instance @@ -103,7 +104,6 @@ public class PersistedJpaBundleProvider implements IBundleProvider { */ private final RequestDetails myRequest; - private ISearchCacheSvc mySearchCacheSvc; private Search mySearchEntity; private String myUuid; private boolean myCacheHit; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java index 5432865e99f..3c695cd0b12 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderFactory.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.jpa.search; +/*- + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.jpa.config.BaseConfig; import ca.uhn.fhir.jpa.dao.ISearchBuilder; import ca.uhn.fhir.jpa.entity.Search; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java index fb77ea8af24..7b4e98ae21e 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java @@ -44,7 +44,6 @@ import java.util.List; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -@Service public class MatchUrlService { @Autowired diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java index dc937e0f6fc..008a5e535ee 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/config/SearchParamConfig.java @@ -21,22 +21,30 @@ package ca.uhn.fhir.jpa.searchparam.config; */ import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.searchparam.MatchUrlService; +import ca.uhn.fhir.jpa.searchparam.extractor.IResourceLinkResolver; import ca.uhn.fhir.jpa.searchparam.extractor.ISearchParamExtractor; +import ca.uhn.fhir.jpa.searchparam.extractor.ResourceLinkExtractor; import ca.uhn.fhir.jpa.searchparam.extractor.SearchParamExtractorDstu2; import ca.uhn.fhir.jpa.searchparam.extractor.SearchParamExtractorDstu3; import ca.uhn.fhir.jpa.searchparam.extractor.SearchParamExtractorR4; import ca.uhn.fhir.jpa.searchparam.extractor.SearchParamExtractorR5; +import ca.uhn.fhir.jpa.searchparam.extractor.SearchParamExtractorService; +import ca.uhn.fhir.jpa.searchparam.matcher.InMemoryResourceMatcher; +import ca.uhn.fhir.jpa.searchparam.matcher.IndexedSearchParamExtractor; +import ca.uhn.fhir.jpa.searchparam.matcher.InlineResourceLinkResolver; +import ca.uhn.fhir.jpa.searchparam.matcher.SearchParamMatcher; import ca.uhn.fhir.jpa.searchparam.registry.ISearchParamRegistry; import ca.uhn.fhir.jpa.searchparam.registry.SearchParamRegistryImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableScheduling; @Configuration @EnableScheduling -@ComponentScan(basePackages = {"ca.uhn.fhir.jpa.searchparam"}) public class SearchParamConfig { @Autowired @@ -66,4 +74,40 @@ public class SearchParamConfig { return new SearchParamRegistryImpl(); } + @Bean + public MatchUrlService matchUrlService() { + return new MatchUrlService(); + } + + @Bean + public ResourceLinkExtractor resourceLinkExtractor() { + return new ResourceLinkExtractor(); + } + + @Bean + @Lazy + public SearchParamExtractorService searchParamExtractorService(){ + return new SearchParamExtractorService(); + } + + @Bean + public IndexedSearchParamExtractor indexedSearchParamExtractor() { + return new IndexedSearchParamExtractor(); + } + + @Bean + public InlineResourceLinkResolver inlineResourceLinkResolver() { + return new InlineResourceLinkResolver(); + } + + @Bean + public InMemoryResourceMatcher InMemoryResourceMatcher() { + return new InMemoryResourceMatcher(); + } + + @Bean + public SearchParamMatcher SearchParamMatcher() { + return new SearchParamMatcher(); + } + } diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceLinkExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceLinkExtractor.java index 89e4e2d5d46..16b8f98ecb2 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceLinkExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceLinkExtractor.java @@ -46,7 +46,6 @@ import java.util.Map; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; -@Service public class ResourceLinkExtractor { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceLinkExtractor.class); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java index 95ce06c08de..42545f90caf 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java @@ -36,8 +36,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -@Service -@Lazy public class SearchParamExtractorService { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorService.class); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java index 85d2281c30f..63a86594f98 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java @@ -50,7 +50,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -@Service public class InMemoryResourceMatcher { @Autowired diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java index cc0fb9da79a..5d1afa98b95 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/IndexedSearchParamExtractor.java @@ -30,7 +30,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -@Service public class IndexedSearchParamExtractor { @Autowired private FhirContext myContext; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InlineResourceLinkResolver.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InlineResourceLinkResolver.java index 9c19daa9365..9de028b7f57 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InlineResourceLinkResolver.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InlineResourceLinkResolver.java @@ -31,7 +31,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.stereotype.Service; -@Service public class InlineResourceLinkResolver implements IResourceLinkResolver { @Override diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java index 4266f361cb7..56fc2bb41b4 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/SearchParamMatcher.java @@ -26,7 +26,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -@Service public class SearchParamMatcher { @Autowired private IndexedSearchParamExtractor myIndexedSearchParamExtractor; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java index a9408ddc681..64d9c62d8a9 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/config/SubscriptionChannelConfig.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.jpa.subscription.channel.config; +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.jpa.subscription.channel.queue.IQueueChannelFactory; import ca.uhn.fhir.jpa.subscription.channel.queue.LinkedBlockingQueueChannelFactory; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelFactory; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/config/SubscriptionProcessorConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/config/SubscriptionProcessorConfig.java index d923ce00336..88151a43de1 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/config/SubscriptionProcessorConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/config/SubscriptionProcessorConfig.java @@ -1,11 +1,33 @@ package ca.uhn.fhir.jpa.subscription.process.config; +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelRegistry; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryChannelNamer; import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory; import ca.uhn.fhir.jpa.subscription.process.deliver.DaoResourceRetriever; import ca.uhn.fhir.jpa.subscription.process.deliver.IResourceRetriever; +import ca.uhn.fhir.jpa.subscription.process.deliver.email.IEmailSender; +import ca.uhn.fhir.jpa.subscription.process.deliver.email.SubscriptionDeliveringEmailSubscriber; import ca.uhn.fhir.jpa.subscription.process.deliver.resthook.SubscriptionDeliveringRestHookSubscriber; import ca.uhn.fhir.jpa.subscription.process.deliver.websocket.WebsocketConnectionValidator; import ca.uhn.fhir.jpa.subscription.process.matcher.matching.CompositeInMemoryDaoSubscriptionMatcher; @@ -117,6 +139,12 @@ public class SubscriptionProcessorConfig { return new SubscriptionDeliveringRestHookSubscriber(); } + @Bean + @Scope("prototype") + public SubscriptionDeliveringEmailSubscriber subscriptionDeliveringEmailSubscriber(IEmailSender theEmailSender) { + return new SubscriptionDeliveringEmailSubscriber(theEmailSender); + } + @Bean public InMemorySubscriptionMatcher inMemorySubscriptionMatcher() { return new InMemorySubscriptionMatcher(); diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/DaoResourceRetriever.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/DaoResourceRetriever.java index d070b5adcba..0b7721be732 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/DaoResourceRetriever.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/DaoResourceRetriever.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.deliver; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/email/SubscriptionDeliveringEmailSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/email/SubscriptionDeliveringEmailSubscriber.java index ce650ccad2f..cd4eeab97aa 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/email/SubscriptionDeliveringEmailSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/email/SubscriptionDeliveringEmailSubscriber.java @@ -38,7 +38,6 @@ import java.util.List; import static org.apache.commons.lang3.StringUtils.*; -@Component @Scope("prototype") public class SubscriptionDeliveringEmailSubscriber extends BaseSubscriptionDeliverySubscriber { private Logger ourLog = LoggerFactory.getLogger(SubscriptionDeliveringEmailSubscriber.class); diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java index d9514007060..1af1029bd54 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/deliver/resthook/SubscriptionDeliveringRestHookSubscriber.java @@ -48,13 +48,19 @@ import java.util.*; import static org.apache.commons.lang3.StringUtils.isNotBlank; -@Component @Scope("prototype") public class SubscriptionDeliveringRestHookSubscriber extends BaseSubscriptionDeliverySubscriber { @Autowired IResourceRetriever myResourceRetriever; private Logger ourLog = LoggerFactory.getLogger(SubscriptionDeliveringRestHookSubscriber.class); + /** + * Constructor + */ + public SubscriptionDeliveringRestHookSubscriber() { + super(); + } + protected void deliverPayload(ResourceDeliveryMessage theMsg, CanonicalSubscription theSubscription, EncodingEnum thePayloadType, IGenericClient theClient) { IBaseResource payloadResource = getAndMassagePayload(theMsg, theSubscription); diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java index ae13ef2ad0a..46bd57c02e6 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/CompositeInMemoryDaoSubscriptionMatcher.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.matching; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/DaoSubscriptionMatcher.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/DaoSubscriptionMatcher.java index 8299ca9c8fe..3c9cb3437aa 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/DaoSubscriptionMatcher.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/DaoSubscriptionMatcher.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.matching; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/IResourceModifiedConsumer.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/IResourceModifiedConsumer.java index 047649909b3..577dbc4e2fc 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/IResourceModifiedConsumer.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/matching/IResourceModifiedConsumer.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.matching; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/BaseSubscriberForSubscriptionResources.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/BaseSubscriberForSubscriptionResources.java index 79e207a281f..f1544848335 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/BaseSubscriberForSubscriptionResources.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/BaseSubscriberForSubscriptionResources.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.subscriber; +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage; import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionActivatingSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionActivatingSubscriber.java index a1f1dbfb49e..ddc167ee6cd 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionActivatingSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionActivatingSubscriber.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.subscriber; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionRegisteringSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionRegisteringSubscriber.java index 1273ad8e8a8..9c6eabdae79 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionRegisteringSubscriber.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/matcher/subscriber/SubscriptionRegisteringSubscriber.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.matcher.subscriber; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/registry/DaoSubscriptionProvider.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/registry/DaoSubscriptionProvider.java index ad75c98df8e..adb4b885534 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/registry/DaoSubscriptionProvider.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/process/registry/DaoSubscriptionProvider.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.process.registry; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java index eab841e50b2..edbb96c5296 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/config/SubscriptionSubmitterConfig.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.jpa.subscription.submit.config; +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionMatcherInterceptor; import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubmitInterceptorLoader; import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionValidatingInterceptor; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubmitInterceptorLoader.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubmitInterceptorLoader.java index af3c7030410..c6715a95232 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubmitInterceptorLoader.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubmitInterceptorLoader.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.submit.interceptor; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java index 2d88a34a5de..ceb3dccf7d9 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionMatcherInterceptor.java @@ -24,7 +24,7 @@ import javax.annotation.PostConstruct; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java index df1157bd96e..237d22a38e6 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/submit/interceptor/SubscriptionValidatingInterceptor.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.jpa.subscription.submit.interceptor; +/*- + * #%L + * HAPI FHIR Subscription Server + * %% + * Copyright (C) 2014 - 2020 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Interceptor; diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java index ac972e543f6..9a457dc6829 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/ISubscriptionTriggeringSvc.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.triggering; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java index 721fe15e588..5a268329c62 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/triggering/SubscriptionTriggeringSvcImpl.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.triggering; /*- * #%L - * HAPI FHIR JPA Server + * HAPI FHIR Subscription Server * %% * Copyright (C) 2014 - 2020 University Health Network * %% diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java index 1902686f361..e72f835c0bb 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/src/main/java/ca/uhn/fhir/spring/boot/autoconfigure/FhirAutoConfiguration.java @@ -27,9 +27,13 @@ import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu2; import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3; import ca.uhn.fhir.jpa.config.BaseJavaConfigR4; import ca.uhn.fhir.jpa.api.config.DaoConfig; +import ca.uhn.fhir.jpa.config.WebsocketDispatcherConfig; import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.provider.BaseJpaProvider; import ca.uhn.fhir.jpa.provider.BaseJpaSystemProvider; +import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig; +import ca.uhn.fhir.jpa.subscription.process.config.SubscriptionProcessorConfig; +import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig; import ca.uhn.fhir.okhttp.client.OkHttpRestfulClientFactory; import ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory; import ca.uhn.fhir.rest.client.api.IClientInterceptor; @@ -58,6 +62,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.util.CollectionUtils; @@ -161,6 +166,11 @@ public class FhirAutoConfiguration { @Configuration @EntityScan(basePackages = {"ca.uhn.fhir.jpa.entity", "ca.uhn.fhir.jpa.model.entity"}) + @Import({ + SubscriptionChannelConfig.class, + SubscriptionProcessorConfig.class, + SubscriptionSubmitterConfig.class + }) static class FhirJpaDaoConfiguration { @Bean