From 3e49e5615fe5772e10075988e786a63b0aee5906 Mon Sep 17 00:00:00 2001 From: ianmarshall Date: Sat, 25 Apr 2020 22:14:55 -0400 Subject: [PATCH] Fixing merge conflicts after merge from Master. --- .../src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java | 2 +- .../main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java | 4 ---- .../jpa/searchparam/extractor/BaseSearchParamExtractor.java | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java index 1d7e5b68cd0..8f45cb977dc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java @@ -359,7 +359,7 @@ public class SearchBuilder implements ISearchBuilder { } List lastnResourceIds = myIElasticsearchSvc.executeLastN(myParams, myMaxObservationsPerCode); for (String lastnResourceId : lastnResourceIds) { - pids.add(myIdHelperService.resolveResourcePersistentIds(myResourceName, lastnResourceId)); + pids.add(myIdHelperService.resolveResourcePersistentIds(myRequestPartitionId, myResourceName, lastnResourceId)); } } if (pids.isEmpty()) { diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java index 9f4dcc03cba..0acddbc609b 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java @@ -180,10 +180,6 @@ public class ResourceLink extends BaseResourceIndex { myTargetResourceUrl = theTargetResourceUrl.getValue(); } - public String getTargetResourceUrl() { - return myTargetResourceUrl; - } - public void setTargetResourceUrlCanonical(String theTargetResourceUrl) { Validate.notBlank(theTargetResourceUrl); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java index 34b5804e666..a35195e6c94 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java @@ -374,7 +374,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor Date end = extractValueAsDate(myPeriodEndValueChild, theValue); if (start != null || end != null) { - myIndexedSearchParamDate = new ResourceIndexedSearchParamDate(theResourceType, theSearchParam.getName(), start, end, startAsString); + myIndexedSearchParamDate = new ResourceIndexedSearchParamDate(myPartitionSettings, theResourceType, theSearchParam.getName(), start, end, startAsString); theParams.add(myIndexedSearchParamDate); } } @@ -408,7 +408,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor } if (!dates.isEmpty()) { - myIndexedSearchParamDate = new ResourceIndexedSearchParamDate(theResourceType, theSearchParam.getName(), dates.first(), dates.last(), firstValue); + myIndexedSearchParamDate = new ResourceIndexedSearchParamDate(myPartitionSettings, theResourceType, theSearchParam.getName(), dates.first(), dates.last(), firstValue); theParams.add(myIndexedSearchParamDate); } }