[HSEARCH] hsearch-elasticsearch-wikipedia: make it easier to test the app with a small subset of data

Author: yrodiere

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

@@ -41,12 +41,18 @@ public SearchResult<Page> search(String term, int offset, int limit) {
 		FullTextEntityManager fullTextEm = Search.getFullTextEntityManager( getEm() );
 		QueryBuilder queryBuilder = fullTextEm.getSearchFactory().buildQueryBuilder()
 				.forEntity( Page.class ).get();
-		
-		Query luceneQuery = queryBuilder.keyword()
-				.onField( "title" ).boostedTo( 2.0f )
-				.andField( "content" )
-				.matching( term )
-				.createQuery();
+
+		Query luceneQuery;
+		if ( term == null || term.isEmpty() ) {
+			luceneQuery = queryBuilder.all().createQuery();
+		}
+		else {
+			luceneQuery = queryBuilder.keyword()
+					.onField( "title" ).boostedTo( 2.0f )
+					.andField( "content" )
+					.matching( term )
+					.createQuery();
+		}
 
 		Sort scoreSort = queryBuilder.sort().byScore().createSort();
 

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

@@ -4,9 +4,11 @@
 import javax.persistence.PersistenceContext;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
 import org.hibernate.CacheMode;
+import org.hibernate.search.MassIndexer;
 import org.hibernate.search.demos.wikipedia.data.Page;
 import org.hibernate.search.demos.wikipedia.data.User;
 import org.hibernate.search.jpa.FullTextEntityManager;
@@ -24,16 +26,22 @@ public class AdminEndpoint {
 
 	@POST
 	@Path("/reindex")
-	public Response reindex() {
+	public Response reindex(@QueryParam("limit") Long limit) {
 		FullTextEntityManager fullTextEm = Search.getFullTextEntityManager( em );
-		fullTextEm.createIndexer( Page.class, User.class )
+
+		MassIndexer indexer = fullTextEm.createIndexer( Page.class, User.class )
 				.purgeAllOnStart( true )
 				.typesToIndexInParallel( 2 )
 				.batchSizeToLoadObjects( 25 )
 				.idFetchSize( 150 )
 				.threadsToLoadObjects( 10 )
-				.cacheMode( CacheMode.IGNORE ) // Cache is likely to do more harm than good in our case (very few relations)
-				.start();
+				.cacheMode( CacheMode.IGNORE ); // Cache is likely to do more harm than good in our case (very few relations)
+		if ( limit != null ) {
+			indexer.limitIndexedObjectsTo( limit );
+		}
+
+		indexer.start();
+
 		return Response.accepted().build();
 	}
 

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

@@ -77,9 +77,6 @@ public PageOutputDto getById(@PathParam("id") Long id) {
 	@GET
 	@Path("/search")
 	public SearchResult<PageOutputDto> search(@QueryParam("q") String queryString, @QueryParam("p") Integer page) {
-		if ( queryString == null || queryString.isEmpty() ) {
-			return null;
-		}
 		if ( page == null ) {
 			page = 0;
 		}