From 816f409a8a8ce0931cb586e28cd4628e1d40fdf8 Mon Sep 17 00:00:00 2001 From: ianmarshall Date: Mon, 25 May 2020 11:37:01 -0400 Subject: [PATCH] Re-factor lastn entities to locate them is same package as other Search Parameter entities. --- .../src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java | 3 +-- .../java/ca/uhn/fhir/jpa/config/BaseConfigDstu3Plus.java | 2 +- .../dao/{lastn => }/ObservationLastNIndexPersistSvc.java | 8 ++++++-- ...servationIndexedCodeCodeableConceptSearchParamDao.java | 2 +- .../data/IObservationIndexedCodeCodingSearchParamDao.java | 2 +- .../dao/data/IObservationIndexedSearchParamLastNDao.java | 2 +- .../jpa/dao/dstu3/FhirResourceDaoObservationDstu3.java | 2 +- .../uhn/fhir/jpa/dao/r4/FhirResourceDaoObservationR4.java | 2 +- .../uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java | 2 +- .../uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java | 8 ++++---- .../r4/PersistObservationIndexedSearchParamLastNR4IT.java | 6 +++--- .../ObservationIndexedCategoryCodeableConceptEntity.java | 2 +- .../entity/ObservationIndexedCategoryCodingEntity.java | 4 ++-- .../ObservationIndexedCodeCodeableConceptEntity.java | 2 +- .../model}/entity/ObservationIndexedCodeCodingEntity.java | 4 ++-- .../entity/ObservationIndexedSearchParamLastNEntity.java | 2 +- .../java/ca/uhn/fhir/jpa/model}/util/CodeSystemHash.java | 2 +- .../spring/boot/autoconfigure/FhirAutoConfiguration.java | 2 +- 18 files changed, 30 insertions(+), 27 deletions(-) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{lastn => }/ObservationLastNIndexPersistSvc.java (95%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/entity/ObservationIndexedCategoryCodeableConceptEntity.java (96%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/entity/ObservationIndexedCategoryCodingEntity.java (89%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/entity/ObservationIndexedCodeCodeableConceptEntity.java (98%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/entity/ObservationIndexedCodeCodingEntity.java (93%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/entity/ObservationIndexedSearchParamLastNEntity.java (98%) rename {hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn => hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model}/util/CodeSystemHash.java (96%) 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 992f9aa8a93..259a04db35c 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 @@ -355,8 +355,7 @@ public abstract class BaseConfig { public static void configureEntityManagerFactory(LocalContainerEntityManagerFactoryBean theFactory, FhirContext theCtx) { theFactory.setJpaDialect(hibernateJpaDialect(theCtx.getLocalizer())); - // TODO: Looking at moving the lastn entities into jpa.model.entity package. Note that moving the lastn entities may require re-building elasticsearch indexes. - theFactory.setPackagesToScan("ca.uhn.fhir.jpa.model.entity", "ca.uhn.fhir.jpa.entity", "ca.uhn.fhir.jpa.dao.lastn.entity"); + theFactory.setPackagesToScan("ca.uhn.fhir.jpa.model.entity", "ca.uhn.fhir.jpa.entity"); theFactory.setPersistenceProvider(new HibernatePersistenceProvider()); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfigDstu3Plus.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfigDstu3Plus.java index 4bc9abbb563..8f27e2f0a41 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfigDstu3Plus.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfigDstu3Plus.java @@ -23,7 +23,7 @@ package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.support.DefaultProfileValidationSupport; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.jpa.dao.JpaPersistedResourceValidationSupport; -import ca.uhn.fhir.jpa.dao.lastn.ObservationLastNIndexPersistSvc; +import ca.uhn.fhir.jpa.dao.ObservationLastNIndexPersistSvc; import ca.uhn.fhir.jpa.term.TermCodeSystemStorageSvcImpl; import ca.uhn.fhir.jpa.term.TermDeferredStorageSvcImpl; import ca.uhn.fhir.jpa.term.TermReindexingSvcImpl; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/ObservationLastNIndexPersistSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/ObservationLastNIndexPersistSvc.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java index 105fc81efda..488041b90e6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/ObservationLastNIndexPersistSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ObservationLastNIndexPersistSvc.java @@ -1,10 +1,14 @@ -package ca.uhn.fhir.jpa.dao.lastn; +package ca.uhn.fhir.jpa.dao; import ca.uhn.fhir.context.*; import ca.uhn.fhir.jpa.dao.data.IObservationIndexedCodeCodingSearchParamDao; import ca.uhn.fhir.jpa.dao.data.IObservationIndexedSearchParamLastNDao; -import ca.uhn.fhir.jpa.dao.lastn.entity.*; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCategoryCodeableConceptEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCategoryCodingEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodeableConceptEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodingEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedSearchParamLastNEntity; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamToken; import ca.uhn.fhir.jpa.searchparam.extractor.ISearchParamExtractor; import ca.uhn.fhir.jpa.searchparam.extractor.PathAndRef; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodeableConceptSearchParamDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodeableConceptSearchParamDao.java index 2bde707c764..84c6c0e680f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodeableConceptSearchParamDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodeableConceptSearchParamDao.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.dao.data; -import ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedCodeCodeableConceptEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodeableConceptEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodingSearchParamDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodingSearchParamDao.java index d5d46f47e16..c4ca00b856a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodingSearchParamDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedCodeCodingSearchParamDao.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.dao.data; -import ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedCodeCodingEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodingEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedSearchParamLastNDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedSearchParamLastNDao.java index b4a6209795f..5e393b0909d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedSearchParamLastNDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IObservationIndexedSearchParamLastNDao.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.dao.data; -import ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedSearchParamLastNEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedSearchParamLastNEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoObservationDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoObservationDstu3.java index c31c77cd7a0..689c6bc8abb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoObservationDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoObservationDstu3.java @@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; */ import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDaoObservation; -import ca.uhn.fhir.jpa.dao.lastn.ObservationLastNIndexPersistSvc; +import ca.uhn.fhir.jpa.dao.ObservationLastNIndexPersistSvc; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoObservationR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoObservationR4.java index c25ce16ea54..fa00864ebad 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoObservationR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoObservationR4.java @@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.dao.r4; */ import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDaoObservation; -import ca.uhn.fhir.jpa.dao.lastn.ObservationLastNIndexPersistSvc; +import ca.uhn.fhir.jpa.dao.ObservationLastNIndexPersistSvc; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java index 8d9b7f2acfe..4c2d9fd79a7 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java @@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.dao.r5; */ import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDaoObservation; -import ca.uhn.fhir.jpa.dao.lastn.ObservationLastNIndexPersistSvc; +import ca.uhn.fhir.jpa.dao.ObservationLastNIndexPersistSvc; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java index 40655996679..814815e6223 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java @@ -52,8 +52,8 @@ public class ElasticsearchSvcImpl implements IElasticsearchSvc { public static final String OBSERVATION_INDEX = "observation_index"; public static final String CODE_INDEX = "code_index"; - public static final String OBSERVATION_DOCUMENT_TYPE = "ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedSearchParamLastNEntity"; - public static final String CODE_DOCUMENT_TYPE = "ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedCodeCodeableConceptEntity"; + public static final String OBSERVATION_DOCUMENT_TYPE = "ca.uhn.fhir.jpa.model.entity.ObservationIndexedSearchParamLastNEntity"; + public static final String CODE_DOCUMENT_TYPE = "ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodeableConceptEntity"; private final RestHighLevelClient myRestHighLevelClient; @@ -81,7 +81,7 @@ public class ElasticsearchSvcImpl implements IElasticsearchSvc { } String observationMapping = "{\n" + " \"mappings\" : {\n" + - " \"ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedSearchParamLastNEntity\" : {\n" + + " \"ca.uhn.fhir.jpa.model.entity.ObservationIndexedSearchParamLastNEntity\" : {\n" + " \"properties\" : {\n" + " \"codeconceptid\" : {\n" + " \"type\" : \"keyword\",\n" + @@ -143,7 +143,7 @@ public class ElasticsearchSvcImpl implements IElasticsearchSvc { } String codeMapping = "{\n" + " \"mappings\" : {\n" + - " \"ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedCodeCodeableConceptEntity\" : {\n" + + " \"ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodeableConceptEntity\" : {\n" + " \"properties\" : {\n" + " \"codeable_concept_id\" : {\n" + " \"type\" : \"keyword\",\n" + diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java index bafdfe53fee..1f29f9bf978 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java @@ -4,9 +4,9 @@ import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.config.TestR4ConfigWithElasticsearchClient; import ca.uhn.fhir.jpa.dao.data.IObservationIndexedCodeCodeableConceptSearchParamDao; -import ca.uhn.fhir.jpa.dao.lastn.ObservationLastNIndexPersistSvc; -import ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedCodeCodeableConceptEntity; -import ca.uhn.fhir.jpa.dao.lastn.entity.ObservationIndexedSearchParamLastNEntity; +import ca.uhn.fhir.jpa.dao.ObservationLastNIndexPersistSvc; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedCodeCodeableConceptEntity; +import ca.uhn.fhir.jpa.model.entity.ObservationIndexedSearchParamLastNEntity; import ca.uhn.fhir.jpa.dao.data.IObservationIndexedSearchParamLastNDao; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodeableConceptEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodeableConceptEntity.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodeableConceptEntity.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodeableConceptEntity.java index 281b5e59b91..d985da9b316 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodeableConceptEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodeableConceptEntity.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.lastn.entity; +package ca.uhn.fhir.jpa.model.entity; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodingEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodingEntity.java similarity index 89% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodingEntity.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodingEntity.java index 9bc95ed657c..9773e47a529 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCategoryCodingEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCategoryCodingEntity.java @@ -1,6 +1,6 @@ -package ca.uhn.fhir.jpa.dao.lastn.entity; +package ca.uhn.fhir.jpa.model.entity; -import ca.uhn.fhir.jpa.dao.lastn.util.CodeSystemHash; +import ca.uhn.fhir.jpa.model.util.CodeSystemHash; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodeableConceptEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodeableConceptEntity.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodeableConceptEntity.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodeableConceptEntity.java index 2757173505d..4dea98a0002 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodeableConceptEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodeableConceptEntity.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.lastn.entity; +package ca.uhn.fhir.jpa.model.entity; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodingEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodingEntity.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodingEntity.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodingEntity.java index ecdbfd6e7e3..5722022af75 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedCodeCodingEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedCodeCodingEntity.java @@ -1,6 +1,6 @@ -package ca.uhn.fhir.jpa.dao.lastn.entity; +package ca.uhn.fhir.jpa.model.entity; -import ca.uhn.fhir.jpa.dao.lastn.util.CodeSystemHash; +import ca.uhn.fhir.jpa.model.util.CodeSystemHash; import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Field; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedSearchParamLastNEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedSearchParamLastNEntity.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedSearchParamLastNEntity.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedSearchParamLastNEntity.java index 5fddc842c30..1d0695c1537 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/entity/ObservationIndexedSearchParamLastNEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ObservationIndexedSearchParamLastNEntity.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.lastn.entity; +package ca.uhn.fhir.jpa.model.entity; import org.hibernate.search.annotations.*; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/util/CodeSystemHash.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/util/CodeSystemHash.java rename to hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java index 6cac1cd3627..a1e4b1fe264 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/lastn/util/CodeSystemHash.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/CodeSystemHash.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.lastn.util; +package ca.uhn.fhir.jpa.model.util; import ca.uhn.fhir.util.UrlUtil; import com.google.common.base.Charsets; 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 0b3115e8efa..10b72a1e851 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 @@ -170,7 +170,7 @@ public class FhirAutoConfiguration { private ScheduledExecutorService myScheduledExecutorService; @Configuration - @EntityScan(basePackages = {"ca.uhn.fhir.jpa.entity", "ca.uhn.fhir.jpa.model.entity", "ca.uhn.fhir.jpa.dao.lastn.entity"}) + @EntityScan(basePackages = {"ca.uhn.fhir.jpa.entity", "ca.uhn.fhir.jpa.model.entity"}) @Import({ SubscriptionChannelConfig.class, SubscriptionProcessorConfig.class,