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

More test cleanup

This commit is contained in:
James Agnew 2017-08-24 22:19:12 -04:00
parent e95e2e92c1
commit ff8b5607f3
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,9 @@ public class DaoConfig {
"http://hl7.org/fhir/StructureDefinition/*"))); "http://hl7.org/fhir/StructureDefinition/*")));
/** /**
* Default value for {@link #setMaximumSearchResultCountInTransaction(int)} * Default value for {@link #setMaximumSearchResultCountInTransaction(Integer)}
* *
* @see #setMaximumSearchResultCountInTransaction(int) * @see #setMaximumSearchResultCountInTransaction(Integer)
*/ */
private static final Integer DEFAULT_MAXIMUM_SEARCH_RESULT_COUNT_IN_TRANSACTION = null; private static final Integer DEFAULT_MAXIMUM_SEARCH_RESULT_COUNT_IN_TRANSACTION = null;
@ -220,7 +220,7 @@ public class DaoConfig {
*/ */
public List<IServerInterceptor> getInterceptors() { public List<IServerInterceptor> getInterceptors() {
if (myInterceptors == null) { if (myInterceptors == null) {
myInterceptors = new ArrayList<IServerInterceptor>(); myInterceptors = new ArrayList<>();
} }
return myInterceptors; return myInterceptors;
} }

7
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java
View File

@ -154,10 +154,15 @@ public class FhirResourceDaoR4SearchPageExpiryTest extends BaseJpaR4Test {
newTxTemplate().execute(new TransactionCallbackWithoutResult() { newTxTemplate().execute(new TransactionCallbackWithoutResult() {
@Override @Override
protected void doInTransactionWithoutResult(TransactionStatus theArg0) { protected void doInTransactionWithoutResult(TransactionStatus theArg0) {
assertNull(mySearchEntityDao.findByUuid(searchUuid1));
assertNotNull(mySearchEntityDao.findByUuid(searchUuid3)); assertNotNull(mySearchEntityDao.findByUuid(searchUuid3));
} }
}); });
newTxTemplate().execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus theArg0) {
assertNull(mySearchEntityDao.findByUuid(searchUuid1));
}
});
Thread.sleep(300); Thread.sleep(300);

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
View File

@ -126,8 +126,6 @@ public interface IServerInterceptor {
* will be aborted with an appropriate error returned to the client. * will be aborted with an appropriate error returned to the client.
* </p> * </p>
* *
* @param theServletRequest
* The incoming servlet request as provided by the servlet container
* @param theOperation * @param theOperation
* The type of operation that the FHIR server has determined that the client is trying to invoke * The type of operation that the FHIR server has determined that the client is trying to invoke
* @param theProcessedRequest * @param theProcessedRequest