testing complete. Now just need pre-review cleanup.

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

@@ -2755,9 +2755,19 @@ public class SearchBuilder implements ISearchBuilder {
 				myParams.getEverythingMode() == null &&
 				myParams.isAllParametersHaveNoModifier();
 		if (couldBeEligibleForCompositeUniqueSpProcessing) {
+			attemptCompositeUniqueSpProcessing(theParams, theRequest);
+		}
 
-			// FIXME KHS method
+		// Handle each parameter
+		for (Entry<String, List<List<IQueryParameterType>>> nextParamEntry : myParams.entrySet()) {
+			String nextParamName = nextParamEntry.getKey();
+			List<List<IQueryParameterType>> andOrParams = nextParamEntry.getValue();
+			searchForIdsWithAndOr(myResourceName, nextParamName, andOrParams, theRequest);
+		}
 
+	}
+
+	private void attemptCompositeUniqueSpProcessing(@Nonnull SearchParameterMap theParams, RequestDetails theRequest) {
 		// Since we're going to remove elements below
 		theParams.values().forEach(nextAndList -> ensureSubListsAreWritable(nextAndList));
 
@@ -2825,15 +2835,6 @@ public class SearchBuilder implements ISearchBuilder {
 		}
 	}
 
-		// Handle each parameter
-		for (Entry<String, List<List<IQueryParameterType>>> nextParamEntry : myParams.entrySet()) {
-			String nextParamName = nextParamEntry.getKey();
-			List<List<IQueryParameterType>> andOrParams = nextParamEntry.getValue();
-			searchForIdsWithAndOr(myResourceName, nextParamName, andOrParams, theRequest);
-		}
-
-	}
-
 	private <T> void ensureSubListsAreWritable(List<List<T>> theListOfLists) {
 		for (int i = 0; i < theListOfLists.size(); i++) {
 			List<T> oldSubList = theListOfLists.get(i);

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java

@@ -20,8 +20,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -68,10 +68,42 @@ public class MatchUrlServiceTest extends BaseJpaTest {
 		assertEquals(kmDistance, nearDistanceParam.getValue().doubleValue(), 0.0);
 	}
 
+	@Test
+	public void testTwoDistancesAnd() {
+		try {
+			SearchParameterMap map = myMatchUrlService.translateMatchUrl(
+				"Location?" +
+					Location.SP_NEAR_DISTANCE + "=1|http://unitsofmeasure.org|km" +
+					"&" +
+					Location.SP_NEAR_DISTANCE + "=2|http://unitsofmeasure.org|km",
+				ourCtx.getResourceDefinition("Location"));
+			fail();
+		} catch (IllegalArgumentException e) {
+			assertEquals("Only one " + Location.SP_NEAR_DISTANCE + " parameter may be present", e.getMessage());
+		}
+	}
+
+	@Test
+	public void testTwoDistancesOr() {
+		try {
+			SearchParameterMap map = myMatchUrlService.translateMatchUrl(
+				"Location?" +
+					Location.SP_NEAR_DISTANCE + "=1|http://unitsofmeasure.org|km" +
+					"," +
+					"2|http://unitsofmeasure.org|km",
+				ourCtx.getResourceDefinition("Location"));
+			map.setLoadSynchronous(true);
+			fail();
+		} catch (IllegalArgumentException e) {
+			assertEquals("Only one " + Location.SP_NEAR_DISTANCE + " parameter may be present", e.getMessage());
+		}
+	}
+
 	@Override
 	protected FhirContext getContext() {
 		return ourCtx;
 	}
+
 	@Override
 	protected PlatformTransactionManager getTxManager() {
 		return null;

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
 				paramMap.setNearDistanceParam(nearDistanceAndListParam);
 			} else if (nextParamName.startsWith("_")) {
 				// ignore these since they aren't search params (e.g. _sort)

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/SearchParameterMap.java

@@ -5,6 +5,7 @@ import ca.uhn.fhir.model.api.IQueryParameterAnd;
 import ca.uhn.fhir.model.api.IQueryParameterOr;
 import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.model.api.Include;
+import ca.uhn.fhir.model.dstu2.resource.Location;
 import ca.uhn.fhir.rest.api.*;
 import ca.uhn.fhir.rest.param.*;
 import ca.uhn.fhir.util.ObjectUtil;
@@ -499,13 +500,17 @@ public class SearchParameterMap implements Serializable {
 		if (orTokens.isEmpty()) {
 			return;
 		}
-		// FIXME KHS error if size > 0
+		if (orTokens.size() > 1) {
+			throw new IllegalArgumentException("Only one " + Location.SP_NEAR_DISTANCE + " parameter may be present");
+		}
 		QuantityOrListParam quantityOrListParam = orTokens.get(0);
 		List<QuantityParam> tokens = quantityOrListParam.getValuesAsQueryTokens();
 		if (tokens.isEmpty()) {
 			return;
 		}
-		// FIXME KHS error if size > 0
+		if (tokens.size() > 1) {
+			throw new IllegalArgumentException("Only one " + Location.SP_NEAR_DISTANCE + " parameter may be present");
+		}
 		myNearDistanceParam = tokens.get(0);
 	}
 

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java

@@ -275,7 +275,6 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
 				case "Consent.source":
 					// Consent#source-identifier has a path that isn't typed - This is a one-off to deal with that
 					return;
-					// FIXME KHS
 				case "Location.position":
 					addCoords_Position(resourceTypeName, params, searchParam, value);
 					return;
@@ -414,12 +413,6 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
 	public SearchParamSet<ResourceIndexedSearchParamQuantity> extractSearchParamQuantity(IBaseResource theResource) {
 
 		IExtractor<ResourceIndexedSearchParamQuantity> extractor = (params, searchParam, value, path) -> {
-			// FIXME KHS
-//			if (value.getClass().equals(myLocationPositionDefinition.getImplementingClass())) {
-//				ourLog.warn("Position search not currently supported, not indexing location");
-//				return;
-//			}
-
 			String nextType = toRootTypeName(value);
 			String resourceType = toRootTypeName(theResource);
 			switch (nextType) {
@@ -723,7 +716,6 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
 
 	}
 
-	// FIXME KHS split this class up
 	private void addCoords_Position(String theResourceType, SearchParamSet<BaseResourceIndexedSearchParam> theParams, RuntimeSearchParam theSearchParam, IBase theValue) {
 		BigDecimal latitude = null;
 		BigDecimal longitude = null;

hapi-fhir-jpaserver-searchparam/src/test/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorMegaTest.java

@@ -178,11 +178,6 @@ public class SearchParamExtractorMegaTest {
 
 		ISearchParamExtractor.SearchParamSet<?> set;
 
-		// FIXME KHS
-//		set = theExtractor.extractSearchParamCoords(resource);
-//		assertEquals(0, set.getWarnings().size());
-//		theIndexesCounter.addAndGet(set.size());
-
 		set = theExtractor.extractSearchParamDates(resource);
 		assertEquals(0, set.getWarnings().size());
 		theIndexesCounter.addAndGet(set.size());