honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jamesagnew/hapi-fhir

This commit is contained in:
jamesagnew 2019-03-17 14:09:37 -04:00
parent 3e57fdb491 08c7afb804
commit 037ed27497
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java
View File

@ -457,7 +457,7 @@ public class TransactionProcessor<BUNDLE extends IBaseBundle, BUNDLEENTRY> {
}
transactionStopWatch.endCurrentTask();
ourLog.info("Transaction timing:\n{}", transactionStopWatch.formatTaskDurations());
ourLog.debug("Transaction timing:\n{}", transactionStopWatch.formatTaskDurations());
return response;
}

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

@ -169,18 +169,18 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
search = txTemplate.execute(t -> mySearchDao.findByUuid(theUuid));
if (search == null) {
ourLog.info("Client requested unknown paging ID[{}]", theUuid);
ourLog.debug("Client requested unknown paging ID[{}]", theUuid);
String msg = myContext.getLocalizer().getMessage(PageMethodBinding.class, "unknownSearchId", theUuid);
throw new ResourceGoneException(msg);
}
verifySearchHasntFailedOrThrowInternalErrorException(search);
if (search.getStatus() == SearchStatusEnum.FINISHED) {
ourLog.info("Search entity marked as finished with {} results", search.getNumFound());
ourLog.debug("Search entity marked as finished with {} results", search.getNumFound());
break;
}
if (search.getNumFound() >= theTo) {
ourLog.info("Search entity has {} results so far", search.getNumFound());
ourLog.debug("Search entity has {} results so far", search.getNumFound());
break;
}
@ -358,7 +358,7 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
PersistedJpaBundleProvider retVal = null;
if (searchToUse != null) {
ourLog.info("Reusing search {} from cache", searchToUse.getUuid());
ourLog.debug("Reusing search {} from cache", searchToUse.getUuid());
searchToUse.setSearchLastReturned(new Date());
mySearchDao.updateSearchLastReturned(searchToUse.getId(), new Date());
@ -535,7 +535,7 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
}
if (keepWaiting) {
ourLog.info("Waiting, as we only have {} results", mySyncedPids.size());
ourLog.info("Waiting as we only have {} results - Search status: {}", mySyncedPids.size(), mySearch.getStatus());
try {
Thread.sleep(500);
} catch (InterruptedException theE) {
@ -544,7 +544,7 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
}
} while (keepWaiting);
ourLog.info("Proceeding, as we have {} results", mySyncedPids.size());
ourLog.debug("Proceeding, as we have {} results", mySyncedPids.size());
ArrayList<Long> retVal = new ArrayList<>();
synchronized (mySyncedPids) {

7
hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java vendored
View File

@ -60,6 +60,13 @@ public class SubscriptionRegistry {
@Autowired
private IInterceptorBroadcaster myInterceptorBroadcaster;
/**
* Constructor
*/
public SubscriptionRegistry() {
super();
}
public ActiveSubscription get(String theIdPart) {
return myActiveSubscriptionCache.get(theIdPart);
}

2
pom.xml
View File

@ -564,7 +564,7 @@
<servicemix_saxon_version>9.5.1-5_1</servicemix_saxon_version>
<servicemix_xmlresolver_version>1.2_5</servicemix_xmlresolver_version>
<slf4j_version>1.7.25</slf4j_version>
<spring_version>5.1.3.RELEASE</spring_version>
<spring_version>5.1.5.RELEASE</spring_version>
<spring_data_version>2.1.3.RELEASE</spring_data_version>
<spring_boot_version>2.1.1.RELEASE</spring_boot_version>
<spring_retry_version>1.2.2.RELEASE</spring_retry_version>

9
src/changes/changes.xml
View File

@ -7,6 +7,15 @@
</properties>
<body>
<release version="3.8.0" date="TBD" description="Hippo">
<action type="add">
The version of a few dependencies have been bumped to the
latest versions (dependent HAPI modules listed in brackets):
<![CDATA[
<ul>
<li>Spring (JPA): 5.1.3.RELEASE -&gt; 5.1.5.RELEASE</li>
</ul>
]]>
</action>
<action type="add">
In Servers that are configured to support extended mode
<![CDATA[<code>_elements</code>]]> parameters, it is now possible to

2
src/site/xdoc/doc_rest_server_security.xml
View File

@ -254,7 +254,7 @@
</section>
<section name="Search Narrowind">
<section name="Search Narrowing">
<p>
HAPI FHIR 3.7.0 introduced a new interceptor, the