From 74948737a7139fbddeddeb29220849da78284d3a Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Sat, 1 Feb 2020 20:18:42 -0500 Subject: [PATCH] pre-review cleanup --- .../src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java | 1 + .../main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 8c820ca77d5..91146696266 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 @@ -188,6 +188,7 @@ public class SearchBuilder implements ISearchBuilder { private void setLocationDistance(SearchParameterMap theParams) { if (myResourceType == Location.class && theParams.containsKey(Location.SP_NEAR_DISTANCE)) { List> paramList = theParams.get(Location.SP_NEAR_DISTANCE); + // Set nearDistanceParam on the SearchParameterMap so it's available to the near predicate paramList.stream() .flatMap(List::stream) .findFirst() diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java index d9ed8561105..f63b682f7a0 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java @@ -118,7 +118,6 @@ public class MatchUrlService { paramMap.add(nextParamName, param); } else if (Location.SP_NEAR_DISTANCE.equals(nextParamName)) { QuantityAndListParam nearDistanceAndListParam = (QuantityAndListParam) ParameterUtil.parseQueryParams(myContext, RestSearchParameterTypeEnum.QUANTITY, nextParamName, paramList); - // FIXME KHS this needs to be set elsewhere nearDistanceAndListParam.getValuesAsQueryTokens().stream() .map(QuantityOrListParam::getValuesAsQueryTokens) .flatMap(List::stream)