Merge remote-tracking branch 'origin/master' into

1008_fix_jpa_sql_loop_issue

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

@@ -36,19 +36,19 @@ import ca.uhn.fhir.jpa.entity.Search;
 public interface ISearchDao extends JpaRepository<Search, Long> {
 
 	@Query("SELECT s FROM Search s WHERE s.myUuid = :uuid")
-	public Search findByUuid(@Param("uuid") String theUuid);
+	Search findByUuid(@Param("uuid") String theUuid);
 
 	@Query("SELECT s.myId FROM Search s WHERE s.mySearchLastReturned < :cutoff")
-	public Slice<Long> findWhereLastReturnedBefore(@Param("cutoff") Date theCutoff, Pageable thePage);
+	Slice<Long> findWhereLastReturnedBefore(@Param("cutoff") Date theCutoff, Pageable thePage);
 
 //	@Query("SELECT s FROM Search s WHERE s.myCreated < :cutoff")
 //	public Collection<Search> findWhereCreatedBefore(@Param("cutoff") Date theCutoff);
 
 	@Query("SELECT s FROM Search s WHERE s.myResourceType = :type AND mySearchQueryStringHash = :hash AND s.myCreated > :cutoff")
-	public Collection<Search> find(@Param("type") String theResourceType, @Param("hash") int theHashCode, @Param("cutoff") Date theCreatedCutoff);
+	Collection<Search> find(@Param("type") String theResourceType, @Param("hash") int theHashCode, @Param("cutoff") Date theCreatedCutoff);
 
 	@Modifying
 	@Query("UPDATE Search s SET s.mySearchLastReturned = :last WHERE s.myId = :pid")
-	public void updateSearchLastReturned(@Param("pid") long thePid, @Param("last") Date theDate);
+	void updateSearchLastReturned(@Param("pid") long thePid, @Param("last") Date theDate);
 
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java

@@ -94,10 +94,9 @@ public class Search implements Serializable {
 	@OneToMany(mappedBy="mySearch")
 	private Collection<SearchResult> myResults;
 
-	// TODO: change nullable to false after 2.5
 	@NotNull
 	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="SEARCH_LAST_RETURNED", nullable=true, updatable=false) 
+	@Column(name="SEARCH_LAST_RETURNED", nullable=false, updatable=false)
 	private Date mySearchLastReturned;
 
 	@Lob()

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java

@@ -78,7 +78,7 @@ public class TermConcept implements Serializable {
 	private String myDisplay;
 
 	@OneToMany(mappedBy = "myConcept", orphanRemoval = true)
-	@Field
+	@Field(name = "PROPmyProperties", analyzer = @Analyzer(definition = "termConceptPropertyAnalyzer"))
 	@FieldBridge(impl = TermConceptPropertyFieldBridge.class)
 	private Collection<TermConceptProperty> myProperties;
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptPropertyFieldBridge.java

@@ -21,18 +21,22 @@ package ca.uhn.fhir.jpa.entity;
  */
 
 import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
 import org.hibernate.search.bridge.FieldBridge;
 import org.hibernate.search.bridge.LuceneOptions;
 import org.hibernate.search.bridge.StringBridge;
 
 import java.util.Collection;
 
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
 /**
  * Allows hibernate search to index individual concepts' properties
  */
 public class TermConceptPropertyFieldBridge implements FieldBridge, StringBridge {
 
-	public static final String PROP_PREFIX = "PROP__";
+	public static final String CONCEPT_FIELD_PROPERTY_PREFIX = "PROP";
 
 	/**
 	 * Constructor
@@ -48,15 +52,17 @@ public class TermConceptPropertyFieldBridge implements FieldBridge, StringBridge
 
 	@Override
 	public void set(String theName, Object theValue, Document theDocument, LuceneOptions theLuceneOptions) {
+		@SuppressWarnings("unchecked")
 		Collection<TermConceptProperty> properties = (Collection<TermConceptProperty>) theValue;
+
 		if (properties != null) {
 			for (TermConceptProperty next : properties) {
-				String propValue = next.getKey() + "=" + next.getValue();
-				theLuceneOptions.addFieldToDocument(theName, propValue, theDocument);
+				theDocument.add(new StringField(CONCEPT_FIELD_PROPERTY_PREFIX + next.getKey(), next.getValue(), Field.Store.YES));
 
 				if (next.getType() == TermConceptPropertyTypeEnum.CODING) {
-					propValue = next.getKey() + "=" + next.getDisplay();
-					theLuceneOptions.addFieldToDocument(theName, propValue, theDocument);
+					if (isNotBlank(next.getDisplay())) {
+						theDocument.add(new StringField(CONCEPT_FIELD_PROPERTY_PREFIX + next.getKey(), next.getDisplay(), Field.Store.YES));
+					}
 				}
 			}
 		}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/LuceneSearchMappingFactory.java

@@ -66,7 +66,8 @@ public class LuceneSearchMappingFactory {
 			.analyzerDef("standardAnalyzer", StandardTokenizerFactory.class)
 				.filter(LowerCaseFilterFactory.class)
 			.analyzerDef("exactAnalyzer", StandardTokenizerFactory.class)
-			.analyzerDef("conceptParentPidsAnalyzer", WhitespaceTokenizerFactory.class);
+			.analyzerDef("conceptParentPidsAnalyzer", WhitespaceTokenizerFactory.class)
+			.analyzerDef("termConceptPropertyAnalyzer", WhitespaceTokenizerFactory.class);
 
 		return mapping;
 	}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java

@@ -40,9 +40,13 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.time.DateUtils;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queries.TermsQuery;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RegexpQuery;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.search.jpa.FullTextEntityManager;
@@ -131,10 +135,14 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 	private int myFetchSize = DEFAULT_FETCH_SIZE;
 	private ApplicationContext myApplicationContext;
 
-	private void addCodeIfNotAlreadyAdded(String theCodeSystem, ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, TermConcept theConcept) {
-		if (theAddedCodes.add(theConcept.getCode())) {
+	/**
+	 * @param theAdd If true, add the code. If false, remove the code.
+	 */
+	private void addCodeIfNotAlreadyAdded(String theCodeSystem, ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, TermConcept theConcept, boolean theAdd) {
+		String code = theConcept.getCode();
+		if (theAdd && theAddedCodes.add(code)) {
 			ValueSet.ValueSetExpansionContainsComponent contains = theExpansionComponent.addContains();
-			contains.setCode(theConcept.getCode());
+			contains.setCode(code);
 			contains.setSystem(theCodeSystem);
 			contains.setDisplay(theConcept.getDisplay());
 			for (TermConceptDesignation nextDesignation : theConcept.getDesignations()) {
@@ -147,18 +155,32 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 					.setDisplay(nextDesignation.getUseDisplay());
 			}
 		}
+
+		if (!theAdd && theAddedCodes.remove(code)) {
+			removeCodeFromExpansion(theCodeSystem, code, theExpansionComponent);
+		}
 	}
 
-	private void addConceptsToList(ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, String theSystem, List<CodeSystem.ConceptDefinitionComponent> theConcept) {
+	private void removeCodeFromExpansion(String theCodeSystem, String theCode, ValueSet.ValueSetExpansionComponent theExpansionComponent) {
+		theExpansionComponent
+			.getContains()
+			.removeIf(t ->
+				theCodeSystem.equals(t.getSystem()) &&
+					theCode.equals(t.getCode()));
+	}
+
+	private void addConceptsToList(ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, String theSystem, List<CodeSystem.ConceptDefinitionComponent> theConcept, boolean theAdd) {
 		for (CodeSystem.ConceptDefinitionComponent next : theConcept) {
-			if (!theAddedCodes.contains(next.getCode())) {
-				theAddedCodes.add(next.getCode());
+			if (theAdd && theAddedCodes.add(next.getCode())) {
 				ValueSet.ValueSetExpansionContainsComponent contains = theExpansionComponent.addContains();
 				contains.setCode(next.getCode());
 				contains.setSystem(theSystem);
 				contains.setDisplay(next.getDisplay());
 			}
-			addConceptsToList(theExpansionComponent, theAddedCodes, theSystem, next.getConcept());
+			if (!theAdd && theAddedCodes.remove(next.getCode())) {
+				removeCodeFromExpansion(theSystem, next.getCode(), theExpansionComponent);
+			}
+			addConceptsToList(theExpansionComponent, theAddedCodes, theSystem, next.getConcept(), theAdd);
 		}
 	}
 
@@ -296,133 +318,17 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 	public ValueSet expandValueSet(ValueSet theValueSetToExpand) {
 		ValueSet.ValueSetExpansionComponent expansionComponent = new ValueSet.ValueSetExpansionComponent();
 		Set<String> addedCodes = new HashSet<>();
-		boolean haveIncludeCriteria = false;
 
+		// Handle includes
 		for (ValueSet.ConceptSetComponent include : theValueSetToExpand.getCompose().getInclude()) {
-			String system = include.getSystem();
-			if (isNotBlank(system)) {
-				ourLog.info("Starting expansion around code system: {}", system);
+			boolean add = true;
+			expandValueSetHandleIncludeOrExclude(expansionComponent, addedCodes, include, add);
+		}
 
-				TermCodeSystem cs = myCodeSystemDao.findByCodeSystemUri(system);
-				if (cs != null) {
-					TermCodeSystemVersion csv = cs.getCurrentVersion();
-
-					/*
-					 * Include Concepts
-					 */
-					for (ValueSet.ConceptReferenceComponent next : include.getConcept()) {
-						String nextCode = next.getCode();
-						if (isNotBlank(nextCode) && !addedCodes.contains(nextCode)) {
-							haveIncludeCriteria = true;
-							TermConcept code = findCode(system, nextCode);
-							if (code != null) {
-								addCodeIfNotAlreadyAdded(system, expansionComponent, addedCodes, code);
-							}
-						}
-					}
-
-					/*
-					 * Filters
-					 */
-
-					if (include.getFilter().size() > 0) {
-						haveIncludeCriteria = true;
-
-						FullTextEntityManager em = org.hibernate.search.jpa.Search.getFullTextEntityManager(myEntityManager);
-						QueryBuilder qb = em.getSearchFactory().buildQueryBuilder().forEntity(TermConcept.class).get();
-						BooleanJunction<?> bool = qb.bool();
-
-						bool.must(qb.keyword().onField("myCodeSystemVersionPid").matching(csv.getPid()).createQuery());
-
-						for (ValueSet.ConceptSetFilterComponent nextFilter : include.getFilter()) {
-							if (isBlank(nextFilter.getValue()) && nextFilter.getOp() == null && isBlank(nextFilter.getProperty())) {
-								continue;
-							}
-
-							if (isBlank(nextFilter.getValue()) || nextFilter.getOp() == null || isBlank(nextFilter.getProperty())) {
-								throw new InvalidRequestException("Invalid filter, must have fields populated: property op value");
-							}
-
-
-							if (nextFilter.getProperty().equals("display:exact") && nextFilter.getOp() == ValueSet.FilterOperator.EQUAL) {
-								addDisplayFilterExact(qb, bool, nextFilter);
-							} else if ("display".equals(nextFilter.getProperty()) && nextFilter.getOp() == ValueSet.FilterOperator.EQUAL) {
-								if (nextFilter.getValue().trim().contains(" ")) {
-									addDisplayFilterExact(qb, bool, nextFilter);
-								} else {
-									addDisplayFilterInexact(qb, bool, nextFilter);
-								}
-							} else if ((nextFilter.getProperty().equals("concept") || nextFilter.getProperty().equals("code")) && nextFilter.getOp() == ValueSet.FilterOperator.ISA) {
-
-								TermConcept code = findCode(system, nextFilter.getValue());
-								if (code == null) {
-									throw new InvalidRequestException("Invalid filter criteria - code does not exist: {" + system + "}" + nextFilter.getValue());
-								}
-
-								ourLog.info(" * Filtering on codes with a parent of {}/{}/{}", code.getId(), code.getCode(), code.getDisplay());
-								bool.must(qb.keyword().onField("myParentPids").matching("" + code.getId()).createQuery());
-
-							} else {
-
-								bool.must(qb.phrase().onField("myProperties").sentence(nextFilter.getProperty() + "=" + nextFilter.getValue()).createQuery());
-
-							}
-						}
-
-						Query luceneQuery = bool.createQuery();
-						FullTextQuery jpaQuery = em.createFullTextQuery(luceneQuery, TermConcept.class);
-						jpaQuery.setMaxResults(1000);
-
-						StopWatch sw = new StopWatch();
-
-						@SuppressWarnings("unchecked")
-						List<TermConcept> result = jpaQuery.getResultList();
-
-						ourLog.info("Expansion completed in {}ms", sw.getMillis());
-
-						for (TermConcept nextConcept : result) {
-							addCodeIfNotAlreadyAdded(system, expansionComponent, addedCodes, nextConcept);
-						}
-
-						expansionComponent.setTotal(jpaQuery.getResultSize());
-					}
-
-					if (!haveIncludeCriteria) {
-						List<TermConcept> allCodes = findCodes(system);
-						for (TermConcept nextConcept : allCodes) {
-							addCodeIfNotAlreadyAdded(system, expansionComponent, addedCodes, nextConcept);
-						}
-					}
-
-				} else {
-					// No codesystem matching the URL found in the database
-
-					CodeSystem codeSystemFromContext = getCodeSystemFromContext(system);
-					if (codeSystemFromContext == null) {
-						throw new InvalidRequestException("Unknown code system: " + system);
-					}
-
-					if (include.getConcept().isEmpty() == false) {
-						for (ValueSet.ConceptReferenceComponent next : include.getConcept()) {
-							String nextCode = next.getCode();
-							if (isNotBlank(nextCode) && !addedCodes.contains(nextCode)) {
-								CodeSystem.ConceptDefinitionComponent code = findCode(codeSystemFromContext.getConcept(), nextCode);
-								if (code != null) {
-									addedCodes.add(nextCode);
-									ValueSet.ValueSetExpansionContainsComponent contains = expansionComponent.addContains();
-									contains.setCode(nextCode);
-									contains.setSystem(system);
-									contains.setDisplay(code.getDisplay());
-								}
-							}
-						}
-					} else {
-						List<CodeSystem.ConceptDefinitionComponent> concept = codeSystemFromContext.getConcept();
-						addConceptsToList(expansionComponent, addedCodes, system, concept);
-					}
-
-				}
-			}
+		// Handle excludes
+		for (ValueSet.ConceptSetComponent include : theValueSetToExpand.getCompose().getExclude()) {
+			boolean add = false;
+			expandValueSetHandleIncludeOrExclude(expansionComponent, addedCodes, include, add);
 		}
 
 		ValueSet valueSet = new ValueSet();
@@ -430,6 +336,162 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		return valueSet;
 	}
 
+	public void expandValueSetHandleIncludeOrExclude(ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, ValueSet.ConceptSetComponent include, boolean theAdd) {
+		String system = include.getSystem();
+		if (isNotBlank(system)) {
+			ourLog.info("Starting expansion around code system: {}", system);
+
+			TermCodeSystem cs = myCodeSystemDao.findByCodeSystemUri(system);
+			if (cs != null) {
+				TermCodeSystemVersion csv = cs.getCurrentVersion();
+				FullTextEntityManager em = org.hibernate.search.jpa.Search.getFullTextEntityManager(myEntityManager);
+				QueryBuilder qb = em.getSearchFactory().buildQueryBuilder().forEntity(TermConcept.class).get();
+				BooleanJunction<?> bool = qb.bool();
+
+				bool.must(qb.keyword().onField("myCodeSystemVersionPid").matching(csv.getPid()).createQuery());
+
+				/*
+				 * Include Concepts
+				 */
+
+				String codes = include
+					.getConcept()
+					.stream()
+					.filter(Objects::nonNull)
+					.map(ValueSet.ConceptReferenceComponent::getCode)
+					.filter(StringUtils::isNotBlank)
+					.collect(Collectors.joining(" "));
+				if (isNotBlank(codes)) {
+					bool.must(qb.keyword().onField("myCode").matching(codes).createQuery());
+				}
+
+				/*
+				 * Filters
+				 */
+
+				if (include.getFilter().size() > 0) {
+
+					for (ValueSet.ConceptSetFilterComponent nextFilter : include.getFilter()) {
+						if (isBlank(nextFilter.getValue()) && nextFilter.getOp() == null && isBlank(nextFilter.getProperty())) {
+							continue;
+						}
+
+						if (isBlank(nextFilter.getValue()) || nextFilter.getOp() == null || isBlank(nextFilter.getProperty())) {
+							throw new InvalidRequestException("Invalid filter, must have fields populated: property op value");
+						}
+
+
+						if (nextFilter.getProperty().equals("display:exact") && nextFilter.getOp() == ValueSet.FilterOperator.EQUAL) {
+							addDisplayFilterExact(qb, bool, nextFilter);
+						} else if ("display".equals(nextFilter.getProperty()) && nextFilter.getOp() == ValueSet.FilterOperator.EQUAL) {
+							if (nextFilter.getValue().trim().contains(" ")) {
+								addDisplayFilterExact(qb, bool, nextFilter);
+							} else {
+								addDisplayFilterInexact(qb, bool, nextFilter);
+							}
+						} else if (nextFilter.getProperty().equals("concept") || nextFilter.getProperty().equals("code")) {
+
+							TermConcept code = findCode(system, nextFilter.getValue());
+							if (code == null) {
+								throw new InvalidRequestException("Invalid filter criteria - code does not exist: {" + system + "}" + nextFilter.getValue());
+							}
+
+							if (nextFilter.getOp() == ValueSet.FilterOperator.ISA) {
+								ourLog.info(" * Filtering on codes with a parent of {}/{}/{}", code.getId(), code.getCode(), code.getDisplay());
+								bool.must(qb.keyword().onField("myParentPids").matching("" + code.getId()).createQuery());
+							} else {
+								throw new InvalidRequestException("Don't know how to handle op=" + nextFilter.getOp() + " on property " + nextFilter.getProperty());
+							}
+
+						} else {
+
+							if (nextFilter.getOp() == ValueSet.FilterOperator.REGEX) {
+
+								/*
+								 * We treat the regex filter as a match on the regex
+								 * anywhere in the property string. The spec does not
+								 * say whether or not this is the right behaviour, but
+								 * there are examples that seem to suggest that it is.
+								 */
+								String value = nextFilter.getValue();
+								if (value.endsWith("$")) {
+									value = value.substring(0, value.length() - 1);
+								} else if (value.endsWith(".*") == false) {
+									value = value + ".*";
+								}
+								if (value.startsWith("^") == false && value.startsWith(".*") == false) {
+									value = ".*" + value;
+								} else if (value.startsWith("^")) {
+									value = value.substring(1);
+								}
+
+								Term term = new Term(TermConceptPropertyFieldBridge.CONCEPT_FIELD_PROPERTY_PREFIX + nextFilter.getProperty(), value);
+								RegexpQuery query = new RegexpQuery(term);
+								bool.must(query);
+
+							} else {
+
+								String value = nextFilter.getValue();
+								Term term = new Term(TermConceptPropertyFieldBridge.CONCEPT_FIELD_PROPERTY_PREFIX + nextFilter.getProperty(), value);
+								bool.must(new TermsQuery(term));
+
+							}
+
+						}
+					}
+
+				}
+
+				Query luceneQuery = bool.createQuery();
+				FullTextQuery jpaQuery = em.createFullTextQuery(luceneQuery, TermConcept.class);
+				jpaQuery.setMaxResults(1000);
+
+				StopWatch sw = new StopWatch();
+
+				@SuppressWarnings("unchecked")
+				List<TermConcept> result = jpaQuery.getResultList();
+
+				ourLog.info("Expansion completed in {}ms", sw.getMillis());
+
+				for (TermConcept nextConcept : result) {
+					addCodeIfNotAlreadyAdded(system, theExpansionComponent, theAddedCodes, nextConcept, theAdd);
+				}
+
+			} else {
+				// No codesystem matching the URL found in the database
+
+				CodeSystem codeSystemFromContext = getCodeSystemFromContext(system);
+				if (codeSystemFromContext == null) {
+					throw new InvalidRequestException("Unknown code system: " + system);
+				}
+
+				if (include.getConcept().isEmpty() == false) {
+					for (ValueSet.ConceptReferenceComponent next : include.getConcept()) {
+						String nextCode = next.getCode();
+						if (isNotBlank(nextCode) && !theAddedCodes.contains(nextCode)) {
+							CodeSystem.ConceptDefinitionComponent code = findCode(codeSystemFromContext.getConcept(), nextCode);
+							if (code != null) {
+								if (theAdd && theAddedCodes.add(nextCode)) {
+									ValueSet.ValueSetExpansionContainsComponent contains = theExpansionComponent.addContains();
+									contains.setCode(nextCode);
+									contains.setSystem(system);
+									contains.setDisplay(code.getDisplay());
+								}
+								if (!theAdd && theAddedCodes.remove(nextCode)) {
+									removeCodeFromExpansion(system, nextCode, theExpansionComponent);
+								}
+							}
+						}
+					}
+				} else {
+					List<CodeSystem.ConceptDefinitionComponent> concept = codeSystemFromContext.getConcept();
+					addConceptsToList(theExpansionComponent, theAddedCodes, system, concept, theAdd);
+				}
+
+			}
+		}
+	}
+
 	protected List<VersionIndependentConcept> expandValueSetAndReturnVersionIndependentConcepts(org.hl7.fhir.r4.model.ValueSet theValueSetToExpandR4) {
 		org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent expandedR4 = expandValueSet(theValueSetToExpandR4).getExpansion();
 
@@ -905,7 +967,7 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		codeSystem.setCurrentVersion(theCodeSystemVersion);
 		codeSystem = myCodeSystemDao.saveAndFlush(codeSystem);
 
-		ourLog.info("Setting codesystemversion on {} concepts...", totalCodeCount);
+		ourLog.info("Setting CodeSystemVersion[{}] on {} concepts...", codeSystem.getPid(), totalCodeCount);
 
 		for (TermConcept next : theCodeSystemVersion.getConcepts()) {
 			populateVersion(next, codeSystemVersion);

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java

@@ -275,7 +275,7 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc {
 		iterateOverZipFile(theDescriptors, LOINC_PART_LINK_FILE, handler, ',', QuoteMode.NON_NUMERIC);
 
 		// Part related code mapping
-		handler = new LoincPartRelatedCodeMappingHandler(codeSystemVersion, code2concept, valueSets, conceptMaps, uploadProperties);
+		handler = new LoincPartRelatedCodeMappingHandler(code2concept, valueSets, conceptMaps, uploadProperties);
 		iterateOverZipFile(theDescriptors, LOINC_PART_RELATED_CODE_MAPPING_FILE, handler, ',', QuoteMode.NON_NUMERIC);
 
 		// Document Ontology File

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java

@@ -20,7 +20,6 @@ package ca.uhn.fhir.jpa.term.loinc;
  * #L%
  */
 
-import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
 import ca.uhn.fhir.jpa.entity.TermConcept;
 import ca.uhn.fhir.jpa.term.IHapiTerminologyLoaderSvc;
 import ca.uhn.fhir.jpa.term.IRecordHandler;
@@ -41,23 +40,20 @@ public class LoincPartRelatedCodeMappingHandler extends BaseLoincHandler impleme
 
 	public static final String LOINC_SCT_PART_MAP_ID = "loinc-parts-to-snomed-ct";
 	public static final String LOINC_SCT_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-snomed-ct";
-	public static final String LOINC_SCT_PART_MAP_NAME = "LOINC Part Map to SNOMED CT";
-	public static final String LOINC_RXNORM_PART_MAP_ID = "loinc-parts-to-rxnorm";
-	public static final String LOINC_RXNORM_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-rxnorm";
-	public static final String LOINC_RXNORM_PART_MAP_NAME = "LOINC Part Map to RxNORM";
-	public static final String LOINC_RADLEX_PART_MAP_ID = "loinc-parts-to-radlex";
-	public static final String LOINC_RADLEX_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-radlex";
-	public static final String LOINC_RADLEX_PART_MAP_NAME = "LOINC Part Map to RADLEX";
+	private static final String LOINC_SCT_PART_MAP_NAME = "LOINC Part Map to SNOMED CT";
+	private static final String LOINC_RXNORM_PART_MAP_ID = "loinc-parts-to-rxnorm";
+	private static final String LOINC_RXNORM_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-rxnorm";
+	private static final String LOINC_RXNORM_PART_MAP_NAME = "LOINC Part Map to RxNORM";
+	private static final String LOINC_RADLEX_PART_MAP_ID = "loinc-parts-to-radlex";
+	private static final String LOINC_RADLEX_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-radlex";
+	private static final String LOINC_RADLEX_PART_MAP_NAME = "LOINC Part Map to RADLEX";
 	private static final String CM_COPYRIGHT = "This content from LOINC® is copyright © 1995 Regenstrief Institute, Inc. and the LOINC Committee, and available at no cost under the license at https://loinc.org/license/. The LOINC Part File, LOINC/SNOMED CT Expression Association and Map Sets File, RELMA database and associated search index files include SNOMED Clinical Terms (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights are reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement.  It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org. Under the terms of the Affiliate License, use of SNOMED CT in countries that are not IHTSDO Members is subject to reporting and fee payment obligations. However, IHTSDO agrees to waive the requirements to report and pay fees for use of SNOMED CT content included in the LOINC Part Mapping and LOINC Term Associations for purposes that support or enable more effective use of LOINC. This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.";
-	private final Map<String, TermConcept> myCode2Concept;
-	private final TermCodeSystemVersion myCodeSystemVersion;
-	private final List<ConceptMap> myConceptMaps;
+	private static final String LOINC_PUBCHEM_PART_MAP_URI = "http://pubchem.ncbi.nlm.nih.gov";
+	private static final String LOINC_PUBCHEM_PART_MAP_ID = "loinc-parts-to-pubchem";
+	private static final String LOINC_PUBCHEM_PART_MAP_NAME = "LOINC Part Map to PubChem";
 
-	public LoincPartRelatedCodeMappingHandler(TermCodeSystemVersion theCodeSystemVersion, Map<String, TermConcept> theCode2concept, List<ValueSet> theValueSets, List<ConceptMap> theConceptMaps, Properties theUploadProperties) {
+	public LoincPartRelatedCodeMappingHandler(Map<String, TermConcept> theCode2concept, List<ValueSet> theValueSets, List<ConceptMap> theConceptMaps, Properties theUploadProperties) {
 		super(theCode2concept, theValueSets, theConceptMaps, theUploadProperties);
-		myCodeSystemVersion = theCodeSystemVersion;
-		myCode2Concept = theCode2concept;
-		myConceptMaps = theConceptMaps;
 	}
 
 	@Override
@@ -112,8 +108,16 @@ public class LoincPartRelatedCodeMappingHandler extends BaseLoincHandler impleme
 				loincPartMapUri = LOINC_RADLEX_PART_MAP_URI;
 				loincPartMapName = LOINC_RADLEX_PART_MAP_NAME;
 				break;
+			case "http://pubchem.ncbi.nlm.nih.gov":
+				loincPartMapId = LOINC_PUBCHEM_PART_MAP_ID;
+				loincPartMapUri = LOINC_PUBCHEM_PART_MAP_URI;
+				loincPartMapName = LOINC_PUBCHEM_PART_MAP_NAME;
+				break;
 			default:
-				throw new InternalErrorException("Don't know how to handle mapping to system: " + extCodeSystem);
+				loincPartMapId = extCodeSystem.replaceAll("[^a-zA-Z]", "");
+				loincPartMapUri = extCodeSystem;
+				loincPartMapName = "Unknown Mapping";
+				break;
 		}
 
 		addConceptMapEntry(

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java

@@ -64,7 +64,6 @@ public class FhirResourceDaoDstu3SearchCustomSearchParamTest extends BaseJpaDstu
 		}
 	}
 
-
 	@Test
 	public void testCreateInvalidParamNoPath() {
 		SearchParameter fooSp = new SearchParameter();
@@ -858,6 +857,49 @@ public class FhirResourceDaoDstu3SearchCustomSearchParamTest extends BaseJpaDstu
 
 	}
 
+	@Test
+	public void testSearchParameterDescendsIntoContainedResource() {
+		SearchParameter sp = new SearchParameter();
+		sp.addBase("Observation");
+		sp.setCode("specimencollectedtime");
+		sp.setType(Enumerations.SearchParamType.DATE);
+		sp.setTitle("Observation Specimen Collected Time");
+		sp.setExpression("Observation.specimen.resolve().receivedTime");
+		sp.setXpathUsage(SearchParameter.XPathUsageType.NORMAL);
+		sp.setStatus(Enumerations.PublicationStatus.ACTIVE);
+		ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(sp));
+		mySearchParameterDao.create(sp);
+
+		mySearchParamRegsitry.forceRefresh();
+
+		Specimen specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-01"));
+		Observation o = new Observation();
+		o.setId("O1");
+		o.getContained().add(specimen);
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+		myObservationDao.update(o);
+
+		specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-03"));
+		o = new Observation();
+		o.setId("O2");
+		o.getContained().add(specimen);
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+		myObservationDao.update(o);
+
+		SearchParameterMap params = new SearchParameterMap();
+		params.add("specimencollectedtime", new DateParam("2011-01-01"));
+		IBundleProvider outcome = myObservationDao.search(params);
+		List<String> ids = toUnqualifiedVersionlessIdValues(outcome);
+		ourLog.info("IDS: " + ids);
+		assertThat(ids, contains("Observation/O1"));
+	}
+
 	@Test
 	public void testSearchWithCustomParam() {
 

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

@@ -128,7 +128,7 @@ public class FhirResourceDaoR4SearchCustomSearchParamTest extends BaseJpaR4Test
 	}
 
 	@Test
-	public void testCreateSearchParameterOnSearchParameterDoesntCauseEndlessReindexLoop() throws InterruptedException {
+	public void testCreateSearchParameterOnSearchParameterDoesntCauseEndlessReindexLoop() {
 		SearchParameter fooSp = new SearchParameter();
 		fooSp.setCode("foo");
 		fooSp.addBase("SearchParameter");
@@ -175,6 +175,48 @@ public class FhirResourceDaoR4SearchCustomSearchParamTest extends BaseJpaR4Test
 		assertThat(ids, contains(pid.getValue()));
 	}
 
+	@Test
+	public void testSearchParameterDescendsIntoContainedResource() {
+		SearchParameter sp = new SearchParameter();
+		sp.addBase("Observation");
+		sp.setCode("specimencollectedtime");
+		sp.setType(Enumerations.SearchParamType.DATE);
+		sp.setTitle("Observation Specimen Collected Time");
+		sp.setExpression("Observation.specimen.resolve().receivedTime");
+		sp.setXpathUsage(org.hl7.fhir.r4.model.SearchParameter.XPathUsageType.NORMAL);
+		sp.setStatus(org.hl7.fhir.r4.model.Enumerations.PublicationStatus.ACTIVE);
+		mySearchParameterDao.create(sp);
+
+		mySearchParamRegsitry.forceRefresh();
+
+		Specimen specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-01"));
+		Observation o = new Observation();
+		o.setId("O1");
+		o.getContained().add(specimen);
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+		myObservationDao.update(o);
+
+		specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-03"));
+		o = new Observation();
+		o.setId("O2");
+		o.getContained().add(specimen);
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+		myObservationDao.update(o);
+
+		SearchParameterMap params = new SearchParameterMap();
+		params.add("specimencollectedtime", new DateParam("2011-01-01"));
+		IBundleProvider outcome = myObservationDao.search(params);
+		List<String> ids = toUnqualifiedVersionlessIdValues(outcome);
+		ourLog.info("IDS: " + ids);
+		assertThat(ids, contains("Observation/O1"));
+	}
+
 	@Test
 	public void testExtensionWithNoValueIndexesWithoutFailure() {
 		SearchParameter eyeColourSp = new SearchParameter();

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java

@@ -18,7 +18,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.IOException;
 import java.util.HashMap;

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java

@@ -34,6 +34,12 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 	@Autowired
 	private ITermCodeSystemDao myTermCodeSystemDao;
 
+	@After
+	public void after() {
+		myDaoConfig.setDeferIndexingForCodesystemsOfSize(new DaoConfig().getDeferIndexingForCodesystemsOfSize());
+		BaseHapiTerminologySvcImpl.setForceSaveDeferredAlwaysForUnitTest(false);
+	}
+
 	private IIdType createCodeSystem() {
 		CodeSystem codeSystem = new CodeSystem();
 		codeSystem.setUrl(CS_URL);
@@ -104,6 +110,31 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 		return id;
 	}
 
+	public void createLoincSystemWithSomeCodes() {
+		runInTransaction(() -> {
+			CodeSystem codeSystem = new CodeSystem();
+			codeSystem.setUrl(CS_URL);
+			codeSystem.setContent(CodeSystemContentMode.NOTPRESENT);
+			IIdType id = myCodeSystemDao.create(codeSystem, mySrd).getId().toUnqualified();
+
+			ResourceTable table = myResourceTableDao.findById(id.getIdPartAsLong()).orElseThrow(IllegalArgumentException::new);
+
+			TermCodeSystemVersion cs = new TermCodeSystemVersion();
+			cs.setResource(table);
+
+			TermConcept code;
+			code = new TermConcept(cs, "50015-7");
+			code.addPropertyString("SYSTEM", "Bld/Bone mar^Donor");
+			cs.getConcepts().add(code);
+
+			code = new TermConcept(cs, "43343-3");
+			code.addPropertyString("SYSTEM", "Ser");
+			cs.getConcepts().add(code);
+
+			myTermSvc.storeNewCodeSystemVersion(table.getId(), CS_URL, "SYSTEM NAME", cs);
+		});
+	}
+
 	@Test
 	public void testCreateDuplicateCodeSystemUri() {
 		CodeSystem codeSystem = new CodeSystem();
@@ -143,6 +174,40 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 
 	}
 
+	@Test
+	public void testCreatePropertiesAndDesignationsWithDeferredConcepts() {
+		myDaoConfig.setDeferIndexingForCodesystemsOfSize(1);
+		BaseHapiTerminologySvcImpl.setForceSaveDeferredAlwaysForUnitTest(true);
+
+		createCodeSystem();
+
+		Validate.notNull(myTermSvc);
+		myTermSvc.saveDeferred();
+		myTermSvc.saveDeferred();
+		myTermSvc.saveDeferred();
+		myTermSvc.saveDeferred();
+		myTermSvc.saveDeferred();
+		myTermSvc.saveDeferred();
+
+		ValueSet vs = new ValueSet();
+		ValueSet.ConceptSetComponent include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include.addConcept().setCode("childAAB");
+		ValueSet outcome = myTermSvc.expandValueSet(vs);
+
+		List<String> codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("childAAB"));
+
+		ValueSet.ValueSetExpansionContainsComponent concept = outcome.getExpansion().getContains().get(0);
+		assertEquals("childAAB", concept.getCode());
+		assertEquals("http://example.com/my_code_system", concept.getSystem());
+		assertEquals(null, concept.getDisplay());
+		assertEquals("D1S", concept.getDesignation().get(0).getUse().getSystem());
+		assertEquals("D1C", concept.getDesignation().get(0).getUse().getCode());
+		assertEquals("D1D", concept.getDesignation().get(0).getUse().getDisplay());
+		assertEquals("D1V", concept.getDesignation().get(0).getValue());
+	}
+
 	@Test
 	public void testExpandValueSetPropertySearch() {
 		createCodeSystem();
@@ -194,6 +259,123 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 
 	}
 
+	@Test
+	public void testExpandValueSetPropertySearchWithRegexExclude() {
+		createLoincSystemWithSomeCodes();
+
+		List<String> codes;
+		ValueSet vs;
+		ValueSet outcome;
+		ValueSet.ConceptSetComponent exclude;
+
+		// Include
+		vs = new ValueSet();
+		vs.getCompose()
+			.addInclude()
+			.setSystem(CS_URL);
+
+		exclude = vs.getCompose().addExclude();
+		exclude.setSystem(CS_URL);
+		exclude
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue(".*\\^Donor$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("43343-3"));
+	}
+
+	@Test
+	public void testExpandValueSetPropertySearchWithRegexInclude() {
+		// create codes with "SYSTEM" property "Bld/Bone mar^Donor" and "Ser"
+		createLoincSystemWithSomeCodes();
+
+		List<String> codes;
+		ValueSet vs;
+		ValueSet outcome;
+		ValueSet.ConceptSetComponent include;
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue(".*\\^Donor$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("50015-7"));
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue("\\^Donor$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("50015-7"));
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue("\\^Dono$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, empty());
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue("^Donor$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, empty());
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue("\\^Dono");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("50015-7"));
+
+		// Include
+		vs = new ValueSet();
+		include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include
+			.addFilter()
+			.setProperty("SYSTEM")
+			.setOp(ValueSet.FilterOperator.REGEX)
+			.setValue("^Ser$");
+		outcome = myTermSvc.expandValueSet(vs);
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("43343-3"));
+
+	}
+
 	@Test
 	public void testExpandValueSetWholeSystem() {
 		createCodeSystem();
@@ -209,73 +391,6 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 		assertThat(codes, containsInAnyOrder("ParentWithNoChildrenA", "ParentWithNoChildrenB", "ParentWithNoChildrenC", "ParentA", "childAAA", "childAAB", "childAA", "childAB", "ParentB"));
 	}
 
-	@Test
-	public void testPropertiesAndDesignationsPreservedInExpansion() {
-		createCodeSystem();
-
-		List<String> codes;
-
-		ValueSet vs = new ValueSet();
-		ValueSet.ConceptSetComponent include = vs.getCompose().addInclude();
-		include.setSystem(CS_URL);
-		include.addConcept().setCode("childAAB");
-		ValueSet outcome = myTermSvc.expandValueSet(vs);
-
-		codes = toCodesContains(outcome.getExpansion().getContains());
-		assertThat(codes, containsInAnyOrder("childAAB"));
-
-		ValueSet.ValueSetExpansionContainsComponent concept = outcome.getExpansion().getContains().get(0);
-		assertEquals("childAAB", concept.getCode());
-		assertEquals("http://example.com/my_code_system", concept.getSystem());
-		assertEquals(null, concept.getDisplay());
-		assertEquals("D1S", concept.getDesignation().get(0).getUse().getSystem());
-		assertEquals("D1C", concept.getDesignation().get(0).getUse().getCode());
-		assertEquals("D1D", concept.getDesignation().get(0).getUse().getDisplay());
-		assertEquals("D1V", concept.getDesignation().get(0).getValue());
-	}
-
-	@After
-	public void after() {
-		myDaoConfig.setDeferIndexingForCodesystemsOfSize(new DaoConfig().getDeferIndexingForCodesystemsOfSize());
-		BaseHapiTerminologySvcImpl.setForceSaveDeferredAlwaysForUnitTest(false);
-	}
-
-
-	@Test
-	public void testCreatePropertiesAndDesignationsWithDeferredConcepts() {
-		myDaoConfig.setDeferIndexingForCodesystemsOfSize(1);
-		BaseHapiTerminologySvcImpl.setForceSaveDeferredAlwaysForUnitTest(true);
-
-		createCodeSystem();
-
-		Validate.notNull(myTermSvc);
-		myTermSvc.saveDeferred();
-		myTermSvc.saveDeferred();
-		myTermSvc.saveDeferred();
-		myTermSvc.saveDeferred();
-		myTermSvc.saveDeferred();
-		myTermSvc.saveDeferred();
-
-		ValueSet vs = new ValueSet();
-		ValueSet.ConceptSetComponent include = vs.getCompose().addInclude();
-		include.setSystem(CS_URL);
-		include.addConcept().setCode("childAAB");
-		ValueSet outcome = myTermSvc.expandValueSet(vs);
-
-		List<String> codes = toCodesContains(outcome.getExpansion().getContains());
-		assertThat(codes, containsInAnyOrder("childAAB"));
-
-		ValueSet.ValueSetExpansionContainsComponent concept = outcome.getExpansion().getContains().get(0);
-		assertEquals("childAAB", concept.getCode());
-		assertEquals("http://example.com/my_code_system", concept.getSystem());
-		assertEquals(null, concept.getDisplay());
-		assertEquals("D1S", concept.getDesignation().get(0).getUse().getSystem());
-		assertEquals("D1C", concept.getDesignation().get(0).getUse().getCode());
-		assertEquals("D1D", concept.getDesignation().get(0).getUse().getDisplay());
-		assertEquals("D1V", concept.getDesignation().get(0).getValue());
-	}
-
-
 	@Test
 	public void testFindCodesAbove() {
 		IIdType id = createCodeSystem();
@@ -377,6 +492,31 @@ public class TerminologySvcImplDstu3Test extends BaseJpaDstu3Test {
 		assertThat(codes, empty());
 	}
 
+	@Test
+	public void testPropertiesAndDesignationsPreservedInExpansion() {
+		createCodeSystem();
+
+		List<String> codes;
+
+		ValueSet vs = new ValueSet();
+		ValueSet.ConceptSetComponent include = vs.getCompose().addInclude();
+		include.setSystem(CS_URL);
+		include.addConcept().setCode("childAAB");
+		ValueSet outcome = myTermSvc.expandValueSet(vs);
+
+		codes = toCodesContains(outcome.getExpansion().getContains());
+		assertThat(codes, containsInAnyOrder("childAAB"));
+
+		ValueSet.ValueSetExpansionContainsComponent concept = outcome.getExpansion().getContains().get(0);
+		assertEquals("childAAB", concept.getCode());
+		assertEquals("http://example.com/my_code_system", concept.getSystem());
+		assertEquals(null, concept.getDisplay());
+		assertEquals("D1S", concept.getDesignation().get(0).getUse().getSystem());
+		assertEquals("D1C", concept.getDesignation().get(0).getUse().getCode());
+		assertEquals("D1D", concept.getDesignation().get(0).getUse().getDisplay());
+		assertEquals("D1V", concept.getDesignation().get(0).getValue());
+	}
+
 	@Test
 	public void testReindexTerminology() {
 		IIdType id = createCodeSystem();

hapi-fhir-jpaserver-base/src/test/resources/loinc/Part.csv

@@ -38,3 +38,4 @@
 "LP7057-5","SYSTEM","Bld","Blood","ACTIVE"
 "LP6838-9","PROPERTY","NFr","Number Fraction","ACTIVE"
 "LP6141-8","METHOD","Automated count","Automated count","ACTIVE"
+"LP15842-5","COMPONENT","Pyridoxine","Pyridoxine","ACTIVE"

hapi-fhir-jpaserver-base/src/test/resources/loinc/PartRelatedCodeMapping.csv

@@ -1,10 +1,12 @@
-"PartNumber","PartName","PartTypeName","ExtCodeId","ExtCodeDisplayName","ExtCodeSystem","MapType","ContentOrigin","ExtCodeSystemVersion","ExtCodeSystemCopyrightNotice"
-"LP18172-4","Interferon.beta","COMPONENT"," 420710006","Interferon beta (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP31706-2","Nornicotine","COMPONENT","1018001","Nornicotine (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP15826-8","Prostaglandin F2","COMPONENT","10192006","Prostaglandin PGF2 (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP7400-7","Liver","SYSTEM","10200004","Liver structure (body structure)","http://snomed.info/sct","LOINC broader","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP29165-5","Liver.FNA","SYSTEM","10200004","Liver structure (body structure)","http://snomed.info/sct","LOINC broader","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP15666-8","Inosine","COMPONENT","102640000","Inosine (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP15943-1","Uronate","COMPONENT","102641001","Uronic acid (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP15791-4","Phenylketones","COMPONENT","102642008","Phenylketones (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
-"LP15721-1","Malonate","COMPONENT","102648007","Malonic acid (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"PartNumber","PartName","PartTypeName","ExtCodeId","ExtCodeDisplayName","ExtCodeSystem","MapType","ContentOrigin","ExtCodeSystemVersion","ExtCodeSystemCopyrightNotice"
+"LP18172-4","Interferon.beta","COMPONENT"," 420710006","Interferon beta (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP31706-2","Nornicotine","COMPONENT","1018001","Nornicotine (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15826-8","Prostaglandin F2","COMPONENT","10192006","Prostaglandin PGF2 (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP7400-7","Liver","SYSTEM","10200004","Liver structure (body structure)","http://snomed.info/sct","LOINC broader","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP29165-5","Liver.FNA","SYSTEM","10200004","Liver structure (body structure)","http://snomed.info/sct","LOINC broader","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15666-8","Inosine","COMPONENT","102640000","Inosine (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15943-1","Uronate","COMPONENT","102641001","Uronic acid (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15791-4","Phenylketones","COMPONENT","102642008","Phenylketones (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15721-1","Malonate","COMPONENT","102648007","Malonic acid (substance)","http://snomed.info/sct","Exact","Both","http://snomed.info/sct/900000000000207008/version/20170731","This material includes SNOMED Clinical Terms® (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO.This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement. It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org<mailto:info@snomed.org>.  This may incur a fee in SNOMED International non-Member countries."
+"LP15842-5","Pyridoxine","COMPONENT","1054","Pyridoxine","http://pubchem.ncbi.nlm.nih.gov","Exact",,,
+"LP15842-5","Pyridoxine","COMPONENT","1054","Pyridoxine","http://foo/bar","Exact",,,

hapi-fhir-jpaserver-elasticsearch/src/main/java/ca/uhn/fhir/jpa/search/ElasticsearchMappingProvider.java

@@ -20,6 +20,7 @@ package ca.uhn.fhir.jpa.search;
  * #L%
  */
 
+import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory;
 import org.hibernate.search.elasticsearch.analyzer.definition.ElasticsearchAnalysisDefinitionRegistryBuilder;
 import org.hibernate.search.elasticsearch.analyzer.definition.ElasticsearchAnalysisDefinitionProvider;
 
@@ -57,5 +58,8 @@ public class ElasticsearchMappingProvider implements ElasticsearchAnalysisDefini
 		builder.analyzer("exactAnalyzer").withTokenizer("standard");
 
 		builder.analyzer("conceptParentPidsAnalyzer").withTokenizer("whitespace");
+
+		builder.analyzer("termConceptPropertyAnalyzer").withTokenizer("whitespace");
+
 	}
 }

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.rest.server;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationFlagsEnum.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.server.interceptor.auth;
 
+/*-
+ * #%L
+ * HAPI FHIR - Server Framework
+ * %%
+ * Copyright (C) 2014 - 2018 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import java.util.Collection;
 
 /**

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/AuthorizationInterceptor.java

@@ -9,9 +9,9 @@ package ca.uhn.fhir.rest.server.interceptor.auth;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOp.java

@@ -36,9 +36,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-validation/src/test/java/fluentpath/Example20_ValidateResource.java

@@ -0,0 +1,30 @@
+package fluentpath;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.parser.IParser;
+import ca.uhn.fhir.validation.FhirValidator;
+import ca.uhn.fhir.validation.ValidationResult;
+import org.hl7.fhir.dstu3.model.Encounter;
+import org.hl7.fhir.dstu3.model.OperationOutcome;
+
+public class Example20_ValidateResource {
+	public static void main(String[] args) {
+		
+		// Create an incomplete encounter (status is required)
+		Encounter enc = new Encounter();
+		enc.addIdentifier().setSystem("http://acme.org/encNums").setValue("12345");
+		
+		// Create a new validator
+		FhirContext ctx = FhirContext.forDstu3();
+		FhirValidator validator = ctx.newValidator();
+		
+		// Did we succeed?
+		ValidationResult result = validator.validateWithResult(enc);
+		System.out.println("Success: " + result.isSuccessful());
+		
+		// What was the result
+		OperationOutcome outcome = (OperationOutcome) result.toOperationOutcome();
+		IParser parser = ctx.newXmlParser().setPrettyPrint(true);
+		System.out.println(parser.encodeResourceToString(outcome));
+	}
+}

hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/utils/FhirPathEngineTest.java

@@ -1,45 +1,59 @@
 package org.hl7.fhir.dstu3.utils;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport;
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.util.TestUtil;
 import org.hl7.fhir.dstu3.hapi.ctx.HapiWorkerContext;
+import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport;
 import org.hl7.fhir.dstu3.model.*;
+import org.hl7.fhir.exceptions.FHIRException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.util.TestUtil;
+import java.util.List;
+
+import static org.junit.Assert.*;
 
 public class FhirPathEngineTest {
 
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirPathEngineTest.class);
 	private static FhirContext ourCtx = FhirContext.forDstu3();
 	private static FHIRPathEngine ourEngine;
-	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirPathEngineTest.class);
 
 	@Test
 	public void testAs() throws Exception {
 		Observation obs = new Observation();
 		obs.setValue(new StringType("FOO"));
-		
+
 		List<Base> value = ourEngine.evaluate(obs, "Observation.value.as(String)");
 		assertEquals(1, value.size());
-		assertEquals("FOO", ((StringType)value.get(0)).getValue());
+		assertEquals("FOO", ((StringType) value.get(0)).getValue());
 	}
-	
+
+	@Test
+	public void testCrossResourceBoundaries() throws FHIRException {
+		Specimen specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-01"));
+		Observation o = new Observation();
+		o.getContained().add(specimen);
+
+		o.setId("O1");
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+
+		List<Base> value = ourEngine.evaluate(o, "Observation.specimen.resolve().receivedTime");
+		assertEquals(1, value.size());
+		assertEquals("2011-01-01", ((DateTimeType) value.get(0)).getValueAsString());
+	}
+
 	@Test
 	public void testExistsWithNoValue() throws FHIRException {
 		Patient patient = new Patient();
 		patient.setDeceased(new BooleanType());
 		List<Base> eval = ourEngine.evaluate(patient, "Patient.deceased.exists()");
 		ourLog.info(eval.toString());
-		assertFalse(((BooleanType)eval.get(0)).getValue());
+		assertFalse(((BooleanType) eval.get(0)).getValue());
 	}
 
 	@Test
@@ -48,7 +62,7 @@ public class FhirPathEngineTest {
 		patient.setDeceased(new BooleanType(false));
 		List<Base> eval = ourEngine.evaluate(patient, "Patient.deceased.exists()");
 		ourLog.info(eval.toString());
-		assertTrue(((BooleanType)eval.get(0)).getValue());
+		assertTrue(((BooleanType) eval.get(0)).getValue());
 	}
 
 	@AfterClass

hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/utils/FhirPathEngineR4Test.java

@@ -3,14 +3,12 @@ package org.hl7.fhir.r4.utils;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.util.TestUtil;
 import org.hl7.fhir.dstu3.utils.FhirPathEngineTest;
+import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r4.hapi.ctx.DefaultProfileValidationSupport;
 import org.hl7.fhir.r4.hapi.ctx.HapiWorkerContext;
 import org.hl7.fhir.r4.model.*;
-import org.hl7.fhir.r4.utils.FHIRPathEngine;
-import org.hl7.fhir.exceptions.FHIRException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -23,6 +21,23 @@ public class FhirPathEngineR4Test {
 	private static FHIRPathEngine ourEngine;
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirPathEngineTest.class);
 
+	@Test
+	public void testCrossResourceBoundaries() throws FHIRException {
+		Specimen specimen = new Specimen();
+		specimen.setId("#FOO");
+		specimen.setReceivedTimeElement(new DateTimeType("2011-01-01"));
+		Observation o = new Observation();
+		o.getContained().add(specimen);
+
+		o.setId("O1");
+		o.setStatus(Observation.ObservationStatus.FINAL);
+		o.setSpecimen(new Reference("#FOO"));
+
+		List<Base> value = ourEngine.evaluate(o, "Observation.specimen.resolve().receivedTime");
+		assertEquals(1, value.size());
+		assertEquals("2011-01-01", ((DateTimeType) value.get(0)).getValueAsString());
+	}
+
 	@Test
 	public void testAs() throws Exception {
 		Observation obs = new Observation();

src/changes/changes.xml

@@ -66,6 +66,22 @@
 				<![CDATA[<code>setFlags(flags)</code>]]>
 				can be used to maintain the previous behaviour.
 			</action>
+			<action type="974">
+				JPA server loading logic has been improved to enhance performance when
+				loading a large number of results in a page, or when loading multiple
+				search results with tags. Thanks to Frank Tao for the pull request!
+			</action>
+			<action type="add" issue="1000">
+				LOINC uploader has been updated to support the new LOINC filename
+				scheme introduced in LOINC 2.64. Thanks to Rob Hausam for the 
+				pull request!
+			</action>
+			<action type="add">
+				In the JPA server, it is now possible for a custom search parameter
+				to use the
+				<![CDATA[<code>resolve()</code>]]> function in its path to descend into
+				contained resources and index fields within them.
+			</action>
 		</release>
 		<release version="3.4.0" date="2018-05-28">
 			<action type="add">