Merge remote-tracking branch 'remotes/origin/master' into ks-20191214-skipversions

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/4_2_0/changes.yaml

@@ -1,7 +1,11 @@
 ---
 - item:
     type: "add"
-    title: "The version of a few dependencies have been bumped to the latest versions (dependent HAPI modules listed in brackets): <ul> <li>Jetty (CLI): 9.4.14.v20181114 -&gt; 9.4.23.v20191118</li> </ul>"
+    title: "The version of a few dependencies have been bumped to the latest versions
+    (dependent HAPI modules listed in brackets):
+    <ul>
+    <li>Jetty (CLI): 9.4.14.v20181114 -&gt; 9.4.23.v20191118</li>
+    </ul>"
 - item:
     issue: "1583"
     type: "fix"

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

@@ -2,10 +2,15 @@
 
 <th:block th:each="version : ${changelog.versions}">
 
-# Smile CDR <th:block th:text="${version}"/> <th:block th:if="${changelog.changes.get(version).codename} != null" th:text="' (' + ${changelog.changes.get(version).codename} + ')'"/>
+# Smile CDR <th:block th:text="${version}"/> <th:block th:if="${changelog.changes.get(version).codename} != null" th:text="' (' + ${changelog.changes.get(version).codename} + ')'"/> <th:block th:if="${changelog.releaseDate} == null">(Prerelease)</th:block>
 
 ## Release Information
 
+<th:block th:if="${changelog.changes.get(version).releaseDate} == null">
+Note: This version of HAPI FHIR is a SNAPSHOT (prerelease), meaning that it has
+not yet been released, but all changes and fixes listed here are available to try
+out as <a href="/docs/introduction/downloading_and_importing.html#snapshot">Snapshot Builds</a>.
+</th:block>
 <th:block th:if="${changelog.changes.get(version).releaseDate} != null">
 **Released:** <th:block th:text="${changelog.changes.get(version).releaseDate.getValueAsString()}"/>
 </th:block>

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

@@ -53,6 +53,8 @@ compile 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2:${project.version}'
 compile 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${project.version}'
 ```
 
+<a name="snapshot"/>
+
 # Snapshot Builds
 
 The HAPI FHIR project generally releases a new full software release 4 times per year, or approximately every 3 months.

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

@@ -932,7 +932,10 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
 
 		private void doSaveSearch() {
 
-			Search newSearch = mySearchCacheSvc.save(mySearch);
+			// This is an attempt to track down an intermittent test
+			// failure in testAsyncSearchLargeResultSetBigCountSameCoordinator
+			Object searchObj = mySearchCacheSvc.save(mySearch);
+			Search newSearch = (Search) searchObj;
 
 			// mySearchDao.save is not supposed to return null, but in unit tests
 			// it can if the mock search dao isn't set up to handle that

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java

@@ -349,7 +349,10 @@ public class SearchCoordinatorSvcImplTest {
 		List<ResourcePersistentId> pids = createPidSequence(800);
 		IResultIterator iter = new SlowIterator(pids.iterator(), 2);
 		when(mySearchBuilder.createQuery(same(params), any(), any())).thenReturn(iter);
-		when(mySearchCacheSvc.save(any())).thenAnswer(t -> t.getArguments()[0]);
+		when(mySearchCacheSvc.save(any())).thenAnswer(t ->{
+			ourLog.info("Saving search");
+			return t.getArgument( 0, Search.class);
+		});
 		doAnswer(loadPids()).when(mySearchBuilder).loadResourcesByPid(any(Collection.class), any(Collection.class), any(List.class), anyBoolean(), any());
 
 		IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective(), null);