Fixing merge conflicts after merge from Master.

This commit is contained in:
ianmarshall 2020-04-25 22:14:55 -04:00
parent dd749791db
commit 3e49e5615f
3 changed files with 3 additions and 7 deletions

View File

@ -359,7 +359,7 @@ public class SearchBuilder implements ISearchBuilder {
} }
List<String> lastnResourceIds = myIElasticsearchSvc.executeLastN(myParams, myMaxObservationsPerCode); List<String> lastnResourceIds = myIElasticsearchSvc.executeLastN(myParams, myMaxObservationsPerCode);
for (String lastnResourceId : lastnResourceIds) { for (String lastnResourceId : lastnResourceIds) {
pids.add(myIdHelperService.resolveResourcePersistentIds(myResourceName, lastnResourceId)); pids.add(myIdHelperService.resolveResourcePersistentIds(myRequestPartitionId, myResourceName, lastnResourceId));
} }
} }
if (pids.isEmpty()) { if (pids.isEmpty()) {

View File

@ -180,10 +180,6 @@ public class ResourceLink extends BaseResourceIndex {
myTargetResourceUrl = theTargetResourceUrl.getValue(); myTargetResourceUrl = theTargetResourceUrl.getValue();
} }
public String getTargetResourceUrl() {
return myTargetResourceUrl;
}
public void setTargetResourceUrlCanonical(String theTargetResourceUrl) { public void setTargetResourceUrlCanonical(String theTargetResourceUrl) {
Validate.notBlank(theTargetResourceUrl); Validate.notBlank(theTargetResourceUrl);

View File

@ -374,7 +374,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
Date end = extractValueAsDate(myPeriodEndValueChild, theValue); Date end = extractValueAsDate(myPeriodEndValueChild, theValue);
if (start != null || end != null) { 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); theParams.add(myIndexedSearchParamDate);
} }
} }
@ -408,7 +408,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
} }
if (!dates.isEmpty()) { 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); theParams.add(myIndexedSearchParamDate);
} }
} }