Merge branch 'master' into ks-source-request-id-append-bug

README.md

@@ -6,12 +6,10 @@ HAPI FHIR - Java API for HL7 FHIR Clients and Servers
 [![Coverage Status](https://coveralls.io/repos/jamesagnew/hapi-fhir/badge.svg?branch=master&service=github)](https://coveralls.io/github/jamesagnew/hapi-fhir?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ca.uhn.hapi.fhir/hapi-fhir-base/badge.svg)](http://search.maven.org/#search|ga|1|ca.uhn.hapi.fhir)
 [![License](https://img.shields.io/badge/license-apache%202.0-60C060.svg)](http://jamesagnew.github.io/hapi-fhir/license.html)
-
-* Linux Build: [![Build Status](https://travis-ci.org/jamesagnew/hapi-fhir.svg?branch=master)](https://travis-ci.org/jamesagnew/hapi-fhir)
-* Windows Build: <a href="https://ci.appveyor.com/project/jamesagnew/hapi-fhir"><img src="https://ci.appveyor.com/api/projects/status/github/jamesagnew/hapi-fhir?branch=master&svg=true"></a>
+[![Build Status](https://dev.azure.com/jamesagnew214/jamesagnew214/_apis/build/status/jamesagnew.hapi-fhir?branchName=master)](https://dev.azure.com/jamesagnew214/jamesagnew214/_build/latest?definitionId=1&branchName=master)
 
 Complete project documentation is available here:
-http://jamesagnew.github.io/hapi-fhir/
+http://hapifhir.io
 
 A demonstration of this project is available here:
 http://hapi.fhir.org/
@@ -19,3 +17,5 @@ http://hapi.fhir.org/
 This project is Open Source, licensed under the Apache Software License 2.0.
 
 Please see [this wiki page](https://github.com/jamesagnew/hapi-fhir/wiki/Getting-Help) for information on where to get help with HAPI FHIR. Please see [Smile CDR](https://smilecdr.com) for information on commercial support.
+
+---

appveyor.yml

@@ -1,9 +0,0 @@
-version: 1.0.{build}
-image: Visual Studio 2017
-cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2\repository
-build_script:
-  - SET JAVA_HOME=C:\Program Files\Java\jdk10
-  - SET PATH=C:\Program Files\Java\jdk10\bin;%PATH%
-  - cmd: mvn -P MINPARALLEL,ALLMODULES,REDUCED_JPA_TESTS clean install

azure-pipelines.yml

@@ -0,0 +1,56 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+variables:
+  MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
+  MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+
+jobs:
+  - job: Build
+    timeoutInMinutes: 360
+    steps:
+      - task: CacheBeta@0
+        inputs:
+          key: maven
+          path: $(MAVEN_CACHE_FOLDER)
+          displayName: Cache Maven local repo
+
+      - task: Maven@3
+        inputs:
+          #mavenPomFile: 'pom.xml' 
+          goals: 'clean install' # Optional
+          options: ''
+          #publishJUnitResults: true 
+          #testResultsFiles: '**/surefire-reports/TEST-*.xml' # Required when publishJUnitResults == True
+          #testRunTitle: # Optional
+          #codeCoverageToolOption: 'None' # Optional. Options: none, cobertura, jaCoCo. Enabling code coverage inserts the `clean` goal into the Maven goals list when Maven runs.
+          #codeCoverageClassFilter: # Optional. Comma-separated list of filters to include or exclude classes from collecting code coverage. For example: +:com.*,+:org.*,-:my.app*.*
+          #codeCoverageClassFilesDirectories: # Optional
+          #codeCoverageSourceDirectories: # Optional
+          #codeCoverageFailIfEmpty: false # Optional
+          #javaHomeOption: 'JDKVersion' # Options: jDKVersion, path
+          #jdkVersionOption: 'default' # Optional. Options: default, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6
+          #jdkDirectory: # Required when javaHomeOption == Path
+          #jdkArchitectureOption: 'x64' # Optional. Options: x86, x64
+          #mavenVersionOption: 'Default' # Options: default, path
+          #mavenDirectory: # Required when mavenVersionOption == Path
+          #mavenSetM2Home: false # Required when mavenVersionOption == Path
+          mavenOptions: '-Xmx2048m $(MAVEN_OPTS)' # Optional
+          #mavenAuthenticateFeed: false 
+          #effectivePomSkip: false 
+          #sonarQubeRunAnalysis: false 
+          #sqMavenPluginVersionChoice: 'latest' # Required when sonarQubeRunAnalysis == True# Options: latest, pom
+          #checkStyleRunAnalysis: false # Optional
+          #pmdRunAnalysis: false # Optional
+          #findBugsRunAnalysis: false # Optional
+
+

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java

@@ -19,25 +19,27 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-import static ca.uhn.fhir.model.primitive.IdDt.isValidLong;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-import java.math.BigDecimal;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.util.CoverageIgnore;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+
+import java.math.BigDecimal;
+
+import static ca.uhn.fhir.model.primitive.IdDt.isValidLong;
+import static org.apache.commons.lang3.StringUtils.*;
 
 public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/ {
 
 	private String myChain;
+	private String myResourceType;
+	private String myBaseUrl;
+	private String myValue;
+	private String myIdPart;
 
-	private final IdDt myId = new IdDt();
 	/**
 	 * Constructor
 	 */
@@ -64,12 +66,15 @@ public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/
 	 * Constructor
 	 */
 	public ReferenceParam(String theResourceType, String theChain, String theValue) {
+		String qualifier = "";
 		if (isNotBlank(theResourceType)) {
-			setValue(theResourceType + "/" + theValue);
-		} else {
-			setValue(theValue);
+			qualifier = ":" + theResourceType;
 		}
-		setChain(theChain);
+		if (isNotBlank(theChain)) {
+			qualifier = qualifier + "." + theChain;
+		}
+
+		setValueAsQueryToken(null, null, qualifier, theValue);
 	}
 
 	@Override
@@ -91,55 +96,54 @@ public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/
 
 	@Override
 	String doGetValueAsQueryToken(FhirContext theContext) {
-		if (isBlank(myId.getResourceType())) {
-			return myId.getValue(); // e.g. urn:asdjd or 123 or cid:wieiuru or #1
+		if (isBlank(getResourceType())) {
+			return myValue; // e.g. urn:asdjd or 123 or cid:wieiuru or #1
 		} else {
-			if (isBlank(getChain())) {
-				return getResourceType() + "/" + myId.getIdPart();
+			if (isBlank(getChain()) && isNotBlank(getResourceType())) {
+				return getResourceType() + "/" + getIdPart();
 			}
-			return myId.getIdPart();
+			return myValue;
 		}
 	}
 
 	@Override
 	void doSetValueAsQueryToken(FhirContext theContext, String theParamName, String theQualifier, String theValue) {
 		String q = theQualifier;
-		String resourceType = null;
-		boolean skipSetValue = false;
 		if (isNotBlank(q)) {
 			if (q.startsWith(":")) {
 				int nextIdx = q.indexOf('.');
 				if (nextIdx != -1) {
-					resourceType = q.substring(1, nextIdx);
 					myChain = q.substring(nextIdx + 1);
-					// type is explicitly defined so use it
-					myId.setParts(null, resourceType, theValue, null);
-					skipSetValue = true;
+					myResourceType = q.substring(1, nextIdx);
+					myValue = theValue;
+					myIdPart = theValue;
 				} else {
-					resourceType = q.substring(1);
+					myChain = null;
+					myResourceType = q.substring(1);
+					myValue = theValue;
+					myIdPart = theValue;
 				}
 			} else if (q.startsWith(".")) {
 				myChain = q.substring(1);
-				// type not defined but this is a chain, so treat value as opaque
-				myId.setParts(null, null, theValue, null);
-				skipSetValue = true;
+				myResourceType = null;
+				myValue = theValue;
+				myIdPart = theValue;
 			}
+		} else {
+			myChain = null;
+			myValue = theValue;
+			IdDt id = new IdDt(theValue);
+			myResourceType = id.getResourceType();
+			myIdPart = id.getIdPart();
+			myBaseUrl = id.getBaseUrl();
 		}
 
-		if (!skipSetValue) {
-			setValue(theValue);
-
-			if (isNotBlank(resourceType) && isBlank(getResourceType())) {
-				setValue(resourceType + '/' + theValue);
-			}
-		}
 	}
 
 
-
 	@CoverageIgnore
 	public String getBaseUrl() {
-		return myId.getBaseUrl();
+		return myBaseUrl;
 	}
 
 
@@ -147,24 +151,34 @@ public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/
 		return myChain;
 	}
 
+	public ReferenceParam setChain(String theChain) {
+		myChain = theChain;
+		return this;
+	}
 
 	@CoverageIgnore
 	public String getIdPart() {
-		return myId.getIdPart();
+		return myIdPart;
 	}
 
 	@CoverageIgnore
 	public BigDecimal getIdPartAsBigDecimal() {
-		return myId.getIdPartAsBigDecimal();
+		return new IdDt(myValue).getIdPartAsBigDecimal();
 	}
-	
+
 	@CoverageIgnore
 	public Long getIdPartAsLong() {
-		return myId.getIdPartAsLong();
+		return new IdDt(myValue).getIdPartAsLong();
 	}
 
 	public String getResourceType() {
-		return myId.getResourceType();
+		if (isNotBlank(myResourceType)) {
+			return myResourceType;
+		}
+		if (isBlank(myChain)) {
+			return new IdDt(myValue).getResourceType();
+		}
+		return null;
 	}
 
 	public Class<? extends IBaseResource> getResourceType(FhirContext theCtx) {
@@ -175,11 +189,21 @@ public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/
 	}
 
 	public String getValue() {
-		return myId.getValue();
+		return myValue;
+	}
+
+	public ReferenceParam setValue(String theValue) {
+		IdDt id = new IdDt(theValue);
+		String qualifier= null;
+		if (id.hasResourceType()) {
+			qualifier = ":" + id.getResourceType();
+		}
+		setValueAsQueryToken(null, null, qualifier, id.getIdPart());
+		return this;
 	}
 
 	public boolean hasResourceType() {
-		return myId.hasResourceType();
+		return isNotBlank(myResourceType);
 	}
 
 	@Override
@@ -187,16 +211,6 @@ public class ReferenceParam extends BaseParam /*implements IQueryParameterType*/
 		return true;
 	}
 
-	public ReferenceParam setChain(String theChain) {
-		myChain = theChain;
-		return this;
-	}
-
-	public ReferenceParam setValue(String theValue) {
-		myId.setValue(theValue);
-		return this;
-	}
-
 	/**
 	 * Returns a new param containing the same value as this param, but with the type copnverted
 	 * to {@link DateParam}. This is useful if you are using reference parameters and want to handle

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/interceptors/interceptors.md

@@ -7,3 +7,4 @@ Interceptor classes may "hook into" various points in the processing chain in bo
 ```java
 {{snippet:classpath:/ca/uhn/hapi/fhir/docs/MyInterceptor.java|sampleClass}}
 ```
+

hapi-fhir-jaxrsserver-base/pom.xml

@@ -50,31 +50,26 @@
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
 			<version>${project.version}</version>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
 			<version>${project.version}</version>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
 			<version>${project.version}</version>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu3</artifactId>
 			<version>${project.version}</version>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
 			<version>${project.version}</version>
-			<optional>true</optional>
 		</dependency>
 
 		<dependency>

hapi-fhir-jpaserver-base/pom.xml

@@ -212,7 +212,6 @@
 		<dependency>
 			<groupId>com.github.dnault</groupId>
 			<artifactId>xml-patch</artifactId>
-			<version>0.3.0</version>
 		</dependency>
 
 		<!-- FHIR RI is pulled in for UCUM support, but we don't want any of its dependencies. -->

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

@@ -573,7 +573,7 @@ public class SearchBuilder implements ISearchBuilder {
 	private Predicate addPredicateReferenceWithChain(String theResourceName, String theParamName, List<? extends IQueryParameterType> theList, Join<ResourceTable, ResourceLink> theJoin, List<Predicate> theCodePredicates, ReferenceParam theRef, RequestDetails theRequest) {
 		final List<Class<? extends IBaseResource>> resourceTypes;
 		String resourceId;
-		if (!theRef.getValue().matches("[a-zA-Z]+/.*")) {
+		if (!theRef.hasResourceType()) {
 
 			RuntimeSearchParam param = mySearchParamRegistry.getActiveSearchParam(theResourceName, theParamName);
 			resourceTypes = new ArrayList<>();

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

@@ -35,10 +35,10 @@ public interface ITermCodeSystemVersionDao extends JpaRepository<TermCodeSystemV
 	@Query("DELETE FROM TermCodeSystemVersion csv WHERE csv.myCodeSystem = :cs")
 	void deleteForCodeSystem(@Param("cs") TermCodeSystem theCodeSystem);
 
-	@Query("SELECT cs FROM TermCodeSystemVersion cs WHERE cs.myResourcePid = :resource_id")
-	List<TermCodeSystemVersion> findByCodeSystemPid(@Param("resource_id") Long theCodeSystemResourcePid);
+	@Query("SELECT cs FROM TermCodeSystemVersion cs WHERE cs.myCodeSystemPid = :codesystem_pid")
+	List<TermCodeSystemVersion> findByCodeSystemPid(@Param("codesystem_pid") Long theCodeSystemPid);
 
-	@Query("SELECT cs FROM TermCodeSystemVersion cs WHERE cs.myResource.myId = :resource_id")
+	@Query("SELECT cs FROM TermCodeSystemVersion cs WHERE cs.myResourcePid = :resource_id")
 	List<TermCodeSystemVersion> findByCodeSystemResourcePid(@Param("resource_id") Long theCodeSystemResourcePid);
 
 	@Query("SELECT cs FROM TermCodeSystemVersion cs WHERE cs.myCodeSystemHavingThisVersionAsCurrentVersionIfAny.myResource.myId = :resource_id")

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

@@ -58,6 +58,7 @@ public class TermCodeSystemVersion implements Serializable {
 
 	@Column(name = "CS_VERSION_ID", nullable = true, updatable = false, length = MAX_VERSION_LENGTH)
 	private String myCodeSystemVersionId;
+
 	/**
 	 * This was added in HAPI FHIR 3.3.0 and is nullable just to avoid migration
 	 * issued. It should be made non-nullable at some point.
@@ -65,8 +66,11 @@ public class TermCodeSystemVersion implements Serializable {
 	@ManyToOne
 	@JoinColumn(name = "CODESYSTEM_PID", referencedColumnName = "PID", nullable = true, foreignKey = @ForeignKey(name = "FK_CODESYSVER_CS_ID"))
 	private TermCodeSystem myCodeSystem;
-	@SuppressWarnings("unused")
 
+	@Column(name = "CODESYSTEM_PID", insertable = false, updatable = false)
+	private Long myCodeSystemPid;
+
+	@SuppressWarnings("unused")
 	@OneToOne(mappedBy = "myCurrentVersion", optional = true)
 	private TermCodeSystem myCodeSystemHavingThisVersionAsCurrentVersionIfAny;
 

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

@@ -1368,11 +1368,14 @@ public class FhirResourceDaoR4SearchNoFtTest extends BaseJpaR4Test {
 			map.setLastUpdated(new DateRangeParam().setUpperBound(new DateParam(ParamPrefixEnum.LESSTHAN, "2022-01-01")));
 			IBundleProvider found = myPatientDao.search(map);
 			Set<String> dates = new HashSet<>();
+			String searchId = found.getUuid();
 			for (int i = 0; i < 9; i++) {
 				List<IBaseResource> resources = found.getResources(i, i + 1);
-				assertThat("Failed to load range " + i + " - " + (i + 1), resources, hasSize(1));
+				assertThat("Failed to load range " + i + " - " + (i + 1) + " - from provider of type: " + found.getClass(), resources, hasSize(1));
 				Patient nextResource = (Patient) resources.get(0);
 				dates.add(nextResource.getBirthDateElement().getValueAsString());
+
+				found = myPagingProvider.retrieveResultList(null, searchId);
 			}
 
 			assertThat(dates, hasItems(

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

@@ -120,7 +120,7 @@ public class FhirResourceDaoR4SearchOptimizedTest extends BaseJpaR4Test {
 
 		myDaoConfig.setSearchPreFetchThresholds(Arrays.asList(20, 50, 190));
 
-		// Seach with count only
+		// Search with count only
 		SearchParameterMap params = new SearchParameterMap();
 		params.add(Patient.SP_NAME, new StringParam("FAM"));
 		params.setSummaryMode((SummaryEnum.COUNT));
@@ -142,7 +142,9 @@ public class FhirResourceDaoR4SearchOptimizedTest extends BaseJpaR4Test {
 		assertEquals(201, results.size().intValue());
 		ids = toUnqualifiedVersionlessIdValues(results, 0, 10, true);
 		assertThat(ids, hasSize(10));
-		assertEquals(201, myDatabaseBackedPagingProvider.retrieveResultList(null, uuid).size().intValue());
+		IBundleProvider bundleProvider = myDatabaseBackedPagingProvider.retrieveResultList(null, uuid);
+		Integer bundleSize = bundleProvider.size();
+		assertEquals(201, bundleSize.intValue());
 
 		// Search with count only
 		params = new SearchParameterMap();

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java

@@ -167,6 +167,54 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 
 	}
 
+	@Test
+	public void testSearchWithSlashes() {
+		myDaoConfig.setSearchPreFetchThresholds(Lists.newArrayList(10, 50, 10000));
+
+		Procedure procedure = new Procedure();
+		procedure.setStatus(Procedure.ProcedureStatus.COMPLETED);
+		String procedureId = ourClient.create().resource(procedure).execute().getId().toUnqualifiedVersionless().getValue();
+
+		DocumentReference dr = new DocumentReference();
+		dr.addContent().getAttachment().setContentType("application/vnd.mfer");
+		String drId = ourClient.create().resource(dr).execute().getId().toUnqualifiedVersionless().getValue();
+
+		for (int i = 0; i < 60; i++) {
+			Observation obs = new Observation();
+			obs.addPartOf().setReference(procedureId);
+			obs.addDerivedFrom().setReference(drId);
+			ourClient.create().resource(obs).execute();
+		}
+
+		ourLog.info("Starting search");
+
+		Bundle response = ourClient
+			.search()
+			.byUrl("Observation?part-of=" + procedureId + "&derived-from:DocumentReference.contenttype=application/vnd.mfer&_total=accurate&_count=2")
+			.returnBundle(Bundle.class)
+			.execute();
+
+		int obsCount = 0;
+		int pageCount = 0;
+		while (response != null) {
+			obsCount += response.getEntry().size();
+			pageCount++;
+			if (response.getLink("next") != null) {
+				response = ourClient.loadPage().next(response).execute();
+			} else {
+				response = null;
+			}
+
+
+			ourLog.info("Have loaded {} pages and {} reources", pageCount, obsCount);
+		}
+
+		assertEquals(60, obsCount);
+		assertEquals(30, pageCount);
+
+	}
+
+
 	@Test
 	public void testManualPagingLinkOffsetDoesntReturnBeyondEnd() {
 		myDaoConfig.setSearchPreFetchThresholds(Lists.newArrayList(10, 1000));

hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/param/ReferenceParamTest.java

@@ -1,39 +1,60 @@
 package ca.uhn.fhir.rest.param;
 
-import static org.junit.Assert.*;
-
-import org.junit.AfterClass;
-import org.junit.Test;
-
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.util.TestUtil;
+import com.google.common.base.Charsets;
+import org.apache.commons.lang3.SerializationUtils;
+import org.junit.AfterClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.Assert.assertEquals;
 
 public class ReferenceParamTest {
 
+	private static final Logger ourLog = LoggerFactory.getLogger(ReferenceParamTest.class);
 	private FhirContext ourCtx = FhirContext.forDstu3();
 
+	@Test
+	public void testValueWithSlashPersistsAcrossSerialization() {
+		ReferenceParam param = new ReferenceParam();
+		param.setValueAsQueryToken(ourCtx, "derived-from", ":DocumentReference.contenttype", "application/vnd.mfer");
+
+		assertEquals("application/vnd.mfer", param.getValueAsQueryToken(ourCtx));
+		assertEquals(":DocumentReference.contenttype", param.getQueryParameterQualifier());
+
+		byte[] serialized = SerializationUtils.serialize(param);
+		ourLog.info("Serialized: {}", new String(serialized, Charsets.US_ASCII));
+		param = SerializationUtils.deserialize(serialized);
+
+		assertEquals("application/vnd.mfer", param.getValueAsQueryToken(ourCtx));
+		assertEquals(":DocumentReference.contenttype", param.getQueryParameterQualifier());
+	}
+
 	@Test
 	public void testWithResourceType() {
-		
+
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, null, "Location/123");
 		assertEquals("Location", rp.getResourceType());
 		assertEquals("123", rp.getIdPart());
 		assertEquals("Location/123", rp.getValue());
 		assertEquals(null, rp.getQueryParameterQualifier());
-		
+
 	}
 
 	@Test
 	public void testWithResourceType_AbsoluteUrl() {
-		
+
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, null, "http://a.b/c/d/e");
 		assertEquals("d", rp.getResourceType());
 		assertEquals("e", rp.getIdPart());
 		assertEquals("http://a.b/c/d/e", rp.getValue());
 		assertEquals(null, rp.getQueryParameterQualifier());
-		
+
 	}
 
 	@Test
@@ -74,24 +95,26 @@ public class ReferenceParamTest {
 		assertEquals("name", rp.getChain());
 
 	}
-	
+
 	@Test
 	public void testWithResourceTypeAsQualifier() {
-		
+
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, ":Location", "123");
 		assertEquals("Location", rp.getResourceType());
 		assertEquals("123", rp.getIdPart());
-		assertEquals("Location/123", rp.getValue());
+		assertEquals("123", rp.getValue());
 		assertEquals(null, rp.getQueryParameterQualifier());
 
 	}
 
-	// TODO: verify this behavior is correct. If type is explicitly specified (i.e. :Location), should it be
-	// an error if it gets overriden by the resourceType in the url?
+	/**
+	 * TODO: is this an error?
+	 */
 	@Test
-	public void testWithResourceTypeAsQualifier_RelativeUrl() {
-		
+	@Ignore
+	public void testMismatchedTypeAndValueType() {
+
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, ":Location", "Patient/123");
 		assertEquals("Patient", rp.getResourceType());
@@ -104,11 +127,11 @@ public class ReferenceParamTest {
 	// TODO: verify this behavior is correct. Same case as testWithResourceTypeAsQualifier_RelativeUrl()
 	@Test
 	public void testWithResourceTypeAsQualifier_AbsoluteUrl() {
-		
+
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, ":Location", "http://a.b/c/d/e");
-		assertEquals("d", rp.getResourceType());
-		assertEquals("e", rp.getIdPart());
+		assertEquals("Location", rp.getResourceType());
+		assertEquals("http://a.b/c/d/e", rp.getIdPart());
 		assertEquals("http://a.b/c/d/e", rp.getValue());
 		assertEquals(null, rp.getQueryParameterQualifier());
 
@@ -122,7 +145,7 @@ public class ReferenceParamTest {
 		rp.setValueAsQueryToken(ourCtx, null, ":Location.name", "FOO");
 		assertEquals("Location", rp.getResourceType());
 		assertEquals("FOO", rp.getIdPart());
-		assertEquals("Location/FOO", rp.getValue());
+		assertEquals("FOO", rp.getValue());
 		assertEquals(":Location.name", rp.getQueryParameterQualifier());
 		assertEquals("name", rp.getChain());
 
@@ -135,7 +158,7 @@ public class ReferenceParamTest {
 		rp.setValueAsQueryToken(ourCtx, null, ":Patient.identifier", "http://hey.there/a/b|123");
 		assertEquals("Patient", rp.getResourceType());
 		assertEquals("http://hey.there/a/b|123", rp.getIdPart());
-		assertEquals("Patient/http://hey.there/a/b|123", rp.getValue());
+		assertEquals("http://hey.there/a/b|123", rp.getValue());
 		assertEquals(":Patient.identifier", rp.getQueryParameterQualifier());
 		assertEquals("identifier", rp.getChain());
 
@@ -147,8 +170,8 @@ public class ReferenceParamTest {
 		ReferenceParam rp = new ReferenceParam();
 		rp.setValueAsQueryToken(ourCtx, null, ":Patient.identifier", "http://hey.there/a/b|");
 		assertEquals("Patient", rp.getResourceType());
+		assertEquals("http://hey.there/a/b|", rp.getValue());
 		assertEquals("http://hey.there/a/b|", rp.getIdPart());
-		assertEquals("Patient/http://hey.there/a/b|", rp.getValue());
 		assertEquals(":Patient.identifier", rp.getQueryParameterQualifier());
 		assertEquals("identifier", rp.getChain());
 
@@ -161,7 +184,7 @@ public class ReferenceParamTest {
 		rp.setValueAsQueryToken(ourCtx, null, ":Patient.identifier", "|abc");
 		assertEquals("Patient", rp.getResourceType());
 		assertEquals("|abc", rp.getIdPart());
-		assertEquals("Patient/|abc", rp.getValue());
+		assertEquals("|abc", rp.getValue());
 		assertEquals(":Patient.identifier", rp.getQueryParameterQualifier());
 		assertEquals("identifier", rp.getChain());
 

pom.xml

@@ -45,14 +45,7 @@
 	</scm>
 
 	<repositories>
-		<repository>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>bintray-dnault-maven</id>
-			<name>bintray</name>
-			<url>https://dl.bintray.com/dnault/maven</url>
-		</repository>
+		<!--
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
@@ -60,12 +53,16 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
+		-->
 		<repository>
 			<id>oss-snapshot</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
 		</repository>
 	</repositories>
 

src/changes/changes.xml

@@ -193,6 +193,12 @@
 				resulted in some ValueSets with duplicate codes. This has been corrected by specifying a path with each
 				filename.
 			</action>
+			<action>
+				A corner case bug in the JPA server was solved: When performing a search that contained chained reference searches
+				where the value contained slashes (e.g.
+				<![CDATA[<code>Observation?derived-from:DocumentReference.contenttype=application/vnd.mfer</code>]]>)
+				the server could fail to load later pages in the search results.
+			</action>
 			<action type="add">
 				A new flag has been added to the JPA migrator tool that causes the migrator to not try to reduce the length
 				of existing columns in the schema.