Fix #1352 - Don't fail to create observation with a value type of

SampledData

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java

@@ -76,6 +76,19 @@ public class FhirResourceDaoR4CreateTest extends BaseJpaR4Test {
 
 	}
 
+	/**
+	 * See #1352
+	 */
+	@Test
+	public void testCreateWithSampledDataInObservation() {
+		Observation o = new Observation();
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		SampledData sampledData = new SampledData();
+		sampledData.setData("2 3 4 5 6");
+		o.setValue(sampledData);
+		assertTrue(myObservationDao.create(o).getCreated());
+	}
+
 	@Test
 	public void testCreateWithClientAssignedIdDisallowed() {
 		myDaoConfig.setResourceClientIdStrategy(DaoConfig.ClientIdStrategyEnum.NOT_ALLOWED);

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

@@ -30,6 +30,7 @@ import ca.uhn.fhir.jpa.searchparam.registry.ISearchParamRegistry;
 import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.hl7.fhir.exceptions.FHIRException;
@@ -58,6 +59,23 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 public class SearchParamExtractorR4 extends BaseSearchParamExtractor implements ISearchParamExtractor {
 
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorR4.class);
+	private static final Set<Class<?>> ourIgnoredForSearchDatatypes;
+
+	static {
+		//noinspection unchecked
+		ourIgnoredForSearchDatatypes = Collections.unmodifiableSet(Sets.newHashSet(
+			Age.class,
+			Annotation.class,
+			Attachment.class,
+			Count.class,
+			Distance.class,
+			Ratio.class,
+			SampledData.class,
+			Signature.class,
+			LocationPositionComponent.class
+		));
+	}
+
 	@Autowired
 	private org.hl7.fhir.r4.hapi.ctx.IValidationSupport myValidationSupport;
 
@@ -378,7 +396,7 @@ public class SearchParamExtractorR4 extends BaseSearchParamExtractor implements
 					Range nextValue = (Range) nextObject;
 					addQuantity(theEntity, retVal, resourceName, nextValue.getLow());
 					addQuantity(theEntity, retVal, resourceName, nextValue.getHigh());
-				} else if (nextObject instanceof LocationPositionComponent) {
+				} else if (ourIgnoredForSearchDatatypes.contains(nextObject.getClass())) {
 					continue;
 				} else {
 					if (!multiType) {

src/changes/changes.xml

@@ -127,6 +127,11 @@
 				should not be populated. This has been corrected. Thanks to GitHub user
 				@gitrust for reporting!
 			</action>
+			<action type="fix" issue="1352">
+				Creating R4 Observation resources with a value type of SampledData failed in the
+				JPA server because of an indexing error. Thanks to Brian Reinhold for
+				reporting!
+			</action>
 		</release>
 		<release version="3.8.0" date="2019-05-30" description="Hippo">
 			<action type="fix">