diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java index 927bef1e00b..2fda9af8e20 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java @@ -457,7 +457,7 @@ public class TransactionProcessor { } transactionStopWatch.endCurrentTask(); - ourLog.info("Transaction timing:\n{}", transactionStopWatch.formatTaskDurations()); + ourLog.debug("Transaction timing:\n{}", transactionStopWatch.formatTaskDurations()); return response; } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java index cf124d9f3ad..92f4c56ddf5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java @@ -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 retVal = new ArrayList<>(); synchronized (mySyncedPids) { diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java index 436f807fb9f..1625c88fad0 100644 --- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java +++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/cache/SubscriptionRegistry.java @@ -60,6 +60,13 @@ public class SubscriptionRegistry { @Autowired private IInterceptorBroadcaster myInterceptorBroadcaster; + /** + * Constructor + */ + public SubscriptionRegistry() { + super(); + } + public ActiveSubscription get(String theIdPart) { return myActiveSubscriptionCache.get(theIdPart); } diff --git a/pom.xml b/pom.xml index 265579cc660..b450d5478af 100755 --- a/pom.xml +++ b/pom.xml @@ -564,7 +564,7 @@ 9.5.1-5_1 1.2_5 1.7.25 - 5.1.3.RELEASE + 5.1.5.RELEASE 2.1.3.RELEASE 2.1.1.RELEASE 1.2.2.RELEASE diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7e7d1b30001..9908c38459b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -7,6 +7,15 @@ + + The version of a few dependencies have been bumped to the + latest versions (dependent HAPI modules listed in brackets): + +
  • Spring (JPA): 5.1.3.RELEASE -> 5.1.5.RELEASE
  • + + ]]> +
    In Servers that are configured to support extended mode _elements]]> parameters, it is now possible to diff --git a/src/site/xdoc/doc_rest_server_security.xml b/src/site/xdoc/doc_rest_server_security.xml index 7413ce31525..1204e8e96f8 100644 --- a/src/site/xdoc/doc_rest_server_security.xml +++ b/src/site/xdoc/doc_rest_server_security.xml @@ -254,7 +254,7 @@ -
    +

    HAPI FHIR 3.7.0 introduced a new interceptor, the