[HSEARCH] hsearch-elasticsearch-wikipedia: Upgrade to Hibernate Search 6.0.0.Alpha3

Author: yrodiere

hibernate-search/hsearch-elasticsearch-wikipedia/pom.xml

@@ -26,7 +26,7 @@
 		<apt.version>1.1.3</apt.version>
 		<!-- Override the version of Hibernate ORM in Spring Boot -->
 		<hibernate.version>5.4.1.Final</hibernate.version>
-		<hibernate.search.version>6.0.0.Alpha2</hibernate.search.version>
+		<hibernate.search.version>6.0.0.Alpha3</hibernate.search.version>
 	</properties>
 
 	<dependencies>

hibernate-search/hsearch-elasticsearch-wikipedia/src/main/java/org/hibernate/search/demos/wikipedia/data/dao/PageDao.java

@@ -13,6 +13,6 @@ public interface PageDao {
 
 	Page getById(Long id);
 
-	SearchResult<Page> search(String term, PageSort sort, int offset, int limit);
+	SearchResult<Page> search(String term, PageSort sort, int limit, int offset);
 
 }

hibernate-search/hsearch-elasticsearch-wikipedia/src/main/java/org/hibernate/search/demos/wikipedia/data/dao/hibernate/HibernatePageDaoImpl.java

@@ -5,8 +5,8 @@
 import org.hibernate.search.demos.wikipedia.data.dao.PageSort;
 import org.hibernate.search.demos.wikipedia.util.SearchResult;
 import org.hibernate.search.mapper.orm.Search;
-import org.hibernate.search.mapper.orm.jpa.FullTextEntityManager;
-import org.hibernate.search.mapper.orm.jpa.FullTextQuery;
+import org.hibernate.search.mapper.orm.search.query.SearchQuery;
+import org.hibernate.search.mapper.orm.session.SearchSession;
 
 import org.springframework.stereotype.Repository;
 
@@ -35,22 +35,20 @@ public Page getById(Long id) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public SearchResult<Page> search(String term, PageSort sort, int offset, int limit) {
-		FullTextEntityManager fullTextEm = Search.getFullTextEntityManager( getEm() );
+	public SearchResult<Page> search(String term, PageSort sort, int limit, int offset) {
+		SearchSession searchSession = Search.getSearchSession( getEm() );
 
-		FullTextQuery query = fullTextEm.search( Page.class ).query()
+		SearchQuery<Page> query = searchSession.search( Page.class )
 				.asEntity()
 				.predicate( f -> {
 					if ( term == null || term.isEmpty() ) {
-						return f.matchAll().toPredicate();
+						return f.matchAll();
 					}
 					else {
 						return f.match()
 								.onField( "title" ).boostedTo( 2.0f )
 								.orField( "content" )
-								.matching( term )
-								.toPredicate();
+								.matching( term );
 					}
 				} )
 				.sort( f -> {
@@ -62,12 +60,9 @@ public SearchResult<Page> search(String term, PageSort sort, int offset, int lim
 							f.byScore();
 					}
 				} )
-				.build();
+				.toQuery();
 
-		query.setFirstResult( offset )
-				.setMaxResults( limit );
-
-		return new SearchResult<>( query.getResultSize(), query.getResultList() );
+		return new SearchResult<>( query.fetch( limit, offset ) );
 	}
 
 }

hibernate-search/hsearch-elasticsearch-wikipedia/src/main/java/org/hibernate/search/demos/wikipedia/endpoint/AdminEndpoint.java

@@ -11,8 +11,8 @@
 import org.hibernate.search.demos.wikipedia.data.Page;
 import org.hibernate.search.demos.wikipedia.data.User;
 import org.hibernate.search.mapper.orm.Search;
-import org.hibernate.search.mapper.orm.jpa.FullTextEntityManager;
 import org.hibernate.search.mapper.orm.massindexing.MassIndexer;
+import org.hibernate.search.mapper.orm.session.SearchSession;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +28,9 @@ public class AdminEndpoint {
 	@POST
 	@Path("/reindex")
 	public Response reindex(@QueryParam("limit") Long limit) {
-		FullTextEntityManager fullTextEm = Search.getFullTextEntityManager( em );
+		SearchSession searchSession = Search.getSearchSession( em );
 
-		MassIndexer indexer = fullTextEm.createIndexer( Page.class, User.class )
+		MassIndexer indexer = searchSession.createIndexer( Page.class, User.class )
 				.purgeAllOnStart( true )
 				.typesToIndexInParallel( 2 )
 				.batchSizeToLoadObjects( 25 )

hibernate-search/hsearch-elasticsearch-wikipedia/src/main/java/org/hibernate/search/demos/wikipedia/endpoint/PageEndpoint.java

@@ -81,7 +81,7 @@ public SearchResult<PageOutputDto> search(@QueryParam("q") String queryString, @
 		if ( page == null ) {
 			page = 0;
 		}
-		SearchResult<Page> searchResult = dao.search( queryString, sort, page * ITEMS_PER_PAGE, ITEMS_PER_PAGE );
+		SearchResult<Page> searchResult = dao.search( queryString, sort, ITEMS_PER_PAGE, page * ITEMS_PER_PAGE );
 
 		return new SearchResult<>(
 				searchResult.getTotalCount(),

hibernate-search/hsearch-elasticsearch-wikipedia/src/main/java/org/hibernate/search/demos/wikipedia/util/SearchResult.java

@@ -8,6 +8,14 @@ public class SearchResult<T> {
 
 	private List<T> hits;
 
+	/**
+	 * Wrap a Hibernate Search result to avoid exposing Hibernate Search to the rest of the application.
+	 * @param hibernateSearchSearchResult The Hibernate Search result.
+	 */
+	public SearchResult(org.hibernate.search.mapper.orm.search.query.SearchResult<T> hibernateSearchSearchResult) {
+		this( hibernateSearchSearchResult.getTotalHitCount(), hibernateSearchSearchResult.getHits() );
+	}
+
 	public SearchResult(long totalCount, List<T> hits) {
 		super();
 		this.totalCount = totalCount;