From ff8b5607f336eba3347861e06640ba96b20bdfd8 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Thu, 24 Aug 2017 22:19:12 -0400 Subject: [PATCH] More test cleanup --- .../src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java | 8 ++++---- .../jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java | 7 ++++++- .../fhir/rest/server/interceptor/IServerInterceptor.java | 2 -- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java index 99f9ae23518..7a0f7257ab6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/DaoConfig.java @@ -53,9 +53,9 @@ public class DaoConfig { "http://hl7.org/fhir/StructureDefinition/*"))); /** - * Default value for {@link #setMaximumSearchResultCountInTransaction(int)} - * - * @see #setMaximumSearchResultCountInTransaction(int) + * Default value for {@link #setMaximumSearchResultCountInTransaction(Integer)} + * + * @see #setMaximumSearchResultCountInTransaction(Integer) */ private static final Integer DEFAULT_MAXIMUM_SEARCH_RESULT_COUNT_IN_TRANSACTION = null; @@ -220,7 +220,7 @@ public class DaoConfig { */ public List getInterceptors() { if (myInterceptors == null) { - myInterceptors = new ArrayList(); + myInterceptors = new ArrayList<>(); } return myInterceptors; } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java index 9b79fe0596c..77414607945 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java @@ -154,10 +154,15 @@ public class FhirResourceDaoR4SearchPageExpiryTest extends BaseJpaR4Test { newTxTemplate().execute(new TransactionCallbackWithoutResult() { @Override protected void doInTransactionWithoutResult(TransactionStatus theArg0) { - assertNull(mySearchEntityDao.findByUuid(searchUuid1)); assertNotNull(mySearchEntityDao.findByUuid(searchUuid3)); } }); + newTxTemplate().execute(new TransactionCallbackWithoutResult() { + @Override + protected void doInTransactionWithoutResult(TransactionStatus theArg0) { + assertNull(mySearchEntityDao.findByUuid(searchUuid1)); + } + }); Thread.sleep(300); diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java index 6dbaec26a5b..f2ca2158cee 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java @@ -126,8 +126,6 @@ public interface IServerInterceptor { * will be aborted with an appropriate error returned to the client. *

* - * @param theServletRequest - * The incoming servlet request as provided by the servlet container * @param theOperation * The type of operation that the FHIR server has determined that the client is trying to invoke * @param theProcessedRequest