From a806f3d2bcef81842917734b04c90cd8df6b7938 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Mon, 5 Dec 2022 11:29:51 -0500 Subject: [PATCH] add to Base so we can extract interface --- .../ca/uhn/fhir/jpa/config/JpaConfig.java | 2 +- .../fhir/jpa/dao/BaseHapiFhirResourceDao.java | 8 +++---- .../fhir/jpa/dao/FulltextSearchSvcImpl.java | 6 ++--- .../jpa/dao/JpaResourceDaoCodeSystem.java | 2 +- .../jpa/dao/index/IJpaIdHelperService.java | 2 +- .../fhir/jpa/dao/index/IdHelperService.java | 4 ++-- .../fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java | 14 +++++------ .../term/TermCodeSystemStorageSvcImpl.java | 4 ++-- .../ca/uhn/fhir/jpa/term/TermReadSvcImpl.java | 2 +- .../term/api/ITermCodeSystemStorageSvc.java | 4 ++-- .../svc/JpaBulkExportProcessorTest.java | 16 ++++++------- .../uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java | 24 +++++++++---------- .../mdm/svc/GoldenResourceMergerSvcImpl.java | 2 +- .../fhir/jpa/mdm/svc/MdmEidUpdateService.java | 2 +- .../jpa/mdm/svc/MdmLinkCreateSvcImpl.java | 4 ++-- .../uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java | 4 ++-- .../jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java | 8 +++---- .../uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java | 2 +- .../fhir/jpa/mdm/svc/MdmResourceDaoSvc.java | 2 +- .../svc/candidate/FindCandidateByEidSvc.java | 2 +- .../candidate/FindCandidateByExampleSvc.java | 2 +- .../svc/candidate/FindCandidateByLinkSvc.java | 4 ++-- .../MatchedGoldenResourceCandidate.java | 8 +++---- .../svc/candidate/MdmCandidateSearchSvc.java | 4 ++-- .../MdmGoldenResourceFindingSvc.java | 2 +- .../matcher/BaseGoldenResourceMatcher.java | 6 ++--- .../uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java | 2 +- .../mdm/matcher/IsPossibleDuplicateOf.java | 2 +- .../jpa/mdm/matcher/IsPossibleLinkedTo.java | 2 +- .../mdm/matcher/IsSameGoldenResourceAs.java | 2 +- .../fhir/jpa/model/entity/ResourceTable.java | 2 +- .../jpa/cache/ResourcePersistentIdMap.java | 8 +++---- .../SearchParamExtractorService.java | 2 +- .../SubscriptionTriggeringSvcImpl.java | 2 +- .../ca/uhn/fhir/jpa/search/BaseSearchSvc.java | 2 +- .../jpa/dao/index/ResourceVersionSvcTest.java | 8 +++---- .../uhn/fhir/mdm/api/IMdmLinkExpandSvc.java | 6 ++--- .../java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java | 14 +++++------ .../ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java | 4 ++-- .../ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java | 10 ++++---- .../storage/BaseResourcePersistentId.java | 2 +- .../server/storage/TransactionDetails.java | 16 ++++++------- .../jobs/export/FetchResourceIdsStep.java | 4 ++-- .../batch2/jobs/imprt/ConsumeFilesStep.java | 2 +- .../ca/uhn/fhir/batch2/jobs/models/Id.java | 2 +- .../fhir/batch2/jobs/reindex/ReindexStep.java | 4 ++-- .../jobs/export/FetchResourceIdsStepTest.java | 2 +- .../MdmInflateAndSubmitResourcesStep.java | 2 +- .../fhir/jpa/api/dao/IFhirResourceDao.java | 6 ++--- .../fhir/jpa/api/model/DaoMethodOutcome.java | 6 ++--- .../jpa/api/model/LazyDaoMethodOutcome.java | 2 +- .../fhir/jpa/api/pid/BaseResourcePidList.java | 2 +- .../fhir/jpa/api/pid/TypedResourcePid.java | 4 ++-- .../fhir/jpa/api/svc/IIdHelperService.java | 2 +- .../ca/uhn/fhir/jpa/dao/BaseStorageDao.java | 2 +- .../fhir/jpa/dao/BaseStorageResourceDao.java | 4 ++-- .../fhir/jpa/dao/SearchBuilderFactory.java | 2 +- .../jpa/dao/expunge/ExpungeOperation.java | 4 ++-- .../fhir/jpa/dao/expunge/ExpungeService.java | 6 ++--- .../dao/index/DaoResourceLinkResolver.java | 2 +- 60 files changed, 141 insertions(+), 141 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java index feec065b591..7d5e44754ab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java @@ -680,7 +680,7 @@ public class JpaConfig { @Bean @Scope("prototype") - public ExpungeOperation expungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { + public ExpungeOperation expungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { return new ExpungeOperation(theResourceName, theResourceId, theExpungeOptions, theRequestDetails); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java index d397156d60f..176c0d3514e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java @@ -1133,13 +1133,13 @@ public abstract class BaseHapiFhirResourceDao extends B @Override @Transactional - public T readByPid(BaseResourcePersistentId thePid) { + public T readByPid(BaseResourcePersistentId thePid) { return readByPid(thePid, false); } @Override @Transactional - public T readByPid(BaseResourcePersistentId thePid, boolean theDeletedOk) { + public T readByPid(BaseResourcePersistentId thePid, boolean theDeletedOk) { StopWatch w = new StopWatch(); JpaPid jpaPid = (JpaPid) thePid; @@ -1230,7 +1230,7 @@ public abstract class BaseHapiFhirResourceDao extends B @SuppressWarnings("unchecked") @Override - public void reindex(BaseResourcePersistentId theJpaPid, RequestDetails theRequest, TransactionDetails theTransactionDetails) { + public void reindex(BaseResourcePersistentId theJpaPid, RequestDetails theRequest, TransactionDetails theTransactionDetails) { Optional entityOpt = myResourceTableDao.findById(((JpaPid) theJpaPid).getId()); if (!entityOpt.isPresent()) { ourLog.warn("Unable to find entity with PID: {}", ((JpaPid) theJpaPid).getId()); @@ -1322,7 +1322,7 @@ public abstract class BaseHapiFhirResourceDao extends B } @Override - protected IBasePersistedResource readEntityLatestVersion(BaseResourcePersistentId thePersistentId, RequestDetails theRequestDetails, TransactionDetails theTransactionDetails) { + protected IBasePersistedResource readEntityLatestVersion(BaseResourcePersistentId thePersistentId, RequestDetails theRequestDetails, TransactionDetails theTransactionDetails) { JpaPid jpaPid = (JpaPid) thePersistentId; return myEntityManager.find(ResourceTable.class, jpaPid.getId()); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java index 8f0dac88e17..205c2446420 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java @@ -157,7 +157,7 @@ public class FulltextSearchSvcImpl implements IFulltextSearchSvc { // keep this in sync with supportsSomeOf(); private ISearchQueryExecutor doSearch(String theResourceType, SearchParameterMap theParams, - BaseResourcePersistentId theReferencingPid, Integer theMaxResultsToFetch) { + BaseResourcePersistentId theReferencingPid, Integer theMaxResultsToFetch) { int offset = theParams.getOffset() == null ? 0 : theParams.getOffset(); int count = getMaxFetchSize(theParams, theMaxResultsToFetch); @@ -186,7 +186,7 @@ public class FulltextSearchSvcImpl implements IFulltextSearchSvc { private SearchQueryOptionsStep getSearchQueryOptionsStep( - String theResourceType, SearchParameterMap theParams, BaseResourcePersistentId theReferencingPid) { + String theResourceType, SearchParameterMap theParams, BaseResourcePersistentId theReferencingPid) { dispatchEvent(IHSearchEventListener.HSearchEventType.SEARCH); var query= getSearchSession().search(ResourceTable.class) @@ -214,7 +214,7 @@ public class FulltextSearchSvcImpl implements IFulltextSearchSvc { private PredicateFinalStep buildWhereClause(SearchPredicateFactory f, String theResourceType, - SearchParameterMap theParams, BaseResourcePersistentId theReferencingPid) { + SearchParameterMap theParams, BaseResourcePersistentId theReferencingPid) { return f.bool(b -> { ExtendedHSearchClauseBuilder builder = new ExtendedHSearchClauseBuilder(myFhirContext, myModelConfig, b, f); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java index 50a7a4e8a81..74f8383eda9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaResourceDaoCodeSystem.java @@ -90,7 +90,7 @@ public class JpaResourceDaoCodeSystem extends BaseHapiF List valueSetIds; List ids = searchForIds(new SearchParameterMap(org.hl7.fhir.r4.model.CodeSystem.SP_CODE, new TokenParam(theSystem, theCode)), theRequest); valueSetIds = new ArrayList<>(); - for (BaseResourcePersistentId next : ids) { + for (BaseResourcePersistentId next : ids) { IIdType id = myIdHelperService.translatePidIdToForcedId(myFhirContext, "CodeSystem", next); valueSetIds.add(id); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IJpaIdHelperService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IJpaIdHelperService.java index 4aac4332c0d..f4cee096359 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IJpaIdHelperService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IJpaIdHelperService.java @@ -45,7 +45,7 @@ import java.util.Set; * All of the methods here aren't partition aware, so it's not great to use them * anyhow. The equivalents in {@link IIdHelperService} are probably a bit more * clunky because you have to convert between {@link Long} and - * {@link BaseResourcePersistentId} to use them, + * {@link BaseResourcePersistentId} to use them, * but they also have caching and partition awareness so the tradeoff for that * extra effort is that they are better. */ diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java index 1997075f479..bc1d2a78a66 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/IdHelperService.java @@ -93,7 +93,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; *

* This service is highly optimized in order to minimize the number of DB calls as much as possible, * since ID resolution is fundamental to many basic operations. This service returns either - * {@link IResourceLookup} or {@link BaseResourcePersistentId} depending on the method being called. + * {@link IResourceLookup} or {@link BaseResourcePersistentId} depending on the method being called. * The former involves an extra database join that the latter does not require, so selecting the * right method here is important. *

@@ -626,7 +626,7 @@ public class IdHelperService implements IIdHelperService { retVal.put(nextResourcePid, Optional.empty()); myMemoryCacheService.putAfterCommit(MemoryCacheService.CacheEnum.PID_TO_FORCED_ID, nextResourcePid, Optional.empty()); } - Map> convertRetVal = new HashMap<>(); + Map, Optional> convertRetVal = new HashMap<>(); retVal.forEach( (k, v) -> { convertRetVal.put(new JpaPid(k), v); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java index 4fa51b7ae11..b980c78657c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDaoJpaImpl.java @@ -66,17 +66,17 @@ public class MdmLinkDaoJpaImpl implements IMdmLinkDao { private IIdHelperService myIdHelperService; @Override - public int deleteWithAnyReferenceToPid(BaseResourcePersistentId thePid) { + public int deleteWithAnyReferenceToPid(BaseResourcePersistentId thePid) { return myMdmLinkDao.deleteWithAnyReferenceToPid(((JpaPid) thePid).getId()); } @Override - public int deleteWithAnyReferenceToPidAndMatchResultNot(BaseResourcePersistentId thePid, MdmMatchResultEnum theMatchResult) { + public int deleteWithAnyReferenceToPidAndMatchResultNot(BaseResourcePersistentId thePid, MdmMatchResultEnum theMatchResult) { return myMdmLinkDao.deleteWithAnyReferenceToPidAndMatchResultNot(((JpaPid) thePid).getId(), theMatchResult); } @Override - public List expandPidsFromGroupPidGivenMatchResult(BaseResourcePersistentId theGroupPid, MdmMatchResultEnum theMdmMatchResultEnum) { + public List expandPidsFromGroupPidGivenMatchResult(BaseResourcePersistentId theGroupPid, MdmMatchResultEnum theMdmMatchResultEnum) { return myMdmLinkDao.expandPidsFromGroupPidGivenMatchResult(((JpaPid) theGroupPid).getId(), theMdmMatchResultEnum) .stream() .map( theMdmPidTuple -> new MdmPidTuple() @@ -86,7 +86,7 @@ public class MdmLinkDaoJpaImpl implements IMdmLinkDao { } @Override - public List expandPidsBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum) { + public List expandPidsBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum) { return myMdmLinkDao.expandPidsBySourcePidAndMatchResult(((JpaPid) theSourcePid).getId(), theMdmMatchResultEnum) .stream() .map( theMdmPidTuple -> new MdmPidTuple() @@ -96,7 +96,7 @@ public class MdmLinkDaoJpaImpl implements IMdmLinkDao { } @Override - public List expandPidsByGoldenResourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum) { + public List expandPidsByGoldenResourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum) { return myMdmLinkDao.expandPidsByGoldenResourcePidAndMatchResult(((JpaPid) theSourcePid).getId(), theMdmMatchResultEnum) .stream() .map( theMdmPidTuple -> new MdmPidTuple() @@ -128,7 +128,7 @@ public class MdmLinkDaoJpaImpl implements IMdmLinkDao { } @Override - public Optional findById(BaseResourcePersistentId thePid) { + public Optional findById(BaseResourcePersistentId thePid) { return myMdmLinkDao.findById(((JpaPid) thePid).getId()); } @@ -227,7 +227,7 @@ public class MdmLinkDaoJpaImpl implements IMdmLinkDao { } @Override - public Optional findBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatch) { + public Optional findBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatch) { return myMdmLinkDao.findBySourcePidAndMatchResult(((JpaPid) theSourcePid).getId(), theMatch); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java index e9ec49e468f..a914944ddfa 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcImpl.java @@ -340,7 +340,7 @@ public class TermCodeSystemStorageSvcImpl implements ITermCodeSystemStorageSvc { @Override @Transactional - public void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, + public void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, String theCodeSystemVersionId, TermCodeSystemVersion theCodeSystemVersion, ResourceTable theCodeSystemResourceTable, RequestDetails theRequestDetails) { assert TransactionSynchronizationManager.isActualTransactionActive(); @@ -630,7 +630,7 @@ public class TermCodeSystemStorageSvcImpl implements ITermCodeSystemStorageSvc { } @Nonnull - private TermCodeSystem getOrCreateDistinctTermCodeSystem(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, String theSystemVersionId, ResourceTable theCodeSystemResourceTable) { + private TermCodeSystem getOrCreateDistinctTermCodeSystem(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, String theSystemVersionId, ResourceTable theCodeSystemResourceTable) { TermCodeSystem codeSystem = myCodeSystemDao.findByCodeSystemUri(theSystemUri); if (codeSystem == null) { codeSystem = myCodeSystemDao.findByResourcePid(((JpaPid) theCodeSystemResourcePid).getId()); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java index 363e57b2e5d..31857e7f8ba 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java @@ -1695,7 +1695,7 @@ public class TermReadSvcImpl implements ITermReadSvc { .setMessage("Unable to validate code " + theSystem + "#" + theCode + theAppend); } - private List findByValueSetResourcePidSystemAndCode(BaseResourcePersistentId theResourcePid, String theSystem, String theCode) { + private List findByValueSetResourcePidSystemAndCode(BaseResourcePersistentId theResourcePid, String theSystem, String theCode) { assert TransactionSynchronizationManager.isSynchronizationActive(); List retVal = new ArrayList<>(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java index d1123d5d67c..77706f0731b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/api/ITermCodeSystemStorageSvc.java @@ -50,7 +50,7 @@ public interface ITermCodeSystemStorageSvc { (boolean) theRequestDetails.getUserData().getOrDefault(MAKE_LOADING_VERSION_CURRENT, Boolean.TRUE); } - void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, + void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, String theSystemVersionId, TermCodeSystemVersion theCodeSystemVersion, ResourceTable theCodeSystemResourceTable, RequestDetails theRequestDetails); @@ -58,7 +58,7 @@ public interface ITermCodeSystemStorageSvc { * Default implementation supports previous signature of method which was added RequestDetails parameter */ @Transactional - default void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, + default void storeNewCodeSystemVersion(BaseResourcePersistentId theCodeSystemResourcePid, String theSystemUri, String theSystemName, String theSystemVersionId, TermCodeSystemVersion theCodeSystemVersion, ResourceTable theCodeSystemResourceTable) { storeNewCodeSystemVersion(theCodeSystemResourcePid, theSystemUri, theSystemName, theSystemVersionId, diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java index ad7a5355fb5..b39b5bbf6a7 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java @@ -100,7 +100,7 @@ public class JpaBulkExportProcessorTest { } @Override - public BaseResourcePersistentId next() { + public BaseResourcePersistentId next() { return myList.get(index++); } } @@ -159,12 +159,12 @@ public class JpaBulkExportProcessorTest { private MdmPidTuple createTuple(long theGroupId, long theGoldenId) { return new MdmPidTuple() { @Override - public BaseResourcePersistentId getGoldenPid() { + public BaseResourcePersistentId getGoldenPid() { return new JpaPid(theGoldenId); } @Override - public BaseResourcePersistentId getSourcePid() { + public BaseResourcePersistentId getSourcePid() { return new JpaPid(theGroupId); } }; @@ -292,8 +292,8 @@ public class JpaBulkExportProcessorTest { when(myIdHelperService.translatePidsToForcedIds(any(Set.class))) .thenAnswer(params -> { Set uniqPids = params.getArgument(0); - HashMap> answer = new HashMap<>(); - for (BaseResourcePersistentId l : uniqPids) { + HashMap, Optional> answer = new HashMap<>(); + for (BaseResourcePersistentId l : uniqPids) { answer.put(l, Optional.empty()); } return new PersistentIdToForcedIdMap(answer); @@ -386,8 +386,8 @@ public class JpaBulkExportProcessorTest { when(myIdHelperService.translatePidsToForcedIds(any(Set.class))) .thenAnswer(params -> { Set uniqPids = params.getArgument(0); - HashMap> answer = new HashMap<>(); - for (BaseResourcePersistentId l : uniqPids) { + HashMap, Optional> answer = new HashMap<>(); + for (BaseResourcePersistentId l : uniqPids) { answer.put(l, Optional.empty()); } return new PersistentIdToForcedIdMap(answer); @@ -445,7 +445,7 @@ public class JpaBulkExportProcessorTest { assertTrue(iterator.hasNext()); int count = 0; while (iterator.hasNext()) { - BaseResourcePersistentId ret = iterator.next(); + BaseResourcePersistentId ret = iterator.next(); assertTrue( ret.equals(pid) || ret.equals(pid2) ); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java index cd77771aa42..33e6212843f 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java @@ -95,8 +95,8 @@ public class MdmLinkDaoSvc { @Nonnull public IMdmLink getOrCreateMdmLinkByGoldenResourceAndSourceResource(IAnyResource theGoldenResource, IAnyResource theSourceResource) { - BaseResourcePersistentId goldenResourcePid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); - BaseResourcePersistentId sourceResourcePid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); + BaseResourcePersistentId goldenResourcePid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); + BaseResourcePersistentId sourceResourcePid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); Optional oExisting = getLinkByGoldenResourcePidAndSourceResourcePid(goldenResourcePid, sourceResourcePid); if (oExisting.isPresent()) { return oExisting.get(); @@ -126,7 +126,7 @@ public class MdmLinkDaoSvc { * @param theSourceResourcePid The ResourcepersistenceId of the Source resource * @return The {@link IMdmLink} entity that matches these criteria if exists */ - public Optional getLinkByGoldenResourcePidAndSourceResourcePid(BaseResourcePersistentId theGoldenResourcePid, BaseResourcePersistentId theSourceResourcePid) { + public Optional getLinkByGoldenResourcePidAndSourceResourcePid(BaseResourcePersistentId theGoldenResourcePid, BaseResourcePersistentId theSourceResourcePid) { if (theSourceResourcePid == null || theGoldenResourcePid == null) { return Optional.empty(); } @@ -144,7 +144,7 @@ public class MdmLinkDaoSvc { * @param theMatchResult the Match Result of the relationship * @return a list of {@link IMdmLink} entities matching these criteria. */ - public List getMdmLinksBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatchResult) { + public List getMdmLinksBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatchResult) { IMdmLink exampleLink = myMdmLinkFactory.newMdmLink(); exampleLink.setSourcePersistenceId(theSourcePid); exampleLink.setMatchResult(theMatchResult); @@ -161,7 +161,7 @@ public class MdmLinkDaoSvc { */ @Deprecated @Transactional - public Optional getMatchedLinkForSourcePid(BaseResourcePersistentId theSourcePid) { + public Optional getMatchedLinkForSourcePid(BaseResourcePersistentId theSourcePid) { return myMdmLinkDao.findBySourcePidAndMatchResult(theSourcePid, MdmMatchResultEnum.MATCH); } @@ -182,7 +182,7 @@ public class MdmLinkDaoSvc { @Nonnull private Optional getMdmLinkWithMatchResult(IBaseResource theSourceResource, MdmMatchResultEnum theMatchResult) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); + BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); if (pid == null) { return Optional.empty(); } @@ -207,8 +207,8 @@ public class MdmLinkDaoSvc { return getMdmLinksByGoldenResourcePidSourcePidAndMatchResult(new JpaPid(theGoldenResourcePid), new JpaPid(theSourcePid), theMatchResult); } - public Optional getMdmLinksByGoldenResourcePidSourcePidAndMatchResult(BaseResourcePersistentId theGoldenResourcePid, - BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatchResult) { + public Optional getMdmLinksByGoldenResourcePidSourcePidAndMatchResult(BaseResourcePersistentId theGoldenResourcePid, + BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatchResult) { IMdmLink exampleLink = myMdmLinkFactory.newMdmLink(); exampleLink.setGoldenResourcePersistenceId(theGoldenResourcePid); exampleLink.setSourcePersistenceId(theSourcePid); @@ -231,7 +231,7 @@ public class MdmLinkDaoSvc { @Transactional public Optional findMdmLinkBySource(IBaseResource theSourceResource) { - @Nullable BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); + @Nullable BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); if (pid == null) { return Optional.empty(); } @@ -261,7 +261,7 @@ public class MdmLinkDaoSvc { */ @Transactional public List findMdmLinksByGoldenResource(IBaseResource theGoldenResource) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); + BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); if (pid == null) { return Collections.emptyList(); } @@ -311,7 +311,7 @@ public class MdmLinkDaoSvc { */ @Transactional public List findMdmLinksBySourceResource(IBaseResource theSourceResource) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); + BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theSourceResource); if (pid == null) { return Collections.emptyList(); } @@ -329,7 +329,7 @@ public class MdmLinkDaoSvc { * @return all links for the source. */ public List findMdmMatchLinksByGoldenResource(IBaseResource theGoldenResource) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); + BaseResourcePersistentId pid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theGoldenResource); if (pid == null) { return Collections.emptyList(); } diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java index 991b8200802..e15faf14456 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java @@ -140,7 +140,7 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc { List fromLinks = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theFromResource); // fromLinks - links going to theFromResource List toLinks = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theToResource); // toLinks - links going to theToResource List toDelete = new ArrayList<>(); - BaseResourcePersistentId goldenResourcePid = myIdHelperService.resolveResourcePersistentIds((RequestPartitionId) theToResource.getUserData(Constants.RESOURCE_PARTITION_ID), theToResource.getIdElement().getResourceType(), theToResource.getIdElement().getIdPart()); + BaseResourcePersistentId goldenResourcePid = myIdHelperService.resolveResourcePersistentIds((RequestPartitionId) theToResource.getUserData(Constants.RESOURCE_PARTITION_ID), theToResource.getIdElement().getResourceType(), theToResource.getIdElement().getIdPart()); for (IMdmLink fromLink : fromLinks) { Optional optionalToLink = findFirstLinkWithMatchingSource(toLinks, fromLink); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java index 26b5944bfc4..fa5f52496d7 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java @@ -167,7 +167,7 @@ public class MdmEidUpdateService { if (theExistingMatchOrPossibleMatchLink.isPresent()) { IMdmLink mdmLink = theExistingMatchOrPossibleMatchLink.get(); - BaseResourcePersistentId existingGoldenResourcePid = mdmLink.getGoldenResourcePersistenceId(); + BaseResourcePersistentId existingGoldenResourcePid = mdmLink.getGoldenResourcePersistenceId(); myExistingGoldenResource = myMdmResourceDaoSvc.readGoldenResourceByPid(existingGoldenResourcePid, resourceType); myRemainsMatchedToSameGoldenResource = candidateIsSameAsMdmLinkGoldenResource(mdmLink, theMatchedGoldenResourceCandidate); } else { diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java index 2ce4d80a715..d994d7d92f2 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImpl.java @@ -71,8 +71,8 @@ public class MdmLinkCreateSvcImpl implements IMdmLinkCreateSvc { validateCreateLinkRequest(theGoldenResource, theSourceResource, sourceType); - BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); - BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theSourceResource); + BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); + BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theSourceResource); // check if the golden resource and the source resource are in the same partition, throw error if not myMdmPartitionHelper.validateResourcesInSamePartition(theGoldenResource, theSourceResource); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java index 22cfd37cc69..f7d23dfec8f 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java @@ -78,8 +78,8 @@ public class MdmLinkSvcImpl implements IMdmLinkSvc { } private boolean goldenResourceLinkedAsNoMatch(IAnyResource theGoldenResource, IAnyResource theSourceResource) { - BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); - BaseResourcePersistentId sourceId = myIdHelperService.getPidOrThrowException(theSourceResource); + BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); + BaseResourcePersistentId sourceId = myIdHelperService.getPidOrThrowException(theSourceResource); // TODO perf collapse into one query return myMdmLinkDaoSvc.getMdmLinksByGoldenResourcePidSourcePidAndMatchResult(goldenResourceId, sourceId, MdmMatchResultEnum.NO_MATCH).isPresent() || myMdmLinkDaoSvc.getMdmLinksByGoldenResourcePidSourcePidAndMatchResult(sourceId, goldenResourceId, MdmMatchResultEnum.NO_MATCH).isPresent(); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java index e785c668866..2d6d4195555 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java @@ -82,8 +82,8 @@ public class MdmLinkUpdaterSvcImpl implements IMdmLinkUpdaterSvc { validateUpdateLinkRequest(theGoldenResource, theSourceResource, theMatchResult, sourceType); - BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); - BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theSourceResource); + BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); + BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theSourceResource); // check if the golden resource and the source resource are in the same partition, throw error if not myMdmPartitionHelper.validateResourcesInSamePartition(theGoldenResource, theSourceResource); @@ -158,8 +158,8 @@ public class MdmLinkUpdaterSvcImpl implements IMdmLinkUpdaterSvc { public void notDuplicateGoldenResource(IAnyResource theGoldenResource, IAnyResource theTargetGoldenResource, MdmTransactionContext theMdmContext) { validateNotDuplicateGoldenResourceRequest(theGoldenResource, theTargetGoldenResource); - BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); - BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theTargetGoldenResource); + BaseResourcePersistentId goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource); + BaseResourcePersistentId targetId = myIdHelperService.getPidOrThrowException(theTargetGoldenResource); Optional oMdmLink = myMdmLinkDaoSvc.getLinkByGoldenResourcePidAndSourceResourcePid(goldenResourceId, targetId); if (!oMdmLink.isPresent()) { diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java index 63898208d83..2dfdd314472 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java @@ -93,7 +93,7 @@ public class MdmMatchLinkSvc { private void handleMdmWithMultipleCandidates(IAnyResource theResource, CandidateList theCandidateList, MdmTransactionContext theMdmTransactionContext) { MatchedGoldenResourceCandidate firstMatch = theCandidateList.getFirstMatch(); - BaseResourcePersistentId sampleGoldenResourcePid = firstMatch.getCandidateGoldenResourcePid(); + BaseResourcePersistentId sampleGoldenResourcePid = firstMatch.getCandidateGoldenResourcePid(); boolean allSameGoldenResource = theCandidateList.stream() .allMatch(candidate -> candidate.getCandidateGoldenResourcePid().equals(sampleGoldenResourcePid)); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java index b009d418b72..9b1e86b0d01 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java @@ -77,7 +77,7 @@ public class MdmResourceDaoSvc { resourceDao.removeTag(theGoldenResource.getIdElement(), TagTypeEnum.TAG, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD, requestDetails); } - public IAnyResource readGoldenResourceByPid(BaseResourcePersistentId theGoldenResourcePid, String theResourceType) { + public IAnyResource readGoldenResourceByPid(BaseResourcePersistentId theGoldenResourcePid, String theResourceType) { IFhirResourceDao resourceDao = myDaoRegistry.getResourceDao(theResourceType); return (IAnyResource) resourceDao.readByPid(theGoldenResourcePid); } diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java index 6547e5ade83..f5c560e3616 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java @@ -66,7 +66,7 @@ public class FindCandidateByEidSvc extends BaseCandidateFinder { if (isNoMatch(foundGoldenResource, theIncomingResource)) { continue; } - BaseResourcePersistentId pidOrNull = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), foundGoldenResource); + BaseResourcePersistentId pidOrNull = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), foundGoldenResource); MatchedGoldenResourceCandidate mpc = new MatchedGoldenResourceCandidate(pidOrNull, MdmMatchOutcome.EID_MATCH); ourLog.debug("Incoming Resource {} matched Golden Resource {} by EID {}", theIncomingResource.getIdElement().toUnqualifiedVersionless(), foundGoldenResource.getIdElement().toUnqualifiedVersionless(), eid); diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java index 79a7da5626c..386339c7abd 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByExampleSvc.java @@ -114,7 +114,7 @@ public class FindCandidateByExampleSvc extends BaseCandidateFinder { } private List getNoMatchGoldenResourcePids(IBaseResource theBaseResource) { - BaseResourcePersistentId targetPid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theBaseResource); + BaseResourcePersistentId targetPid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theBaseResource); return myMdmLinkDaoSvc.getMdmLinksBySourcePidAndMatchResult(targetPid, MdmMatchResultEnum.NO_MATCH) .stream() .map(IMdmLink::getGoldenResourcePersistenceId) diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java index 342cc339dec..1940e7bea09 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java @@ -47,11 +47,11 @@ public class FindCandidateByLinkSvc extends BaseCandidateFinder { protected List findMatchGoldenResourceCandidates(IAnyResource theTarget) { List retval = new ArrayList<>(); - BaseResourcePersistentId targetPid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theTarget); + BaseResourcePersistentId targetPid = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theTarget); if (targetPid != null) { Optional oLink = myMdmLinkDaoSvc.getMatchedLinkForSourcePid(targetPid); if (oLink.isPresent()) { - BaseResourcePersistentId goldenResourcePid = oLink.get().getGoldenResourcePersistenceId(); + BaseResourcePersistentId goldenResourcePid = oLink.get().getGoldenResourcePersistenceId(); ourLog.debug("Resource previously linked. Using existing link."); retval.add(new MatchedGoldenResourceCandidate(goldenResourcePid, oLink.get())); } diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java index f5a8c833d4d..b96ff75902a 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedGoldenResourceCandidate.java @@ -26,20 +26,20 @@ import ca.uhn.fhir.rest.api.server.storage.BaseResourcePersistentId; public class MatchedGoldenResourceCandidate { - private final BaseResourcePersistentId myCandidateGoldenResourcePid; + private final BaseResourcePersistentId myCandidateGoldenResourcePid; private final MdmMatchOutcome myMdmMatchOutcome; - public MatchedGoldenResourceCandidate(BaseResourcePersistentId theCandidate, MdmMatchOutcome theMdmMatchOutcome) { + public MatchedGoldenResourceCandidate(BaseResourcePersistentId theCandidate, MdmMatchOutcome theMdmMatchOutcome) { myCandidateGoldenResourcePid = theCandidate; myMdmMatchOutcome = theMdmMatchOutcome; } - public MatchedGoldenResourceCandidate(BaseResourcePersistentId theGoldenResourcePid, IMdmLink theMdmLink) { + public MatchedGoldenResourceCandidate(BaseResourcePersistentId theGoldenResourcePid, IMdmLink theMdmLink) { myCandidateGoldenResourcePid = theGoldenResourcePid; myMdmMatchOutcome = new MdmMatchOutcome(theMdmLink.getVector(), theMdmLink.getScore()).setMatchResultEnum(theMdmLink.getMatchResult()); } - public BaseResourcePersistentId getCandidateGoldenResourcePid() { + public BaseResourcePersistentId getCandidateGoldenResourcePid() { return myCandidateGoldenResourcePid; } diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java index 725c3e1c652..c9bfa2ce0be 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java @@ -75,7 +75,7 @@ public class MdmCandidateSearchSvc { */ @Transactional public Collection findCandidates(String theResourceType, IAnyResource theResource, RequestPartitionId theRequestPartitionId) { - Map matchedPidsToResources = new HashMap<>(); + Map, IAnyResource> matchedPidsToResources = new HashMap<>(); List filterSearchParams = myMdmSettings.getMdmRules().getCandidateFilterSearchParams(); List filterCriteria = buildFilterQuery(filterSearchParams, theResourceType); List candidateSearchParams = myMdmSettings.getMdmRules().getCandidateSearchParams(); @@ -120,7 +120,7 @@ public class MdmCandidateSearchSvc { * 4. Store all results in `theMatchedPidsToResources` */ @SuppressWarnings("rawtypes") - private void searchForIdsAndAddToMap(String theResourceType, IAnyResource theResource, Map theMatchedPidsToResources, List theFilterCriteria, MdmResourceSearchParamJson resourceSearchParam, RequestPartitionId theRequestPartitionId) { + private void searchForIdsAndAddToMap(String theResourceType, IAnyResource theResource, Map, IAnyResource> theMatchedPidsToResources, List theFilterCriteria, MdmResourceSearchParamJson resourceSearchParam, RequestPartitionId theRequestPartitionId) { //1. Optional oResourceCriteria = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString(theResourceType, theResource, theFilterCriteria, resourceSearchParam); if (!oResourceCriteria.isPresent()) { diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java index c76ba11692d..90d0c2a4610 100644 --- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java +++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java @@ -77,7 +77,7 @@ public class MdmGoldenResourceFindingSvc { } public IAnyResource getGoldenResourceFromMatchedGoldenResourceCandidate(MatchedGoldenResourceCandidate theMatchedGoldenResourceCandidate, String theResourceType) { - BaseResourcePersistentId goldenResourcePid = theMatchedGoldenResourceCandidate.getCandidateGoldenResourcePid(); + BaseResourcePersistentId goldenResourcePid = theMatchedGoldenResourceCandidate.getCandidateGoldenResourcePid(); return myMdmResourceDaoSvc.readGoldenResourceByPid(goldenResourcePid, theResourceType); } } diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseGoldenResourceMatcher.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseGoldenResourceMatcher.java index 03781571fed..278650f37c7 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseGoldenResourceMatcher.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseGoldenResourceMatcher.java @@ -35,8 +35,8 @@ public abstract class BaseGoldenResourceMatcher extends TypeSafeMatcher getMatchedResourcePidFromResource(IAnyResource theResource) { + BaseResourcePersistentId retval; boolean isGoldenRecord = MdmResourceUtil.isMdmManaged(theResource); if (isGoldenRecord) { @@ -71,7 +71,7 @@ public abstract class BaseGoldenResourceMatcher extends TypeSafeMatcher getMdmLinksForTarget(IAnyResource theTargetResource, MdmMatchResultEnum theMatchResult) { - BaseResourcePersistentId pidOrNull = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theTargetResource); + BaseResourcePersistentId pidOrNull = myIdHelperService.getPidOrNull(RequestPartitionId.allPartitions(), theTargetResource); List matchLinkForTarget = myMdmLinkDaoSvc.getMdmLinksBySourcePidAndMatchResult(pidOrNull, theMatchResult); if (!matchLinkForTarget.isEmpty()) { return matchLinkForTarget; diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java index fb628045ff9..398b5d7547b 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; public class IsLinkedTo extends BaseGoldenResourceMatcher { private List baseResourceGoldenResourcePids; - private BaseResourcePersistentId incomingResourceGoldenResourcePid; + private BaseResourcePersistentId incomingResourceGoldenResourcePid; protected IsLinkedTo(IIdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) { super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource); diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java index 098c0c298d8..98b92d0c004 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java @@ -19,7 +19,7 @@ public class IsPossibleDuplicateOf extends BaseGoldenResourceMatcher { * Matcher with tells us if there is an MdmLink with between these two resources that are considered POSSIBLE DUPLICATE. * For use only on GoldenResource. */ - private BaseResourcePersistentId incomingGoldenResourcePid; + private BaseResourcePersistentId incomingGoldenResourcePid; protected IsPossibleDuplicateOf(IIdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) { super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource); diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java index dba3cef56a2..bfb2ff55977 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; public class IsPossibleLinkedTo extends BaseGoldenResourceMatcher { private List baseResourceGoldenResourcePids; - private BaseResourcePersistentId incomingResourceGoldenResourcePid; + private BaseResourcePersistentId incomingResourceGoldenResourcePid; protected IsPossibleLinkedTo(IIdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theTargetResources) { super(theIdHelperService, theMdmLinkDaoSvc, theTargetResources); diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameGoldenResourceAs.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameGoldenResourceAs.java index ee4c3825577..dad180899ce 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameGoldenResourceAs.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameGoldenResourceAs.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; public class IsSameGoldenResourceAs extends BaseGoldenResourceMatcher { private List goldenResourcePidsToMatch; - private BaseResourcePersistentId incomingGoldenResourcePid; + private BaseResourcePersistentId incomingGoldenResourcePid; public IsSameGoldenResourceAs(IIdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) { super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource); diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java index 795f37cd3e8..ff00d5d1efe 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java @@ -768,7 +768,7 @@ public class ResourceTable extends BaseHasResource implements Serializable, IBas } @Override - public BaseResourcePersistentId getPersistentId() { + public BaseResourcePersistentId getPersistentId() { return new JpaPid(getId()); } diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java index 6ba46778a86..473029f7b6c 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourcePersistentIdMap.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; public class ResourcePersistentIdMap { - private final Map myMap = new HashMap<>(); + private final Map> myMap = new HashMap<>(); public static ResourcePersistentIdMap fromResourcePersistentIds(List theResourcePersistentIds) { ResourcePersistentIdMap retval = new ResourcePersistentIdMap(); @@ -36,7 +36,7 @@ public class ResourcePersistentIdMap { return retval; } - private void add(BaseResourcePersistentId theResourcePersistentId) { + private void add(BaseResourcePersistentId theResourcePersistentId) { IIdType id = theResourcePersistentId.getAssociatedResourceId(); myMap.put(id.toUnqualifiedVersionless(), theResourcePersistentId); } @@ -45,7 +45,7 @@ public class ResourcePersistentIdMap { return myMap.containsKey(theId.toUnqualifiedVersionless()); } - public BaseResourcePersistentId getResourcePersistentId(IIdType theId) { + public BaseResourcePersistentId getResourcePersistentId(IIdType theId) { return myMap.get(theId.toUnqualifiedVersionless()); } @@ -57,7 +57,7 @@ public class ResourcePersistentIdMap { return myMap.size(); } - public void put(IIdType theId, BaseResourcePersistentId thePid) { + public void put(IIdType theId, BaseResourcePersistentId thePid) { myMap.put(theId, thePid); } 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 c1f676d2634..256f8484d23 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 @@ -390,7 +390,7 @@ public class SearchParamExtractorService { } IIdType referenceElement = thePathAndRef.getRef().getReferenceElement(); - BaseResourcePersistentId resolvedTargetId = theTransactionDetails.getResolvedResourceId(referenceElement); + BaseResourcePersistentId resolvedTargetId = theTransactionDetails.getResolvedResourceId(referenceElement); ResourceLink resourceLink; Long targetVersionId = nextId.getVersionIdPartAsLong(); 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 6c4f73b850c..45920db55dc 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 @@ -340,7 +340,7 @@ public class SubscriptionTriggeringSvcImpl implements ISubscriptionTriggeringSvc ourLog.info("Triggering job[{}] delivering {} resources", theJobDetails.getJobId(), resourceIds.size()); int highestIndexSubmitted = theJobDetails.getCurrentSearchLastUploadedIndex(); - for (BaseResourcePersistentId next : resourceIds) { + for (BaseResourcePersistentId next : resourceIds) { IBaseResource nextResource = resourceDao.readByPid(next); Future future = submitResource(theJobDetails.getSubscriptionId(), nextResource); futures.add(Pair.of(nextResource.getIdElement().getIdPart(), future)); diff --git a/hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/search/BaseSearchSvc.java b/hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/search/BaseSearchSvc.java index 58c2c4f47c9..ba59628425e 100644 --- a/hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/search/BaseSearchSvc.java +++ b/hapi-fhir-jpaserver-test-dstu2/src/test/java/ca/uhn/fhir/jpa/search/BaseSearchSvc.java @@ -67,7 +67,7 @@ public class BaseSearchSvc { return theInvocation -> { List pids = (List) theInvocation.getArguments()[0]; List resources = (List) theInvocation.getArguments()[2]; - for (BaseResourcePersistentId nextPid : pids) { + for (BaseResourcePersistentId nextPid : pids) { Patient pt = new Patient(); pt.setId(nextPid.toString()); resources.add(pt); diff --git a/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java index e06ea81369b..7bcc482ee4d 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java @@ -101,7 +101,7 @@ public class ResourceVersionSvcTest { )); } - BaseResourcePersistentId first = resourcePersistentIds.remove(0); + BaseResourcePersistentId first = resourcePersistentIds.remove(0); if (resourcePersistentIds.isEmpty()) { when(myIdHelperService.resolveResourcePersistentIdsWithCache(any(), any())).thenReturn(Collections.singletonList(first)); } else { @@ -114,7 +114,7 @@ public class ResourceVersionSvcTest { IIdType type = new IdDt("Patient/RED"); JpaPid jpaPid = new JpaPid(1L); jpaPid.setAssociatedResourceId(type); - HashMap map = new HashMap<>(); + HashMap> map = new HashMap<>(); map.put(type, jpaPid); ResourceIdPackage pack = new ResourceIdPackage(type, jpaPid, 2L); @@ -197,11 +197,11 @@ public class ResourceVersionSvcTest { // helper class to package up data for helper methods private class ResourceIdPackage { public IIdType MyResourceId; - public BaseResourcePersistentId MyPid; + public BaseResourcePersistentId MyPid; public Long MyVersion; public ResourceIdPackage(IIdType id, - BaseResourcePersistentId pid, + BaseResourcePersistentId pid, Long version) { MyResourceId = id; MyPid = pid; diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java index 45da7e72146..38b77e9b550 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkExpandSvc.java @@ -32,11 +32,11 @@ public interface IMdmLinkExpandSvc { Set expandMdmBySourceResourceId(IIdType theId); - Set expandMdmBySourceResourcePid(BaseResourcePersistentId theSourceResourcePid); + Set expandMdmBySourceResourcePid(BaseResourcePersistentId theSourceResourcePid); - Set expandMdmByGoldenResourceId(BaseResourcePersistentId theGoldenResourcePid); + Set expandMdmByGoldenResourceId(BaseResourcePersistentId theGoldenResourcePid); - Set expandMdmByGoldenResourcePid(BaseResourcePersistentId theGoldenResourcePid); + Set expandMdmByGoldenResourcePid(BaseResourcePersistentId theGoldenResourcePid); Set expandMdmByGoldenResourceId(IdDt theId); } diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java index f25ea140f05..98c34900fe9 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/dao/IMdmLinkDao.java @@ -37,15 +37,15 @@ import java.util.List; import java.util.Optional; public interface IMdmLinkDao { - int deleteWithAnyReferenceToPid(BaseResourcePersistentId thePid); + int deleteWithAnyReferenceToPid(BaseResourcePersistentId thePid); - int deleteWithAnyReferenceToPidAndMatchResultNot(BaseResourcePersistentId thePid, MdmMatchResultEnum theMatchResult); + int deleteWithAnyReferenceToPidAndMatchResultNot(BaseResourcePersistentId thePid, MdmMatchResultEnum theMatchResult); - List expandPidsFromGroupPidGivenMatchResult(BaseResourcePersistentId theGroupPid, MdmMatchResultEnum theMdmMatchResultEnum); + List expandPidsFromGroupPidGivenMatchResult(BaseResourcePersistentId theGroupPid, MdmMatchResultEnum theMdmMatchResultEnum); - List expandPidsBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum); + List expandPidsBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum); - List expandPidsByGoldenResourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum); + List expandPidsByGoldenResourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMdmMatchResultEnum); List findPidByResourceNameAndThreshold(String theResourceName, Date theHighThreshold, Pageable thePageable); @@ -53,7 +53,7 @@ public interface IMdmLinkDao { List findAllById(List thePids); - Optional findById(BaseResourcePersistentId thePid); + Optional findById(BaseResourcePersistentId thePid); void deleteAll(List theLinks); @@ -75,7 +75,7 @@ public interface IMdmLinkDao { Page search(IIdType theGoldenResourceId, IIdType theSourceId, MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theLinkSource, MdmPageRequest thePageRequest, List thePartitionId); - Optional findBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatch); + Optional findBySourcePidAndMatchResult(BaseResourcePersistentId theSourcePid, MdmMatchResultEnum theMatch); void deleteLinksWithAnyReferenceToPids(List theResourcePersistentIds); } diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java index 403fd1b2324..3d6ce84e24f 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkDeleteSvc.java @@ -47,7 +47,7 @@ public class MdmLinkDeleteSvc { * @return the number of records deleted */ public int deleteWithAnyReferenceTo(IBaseResource theResource) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theResource.getIdElement()); + BaseResourcePersistentId pid = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theResource.getIdElement()); int removed = myMdmLinkDao.deleteWithAnyReferenceToPid(pid); if (removed > 0) { ourLog.info("Removed {} MDM links with references to {}", removed, theResource.getIdElement().toVersionless()); @@ -56,7 +56,7 @@ public class MdmLinkDeleteSvc { } public int deleteNonRedirectWithAnyReferenceTo(IBaseResource theResource) { - BaseResourcePersistentId pid = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theResource.getIdElement()); + BaseResourcePersistentId pid = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theResource.getIdElement()); int removed = myMdmLinkDao.deleteWithAnyReferenceToPidAndMatchResultNot(pid, MdmMatchResultEnum.REDIRECT); if (removed > 0) { ourLog.info("Removed {} non-redirect MDM links with references to {}", removed, theResource.getIdElement().toVersionless()); diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java index a026d2b68ff..436137fa2fb 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/svc/MdmLinkExpandSvc.java @@ -88,7 +88,7 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc { * @return A set of strings representing the FHIR ids of the expanded resources. */ @Override - public Set expandMdmBySourceResourcePid(BaseResourcePersistentId theSourceResourcePid) { + public Set expandMdmBySourceResourcePid(BaseResourcePersistentId theSourceResourcePid) { ourLog.debug("About to expand source resource with PID {}", theSourceResourcePid); List goldenPidSourcePidTuples = myMdmLinkDao.expandPidsBySourcePidAndMatchResult(theSourceResourcePid, MdmMatchResultEnum.MATCH); return flattenPidTuplesToSet(theSourceResourcePid, goldenPidSourcePidTuples); @@ -102,7 +102,7 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc { * @return A set of strings representing the FHIR ids of the expanded resources. */ @Override - public Set expandMdmByGoldenResourceId(BaseResourcePersistentId theGoldenResourcePid) { + public Set expandMdmByGoldenResourceId(BaseResourcePersistentId theGoldenResourcePid) { ourLog.debug("About to expand golden resource with PID {}", theGoldenResourcePid); List goldenPidSourcePidTuples = myMdmLinkDao.expandPidsByGoldenResourcePidAndMatchResult(theGoldenResourcePid, MdmMatchResultEnum.MATCH); return flattenPidTuplesToSet(theGoldenResourcePid, goldenPidSourcePidTuples); @@ -117,7 +117,7 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc { * @return A set of strings representing the FHIR ids of the expanded resources. */ @Override - public Set expandMdmByGoldenResourcePid(BaseResourcePersistentId theGoldenResourcePid) { + public Set expandMdmByGoldenResourcePid(BaseResourcePersistentId theGoldenResourcePid) { ourLog.debug("About to expand golden resource with PID {}", theGoldenResourcePid); List goldenPidSourcePidTuples = myMdmLinkDao.expandPidsByGoldenResourcePidAndMatchResult(theGoldenResourcePid, MdmMatchResultEnum.MATCH); return flattenPidTuplesToSet(theGoldenResourcePid, goldenPidSourcePidTuples); @@ -126,12 +126,12 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc { @Override public Set expandMdmByGoldenResourceId(IdDt theId) { ourLog.debug("About to expand golden resource with golden resource id {}", theId); - BaseResourcePersistentId pidOrThrowException = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theId); + BaseResourcePersistentId pidOrThrowException = myIdHelperService.getPidOrThrowException(RequestPartitionId.allPartitions(), theId); return expandMdmByGoldenResourcePid(pidOrThrowException); } @Nonnull - public Set flattenPidTuplesToSet(BaseResourcePersistentId initialPid, List goldenPidSourcePidTuples) { + public Set flattenPidTuplesToSet(BaseResourcePersistentId initialPid, List goldenPidSourcePidTuples) { Set flattenedPids = new HashSet<>(); goldenPidSourcePidTuples.forEach(tuple -> { flattenedPids.add(tuple.getSourcePid()); diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java index e19578d57d8..56511fc9869 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/BaseResourcePersistentId.java @@ -29,7 +29,7 @@ import java.util.Objects; * a Long, a String, or something else. */ public abstract class BaseResourcePersistentId { - public static final BaseResourcePersistentId NOT_FOUND = new NotFoundPid(); + public static final NotFoundPid NOT_FOUND = new NotFoundPid(); private Long myVersion; private final String myResourceType; // TODO KHS can this be final? diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java index 3269a245320..92310d476be 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/TransactionDetails.java @@ -54,12 +54,12 @@ import java.util.function.Supplier; */ public class TransactionDetails { - public static final BaseResourcePersistentId NOT_FOUND = BaseResourcePersistentId.NOT_FOUND; + public static final NotFoundPid NOT_FOUND = BaseResourcePersistentId.NOT_FOUND; private final Date myTransactionDate; private List myRollbackUndoActions = Collections.emptyList(); - private Map myResolvedResourceIds = Collections.emptyMap(); - private Map myResolvedMatchUrls = Collections.emptyMap(); + private Map> myResolvedResourceIds = Collections.emptyMap(); + private Map> myResolvedMatchUrls = Collections.emptyMap(); private Map myUserData; private ListMultimap myDeferredInterceptorBroadcasts; private EnumSet myDeferredInterceptorBroadcastPointcuts; @@ -118,7 +118,7 @@ public class TransactionDetails { * the TransactionDetails if they are known to exist and be valid targets for other resources to link to. */ @Nullable - public BaseResourcePersistentId getResolvedResourceId(IIdType theId) { + public BaseResourcePersistentId getResolvedResourceId(IIdType theId) { String idValue = theId.toUnqualifiedVersionless().getValue(); return myResolvedResourceIds.get(idValue); } @@ -141,7 +141,7 @@ public class TransactionDetails { * "Observation/123") and a storage ID for that resource. Resources should only be placed within * the TransactionDetails if they are known to exist and be valid targets for other resources to link to. */ - public void addResolvedResourceId(IIdType theResourceId, @Nullable BaseResourcePersistentId thePersistentId) { + public void addResolvedResourceId(IIdType theResourceId, @Nullable BaseResourcePersistentId thePersistentId) { assert theResourceId != null; if (myResolvedResourceIds.isEmpty()) { @@ -150,7 +150,7 @@ public class TransactionDetails { myResolvedResourceIds.put(theResourceId.toVersionless().getValue(), thePersistentId); } - public Map getResolvedMatchUrls() { + public Map> getResolvedMatchUrls() { return myResolvedMatchUrls; } @@ -159,7 +159,7 @@ public class TransactionDetails { * "Observation/123") and a storage ID for that resource. Resources should only be placed within * the TransactionDetails if they are known to exist and be valid targets for other resources to link to. */ - public void addResolvedMatchUrl(String theConditionalUrl, @Nonnull BaseResourcePersistentId thePersistentId) { + public void addResolvedMatchUrl(String theConditionalUrl, @Nonnull BaseResourcePersistentId thePersistentId) { Validate.notBlank(theConditionalUrl); Validate.notNull(thePersistentId); @@ -172,7 +172,7 @@ public class TransactionDetails { myResolvedMatchUrls.put(theConditionalUrl, thePersistentId); } - private boolean matchUrlWithDiffIdExists(String theConditionalUrl, @Nonnull BaseResourcePersistentId thePersistentId) { + private boolean matchUrlWithDiffIdExists(String theConditionalUrl, @Nonnull BaseResourcePersistentId thePersistentId) { if (myResolvedMatchUrls.containsKey(theConditionalUrl) && myResolvedMatchUrls.get(theConditionalUrl) != NOT_FOUND) { return myResolvedMatchUrls.get(theConditionalUrl).getId() != thePersistentId.getId(); } diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java index 9a8b2eec66f..fc268317a03 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java @@ -80,14 +80,14 @@ public class FetchResourceIdsStep implements IFirstJobStepWorker pidIterator = myBulkExportProcessor.getResourcePidIterator(providerParams); + Iterator> pidIterator = myBulkExportProcessor.getResourcePidIterator(providerParams); List idsToSubmit = new ArrayList<>(); if (!pidIterator.hasNext()) { ourLog.debug("Bulk Export generated an iterator with no results!"); } while (pidIterator.hasNext()) { - BaseResourcePersistentId pid = pidIterator.next(); + BaseResourcePersistentId pid = pidIterator.next(); Id id; if (pid.getResourceType() != null) { diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java index 04cd1a904d1..64d09cb6098 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/imprt/ConsumeFilesStep.java @@ -124,7 +124,7 @@ public class ConsumeFilesStep implements ILastJobStepWorker idsList = new ArrayList<>(ids.keySet()); List resolvedIds = myIdHelperService.resolveResourcePersistentIdsWithCache(RequestPartitionId.allPartitions(), idsList, true); - for (BaseResourcePersistentId next : resolvedIds) { + for (BaseResourcePersistentId next : resolvedIds) { IIdType resId = next.getAssociatedResourceId(); theTransactionDetails.addResolvedResourceId(resId, next); ids.remove(resId); diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/Id.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/Id.java index 59ab04fc614..f87f88b7aac 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/Id.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/models/Id.java @@ -75,7 +75,7 @@ public class Id implements IModelJson { return new HashCodeBuilder(17, 37).append(myResourceType).append(myId).toHashCode(); } - public static Id getIdFromPID(BaseResourcePersistentId thePID, String theResourceType) { + public static Id getIdFromPID(BaseResourcePersistentId thePID, String theResourceType) { Id id = new Id(); id.setId(((JpaPid)thePID).getId().toString()); id.setResourceType(theResourceType); diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java index 8525c9f4cd0..6c3a2cf22bd 100644 --- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java +++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStep.java @@ -61,7 +61,7 @@ public class ReindexStep implements IJobStepWorker myIdHelperService; + private IIdHelperService> myIdHelperService; @Nonnull @Override @@ -103,7 +103,7 @@ public class ReindexStep implements IJobStepWorker persistentIds = myData.getResourcePersistentIds(myIdHelperService); + List persistentIds = myData.getResourcePersistentIds(myIdHelperService); ourLog.info("Starting reindex work chunk with {} resources - Instance[{}] Chunk[{}]", persistentIds.size(), myInstanceId, myChunkId); StopWatch sw = new StopWatch(); diff --git a/hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStepTest.java b/hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStepTest.java index 3b108c2a626..342f07c3596 100644 --- a/hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStepTest.java +++ b/hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStepTest.java @@ -202,7 +202,7 @@ public class FetchResourceIdsStepTest { // verify all submitted ids are there boolean found = false; - for (BaseResourcePersistentId pid : patientIds) { + for (BaseResourcePersistentId pid : patientIds) { Id id = Id.getIdFromPID(pid, "Patient"); for (ResourceIdList idList : listIds) { found = idList.getIds().contains(id); diff --git a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java index 57278db1828..3024c107e75 100644 --- a/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java +++ b/hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmInflateAndSubmitResourcesStep.java @@ -84,7 +84,7 @@ public class MdmInflateAndSubmitResourcesStep implements IJobStepWorker fetchAllResources(List theIds) { List resources = new ArrayList<>(); - for (BaseResourcePersistentId id : theIds) { + for (BaseResourcePersistentId id : theIds) { assert id.getResourceType() != null; IFhirResourceDao dao = myDaoRegistry.getResourceDao(id.getResourceType()); // This should be a query, but we have PIDs, and we don't have a _pid search param. TODO GGG, figure out how to make this search by pid. diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java index ecc5d0c2eba..7ed6d2f083c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDao.java @@ -191,7 +191,7 @@ public interface IFhirResourceDao extends IDao { * @throws ResourceNotFoundException If the ID is not known to the server * @throws ResourceGoneException If the resource has been deleted */ - T readByPid(BaseResourcePersistentId thePid); + T readByPid(BaseResourcePersistentId thePid); /** * Read a resource by its internal PID @@ -199,7 +199,7 @@ public interface IFhirResourceDao extends IDao { * @throws ResourceGoneException If the resource has been deleted and theDeletedOk is true * */ - default T readByPid(BaseResourcePersistentId thePid, boolean theDeletedOk) { + default T readByPid(BaseResourcePersistentId thePid, boolean theDeletedOk) { throw new UnsupportedOperationException(Msg.code(571)); } @@ -343,5 +343,5 @@ public interface IFhirResourceDao extends IDao { * * @param theResourcePersistentId The ID */ - void reindex(BaseResourcePersistentId theResourcePersistentId, RequestDetails theRequest, TransactionDetails theTransactionDetails); + void reindex(BaseResourcePersistentId theResourcePersistentId, RequestDetails theRequest, TransactionDetails theTransactionDetails); } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java index 546af07be80..eb085821a72 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/DaoMethodOutcome.java @@ -31,7 +31,7 @@ public class DaoMethodOutcome extends MethodOutcome { private IBasePersistedResource myEntity; private IBaseResource myPreviousResource; private boolean myNop; - private BaseResourcePersistentId myResourcePersistentId; + private BaseResourcePersistentId myResourcePersistentId; private RestOperationTypeEnum myOperationType; private String myMatchUrl; @@ -104,11 +104,11 @@ public class DaoMethodOutcome extends MethodOutcome { return this; } - public BaseResourcePersistentId getPersistentId() { + public BaseResourcePersistentId getPersistentId() { return myResourcePersistentId; } - public DaoMethodOutcome setPersistentId(BaseResourcePersistentId theResourcePersistentId) { + public DaoMethodOutcome setPersistentId(BaseResourcePersistentId theResourcePersistentId) { myResourcePersistentId = theResourcePersistentId; return this; } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java index 98a1d718f05..b394c50ef81 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/model/LazyDaoMethodOutcome.java @@ -36,7 +36,7 @@ public class LazyDaoMethodOutcome extends DaoMethodOutcome { /** * Constructor */ - public LazyDaoMethodOutcome(BaseResourcePersistentId theResourcePersistentId) { + public LazyDaoMethodOutcome(BaseResourcePersistentId theResourcePersistentId) { setPersistentId(theResourcePersistentId); } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java index 21c8492ffaa..ad28dee2c1b 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/BaseResourcePidList.java @@ -72,7 +72,7 @@ abstract public class BaseResourcePidList implements IResourcePidList { return Collections.unmodifiableList(myIds); } - public BaseResourcePersistentId getId(int theIndex) { + public BaseResourcePersistentId getId(int theIndex) { return myIds.get(theIndex); } } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java index 17473006c81..dab5bdc9e82 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/pid/TypedResourcePid.java @@ -27,9 +27,9 @@ import java.util.Objects; public class TypedResourcePid { public final String resourceType; - public final BaseResourcePersistentId id; + public final BaseResourcePersistentId id; - public TypedResourcePid(String theResourceType, BaseResourcePersistentId theId) { + public TypedResourcePid(String theResourceType, BaseResourcePersistentId theId) { this.resourceType = theResourceType; this.id = theId; } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java index e017de16fa2..11e201f0477 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/api/svc/IIdHelperService.java @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.Set; /** - * This interface is used to translate between {@link BaseResourcePersistentId} + * This interface is used to translate between {@link BaseResourcePersistentId} * and actual resource IDs. */ public interface IIdHelperService { diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java index d93e8d36088..769abb6e367 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java @@ -318,7 +318,7 @@ public abstract class BaseStorageDao { return outcome; } - protected DaoMethodOutcome toMethodOutcomeLazy(RequestDetails theRequest, BaseResourcePersistentId theResourcePersistentId, @Nonnull final Supplier theEntity, Supplier theIdSupplier) { + protected DaoMethodOutcome toMethodOutcomeLazy(RequestDetails theRequest, BaseResourcePersistentId theResourcePersistentId, @Nonnull final Supplier theEntity, Supplier theIdSupplier) { LazyDaoMethodOutcome outcome = new LazyDaoMethodOutcome(theResourcePersistentId); outcome.setEntitySupplier(theEntity); diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java index accc2e17b97..26cf0d9c259 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java @@ -81,7 +81,7 @@ public abstract class BaseStorageResourceDao extends Ba String msg = getContext().getLocalizer().getMessageSanitized(BaseStorageDao.class, "transactionOperationWithMultipleMatchFailure", "PATCH", theConditionalUrl, match.size()); throw new PreconditionFailedException(Msg.code(972) + msg); } else if (match.size() == 1) { - BaseResourcePersistentId pid = match.iterator().next(); + BaseResourcePersistentId pid = match.iterator().next(); entityToUpdate = readEntityLatestVersion(pid, theRequestDetails, theTransactionDetails); resourceId = entityToUpdate.getIdDt(); } else { @@ -140,7 +140,7 @@ public abstract class BaseStorageResourceDao extends Ba @Nonnull protected abstract String getResourceName(); - protected abstract IBasePersistedResource readEntityLatestVersion(BaseResourcePersistentId thePersistentId, RequestDetails theRequestDetails, TransactionDetails theTransactionDetails); + protected abstract IBasePersistedResource readEntityLatestVersion(BaseResourcePersistentId thePersistentId, RequestDetails theRequestDetails, TransactionDetails theTransactionDetails); protected abstract IBasePersistedResource readEntityLatestVersion(IIdType theId, RequestDetails theRequestDetails, TransactionDetails theTransactionDetails); diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java index 79125452da5..da82a3cb071 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilderFactory.java @@ -27,7 +27,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -public class SearchBuilderFactory> { +public class SearchBuilderFactory { @Autowired private ApplicationContext myApplicationContext; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java index 79d0616b08b..59bc24de6d2 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeOperation.java @@ -48,12 +48,12 @@ public class ExpungeOperation implements Callable { private DaoConfig myDaoConfig; private final String myResourceName; - private final BaseResourcePersistentId myResourceId; + private final BaseResourcePersistentId myResourceId; private final ExpungeOptions myExpungeOptions; private final RequestDetails myRequestDetails; private final AtomicInteger myRemainingCount; - public ExpungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { + public ExpungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { myResourceName = theResourceName; myResourceId = theResourceId; myExpungeOptions = theExpungeOptions; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java index 1f101d2b045..abd7233c575 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeService.java @@ -43,11 +43,11 @@ public class ExpungeService { @Autowired private ApplicationContext myApplicationContext; - protected ExpungeOperation getExpungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { + protected ExpungeOperation getExpungeOperation(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequestDetails) { return myApplicationContext.getBean(ExpungeOperation.class, theResourceName, theResourceId, theExpungeOptions, theRequestDetails); } - public ExpungeOutcome expunge(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequest) { + public ExpungeOutcome expunge(String theResourceName, BaseResourcePersistentId theResourceId, ExpungeOptions theExpungeOptions, RequestDetails theRequest) { ourLog.info("Expunge: ResourceName[{}] Id[{}] Version[{}] Options[{}]", theResourceName, theResourceId != null ? theResourceId.getId() : null, theResourceId != null ? theResourceId.getVersion() : null, theExpungeOptions); ExpungeOperation expungeOperation = getExpungeOperation(theResourceName, theResourceId, theExpungeOptions, theRequest); @@ -65,7 +65,7 @@ public class ExpungeService { return expungeOperation.call(); } - public void deleteAllSearchParams(BaseResourcePersistentId theResourceId) { + public void deleteAllSearchParams(BaseResourcePersistentId theResourceId) { myExpungeDaoService.deleteAllSearchParams(theResourceId); } } diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java index cdafa44536b..c59510517b4 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java @@ -183,7 +183,7 @@ public class DaoResourceLinkResolver impleme valueOf = placeholderResourceDao.create(newResource, theRequest).getEntity(); } - BaseResourcePersistentId persistentId = valueOf.getPersistentId(); + BaseResourcePersistentId persistentId = valueOf.getPersistentId(); persistentId = myIdHelperService.newPid(persistentId.getId()); persistentId.setAssociatedResourceId(valueOf.getIdDt()); theTransactionDetails.addResolvedResourceId(persistentId.getAssociatedResourceId(), persistentId);