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

FIx compile error

This commit is contained in:
James Agnew 2018-09-11 08:42:46 -04:00
parent ce6a9dbc36
commit a26779de81
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ public abstract class BaseJpaTest {
return bundleStr; return bundleStr;
} }
public static void purgeDatabase(DaoConfig theDaoConfig, IFhirSystemDao<?, ?> theSystemDao, ISearchParamPresenceSvc theSearchParamPresenceSvc, ISearchCoordinatorSvc theSearchCoordinatorSvc, ISearchParamRegistry theSearchParamRegistry) { public static void purgeDatabase(DaoConfig theDaoConfig, IFhirSystemDao<?, ?> theSystemDao, ISearchParamPresenceSvc theSearchParamPresenceSvc, ISearchCoordinatorSvc theSearchCoordinatorSvc, ISearchParamRegistry theSearchParamRegistry) throws InterruptedException {
theSearchCoordinatorSvc.cancelAllActiveSearches(); theSearchCoordinatorSvc.cancelAllActiveSearches();
boolean expungeEnabled = theDaoConfig.isExpungeEnabled(); boolean expungeEnabled = theDaoConfig.isExpungeEnabled();

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java
View File

@ -228,6 +228,7 @@ public abstract class BaseJpaDstu2Test extends BaseJpaTest {
return newJsonParser.parseResource(type, string); return newJsonParser.parseResource(type, string);
} }
@Override
public TransactionTemplate newTxTemplate() { public TransactionTemplate newTxTemplate() {
TransactionTemplate retVal = new TransactionTemplate(myTxManager); TransactionTemplate retVal = new TransactionTemplate(myTxManager);
retVal.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW); retVal.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java
View File

@ -326,6 +326,7 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest {
return newJsonParser.parseResource(type, string); return newJsonParser.parseResource(type, string);
} }
@Override
public TransactionTemplate newTxTemplate() { public TransactionTemplate newTxTemplate() {
TransactionTemplate retVal = new TransactionTemplate(myTxManager); TransactionTemplate retVal = new TransactionTemplate(myTxManager);
retVal.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); retVal.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);

5
src/changes/changes.xml
View File

@ -330,6 +330,11 @@
and Questionnaires were cached in a cache that never expired, leading to validations against and Questionnaires were cached in a cache that never expired, leading to validations against
stale versions of resources. stale versions of resources.
</action> </action>
<action type="fix">
In the REST server, if an incoming request has the Content-Encoding header, the server will
not try to read request parameters from the content stream. This avoids an incompatibility with
new versions of Jetty.
</action>
</release> </release>
<release version="3.4.0" date="2018-05-28"> <release version="3.4.0" date="2018-05-28">
<action type="add"> <action type="add">