From b465a7b7819ac1c3348ecd04d73dad996a34458d Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Thu, 23 Jan 2020 19:20:51 -0500 Subject: [PATCH] final cleanup --- .../java/ca/uhn/fhir/jpa/dao/predicate/QueryRootEntry.java | 2 +- .../fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java | 2 -- .../searchparam/extractor/SearchParamExtractorService.java | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/QueryRootEntry.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/QueryRootEntry.java index 319702b059a..5d8ed7443e2 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/QueryRootEntry.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/predicate/QueryRootEntry.java @@ -19,7 +19,7 @@ public class QueryRootEntry { myResourceTableRoot = theResourceTableQuery.from(ResourceTable.class); } - public Root getRoot() { + public Root getRoot() { return myResourceTableRoot; } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java index 5925cf19008..9d1bbe51f52 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java @@ -1821,10 +1821,8 @@ public class FhirResourceDaoR4SearchNoHashesTest extends BaseJpaR4Test { ourLog.info("P1[{}] P2[{}] O1[{}] O2[{}] D1[{}]", patientId01, patientId02, obsId01, obsId02, drId01); - myCaptureQueriesListener.clear(); List result = toList(myObservationDao .search(new SearchParameterMap().setLoadSynchronous(true).add(Observation.SP_SUBJECT, new ReferenceParam(Patient.SP_IDENTIFIER, "urn:system|testSearchResourceLinkWithChain01")))); - myCaptureQueriesListener.logAllQueriesForCurrentThread(); assertEquals(1, result.size()); assertEquals(obsId01.getIdPart(), result.get(0).getIdElement().getIdPart()); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java index 87657e2d3c6..6f60979c97e 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java @@ -121,10 +121,6 @@ public class SearchParamExtractorService { } } -// private ISearchParamExtractor.SearchParamSet extractSearchParamCoords(IBaseResource theResource) { -// return mySearchParamExtractor.extractSearchParamCoords(theResource); -// } - private ISearchParamExtractor.SearchParamSet extractSearchParamDates(IBaseResource theResource) { return mySearchParamExtractor.extractSearchParamDates(theResource); }