From a3fbd3e1a1817b3883de6092ec5e3238d9651523 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Fri, 26 Mar 2021 16:00:06 -0400 Subject: [PATCH] Hotter docs --- .../java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java | 2 -- .../java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java | 4 ---- .../java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java | 7 +++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java index 8a495496f23..22a11abcbdc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java @@ -161,8 +161,6 @@ public class BulkExportJobConfig { return myStepBuilderFactory.get("groupBulkExportGenerateResourceFilesStep") ., List> chunk(CHUNK_SIZE) //1000 resources per generated file, as the reader returns 10 resources at a time. .reader(groupBulkItemReader()) -// .processor(myPidToIBaseResourceProcessor) -// .processor(myGoldenResourceAnnotatingProcessor) .processor(inflateResourceThenAnnotateWithGoldenResourceProcessor()) .writer(resourceToFileWriter()) .listener(bulkExportGenerateResourceFilesStepListener()) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java index f90978a9d26..a5515667469 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/GroupBulkItemReader.java @@ -237,10 +237,6 @@ public class GroupBulkItemReader extends BaseBulkItemReader implements ItemReade return expandedIds; } - private void populateMdmResourceCacheIfNeeded(Map> goldenResourceToSourcePidMap) { - - } - private void queryResourceTypeWithReferencesToPatients(Set myReadPids, List idChunk) { //Build SP map //First, inject the _typeFilters and _since from the export job diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java index 19bc25dd810..7ad00390ae8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmExpansionCacheSvc.java @@ -21,6 +21,13 @@ public class MdmExpansionCacheSvc { private final ConcurrentHashMap mySourceToGoldenIdCache = new ConcurrentHashMap<>(); + /** + * Lookup a given resource's golden resource ID in the cache. Note that if you pass this function the resource ID of a + * golden resource, it will just return itself. + * + * @param theSourceId the resource ID of the source resource ,e.g. PAT123 + * @return the resource ID of the associated golden resource. + */ public String getGoldenResourceId(String theSourceId) { ourLog.debug(buildLogMessage("About to lookup cached resource ID " + theSourceId)); String goldenResourceId = mySourceToGoldenIdCache.get(theSourceId);