From 299cf5b230b1dee4b9848747bfcc7dcb95ef7863 Mon Sep 17 00:00:00 2001
From: frankjtao <38163583+frankjtao@users.noreply.github.com>
Date: Sat, 16 Jun 2018 22:37:12 -0400
Subject: [PATCH] Changed retval to resource id instead of SearchResult in
 SearchResultDao

---
 .../ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java     |  4 ++--
 .../uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java  |  6 +++---
 .../fhir/jpa/search/SearchCoordinatorSvcImplTest.java  | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java
index 12649857f48..4f7e05d9131 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchResultDao.java
@@ -38,8 +38,8 @@ public interface ISearchResultDao  extends JpaRepository<SearchResult, Long> {
 	@Query(value="SELECT r FROM SearchResult r WHERE r.mySearch = :search")
 	Collection<SearchResult> findWithSearchUuid(@Param("search") Search theSearch);
 	
-	@Query(value="SELECT r FROM SearchResult r WHERE r.mySearch = :search ORDER BY r.myOrder ASC")
-	Page<SearchResult> findWithSearchUuid(@Param("search") Search theSearch, Pageable thePage);
+	@Query(value="SELECT r.myResourcePid FROM SearchResult r WHERE r.mySearch = :search ORDER BY r.myOrder ASC")
+	Page<Long> findWithSearchUuid(@Param("search") Search theSearch, Pageable thePage);
 
 	@Modifying
 	@Query(value="DELETE FROM SearchResult r WHERE r.mySearchPid = :search")
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 dcace7b4fc2..1dcd22462f0 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
@@ -178,9 +178,9 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc {
 			@Override
 			public List<Long> doInTransaction(TransactionStatus theStatus) {
 				final List<Long> resultPids = new ArrayList<Long>();
-				Page<SearchResult> searchResults = mySearchResultDao.findWithSearchUuid(foundSearch, page);
-				for (SearchResult next : searchResults) {
-					resultPids.add(next.getResourcePid());
+				Page<Long> searchResultPids = mySearchResultDao.findWithSearchUuid(foundSearch, page);
+				for (Long next : searchResultPids) {
+					resultPids.add(next);
 				}
 				return resultPids;
 			}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
index 9126cec246a..07316c53160 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
@@ -323,18 +323,18 @@ public class SearchCoordinatorSvcImplTest {
 					// ignore
 				}
 
-				when(mySearchResultDao.findWithSearchUuid(any(Search.class), any(Pageable.class))).thenAnswer(new Answer<Page<SearchResult>>() {
+				when(mySearchResultDao.findWithSearchUuid(any(Search.class), any(Pageable.class))).thenAnswer(new Answer<Page<Long>>() {
 					@Override
-					public Page<SearchResult> answer(InvocationOnMock theInvocation) throws Throwable {
+					public Page<Long> answer(InvocationOnMock theInvocation) throws Throwable {
 						Pageable page = (Pageable) theInvocation.getArguments()[1];
 
-						ArrayList<SearchResult> results = new ArrayList<SearchResult>();
+						ArrayList<Long> results = new ArrayList<Long>();
 						int max = (page.getPageNumber() * page.getPageSize()) + page.getPageSize();
 						for (int i = page.getOffset(); i < max; i++) {
-							results.add(new SearchResult().setResourcePid(i + 10L));
+							results.add(i + 10L);
 						}
 
-						return new PageImpl<SearchResult>(results);
+						return new PageImpl<Long>(results);
 					}
 				});
 				search.setStatus(SearchStatusEnum.FINISHED);