honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pre-review cleanup

This commit is contained in:
Ken Stevens 2020-02-01 20:18:42 -05:00
parent c375c66f15
commit 74948737a7
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
View File

@ -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<List<IQueryParameterType>> 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()

1
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/MatchUrlService.java
View File

@ -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)