From fd1be0049ab1ab497e866fb5925092448d54aa47 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Mon, 5 Dec 2022 10:16:43 -0500 Subject: [PATCH] fix cyclic package dep --- .../ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 942771aa2ff..cdafa44536b 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 @@ -34,7 +34,6 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.api.svc.IIdHelperService; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; import ca.uhn.fhir.jpa.model.cross.IResourceLookup; -import ca.uhn.fhir.jpa.model.dao.JpaPid; import ca.uhn.fhir.jpa.searchparam.extractor.IResourceLinkResolver; import ca.uhn.fhir.jpa.searchparam.extractor.PathAndRef; import ca.uhn.fhir.rest.api.server.RequestDetails; @@ -184,8 +183,8 @@ public class DaoResourceLinkResolver impleme valueOf = placeholderResourceDao.create(newResource, theRequest).getEntity(); } - JpaPid persistentId = (JpaPid) valueOf.getPersistentId(); - persistentId = new JpaPid(persistentId.getId()); + BaseResourcePersistentId persistentId = valueOf.getPersistentId(); + persistentId = myIdHelperService.newPid(persistentId.getId()); persistentId.setAssociatedResourceId(valueOf.getIdDt()); theTransactionDetails.addResolvedResourceId(persistentId.getAssociatedResourceId(), persistentId); }