[HSEARCH] hsearch-elasticsearch-wikipedia: Allow to sort by title

Author: yrodiere

hibernate-search/hsearch-elasticsearch-wikipedia/README.md

@@ -74,7 +74,13 @@ For instance:
 curl http://localhost:8080/page/search/?q=car
 ```
 
-Finally, you can retrieve a page with:
+You can also select the sort (either `RELEVANCE` or `TITLE`):
+
+```
+curl http://localhost:8080/page/search/?q=car&s=TITLE
+```
+
+Finally, you can retrieve a Wikipedia page with:
 
 ```
 curl http://localhost:8080/page/<page ID>/

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

@@ -9,11 +9,13 @@
 import javax.persistence.SequenceGenerator;
 
 import org.hibernate.annotations.Type;
+import org.hibernate.search.engine.backend.types.Sortable;
 import org.hibernate.search.mapper.pojo.dirtiness.ReindexOnUpdate;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
 
 @Entity
 @Indexed(index = "page")
@@ -26,6 +28,7 @@ public class Page {
 
 	@Basic(optional = false)
 	@FullTextField(analyzer = "cleaned_text")
+	@KeywordField(name = "title_sort", normalizer = "cleaned_keyword", sortable = Sortable.YES)
 	private String title;
 
 	@Basic(optional = false)

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, int offset, int limit);
+	SearchResult<Page> search(String term, PageSort sort, int offset, int limit);
 
 }

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

@@ -0,0 +1,14 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.demos.wikipedia.data.dao;
+
+public enum PageSort {
+
+	RELEVANCE,
+	TITLE
+
+}

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

@@ -2,6 +2,7 @@
 
 import org.hibernate.search.demos.wikipedia.data.Page;
 import org.hibernate.search.demos.wikipedia.data.dao.PageDao;
+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;
@@ -35,7 +36,7 @@ public Page getById(Long id) {
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public SearchResult<Page> search(String term, int offset, int limit) {
+	public SearchResult<Page> search(String term, PageSort sort, int offset, int limit) {
 		FullTextEntityManager fullTextEm = Search.getFullTextEntityManager( getEm() );
 
 		FullTextQuery query = fullTextEm.search( Page.class ).query()
@@ -52,7 +53,15 @@ public SearchResult<Page> search(String term, int offset, int limit) {
 								.toPredicate();
 					}
 				} )
-				.sort( f -> f.byScore() )
+				.sort( f -> {
+					switch ( sort ) {
+						case TITLE:
+							f.byField( "title_sort" );
+						case RELEVANCE:
+						default:
+							f.byScore();
+					}
+				} )
 				.build();
 
 		query.setFirstResult( offset )

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

@@ -21,6 +21,7 @@
 
 import org.hibernate.search.demos.wikipedia.data.Page;
 import org.hibernate.search.demos.wikipedia.data.dao.PageDao;
+import org.hibernate.search.demos.wikipedia.data.dao.PageSort;
 import org.hibernate.search.demos.wikipedia.dto.PageInputDto;
 import org.hibernate.search.demos.wikipedia.dto.PageOutputDto;
 import org.hibernate.search.demos.wikipedia.dto.mapper.PageMapper;
@@ -76,11 +77,11 @@ public PageOutputDto getById(@PathParam("id") Long id) {
 
 	@GET
 	@Path("/search")
-	public SearchResult<PageOutputDto> search(@QueryParam("q") String queryString, @QueryParam("p") Integer page) {
+	public SearchResult<PageOutputDto> search(@QueryParam("q") String queryString, @QueryParam("s") PageSort sort, @QueryParam("p") Integer page) {
 		if ( page == null ) {
 			page = 0;
 		}
-		SearchResult<Page> searchResult = dao.search( queryString, page * ITEMS_PER_PAGE, ITEMS_PER_PAGE );
+		SearchResult<Page> searchResult = dao.search( queryString, sort, page * ITEMS_PER_PAGE, ITEMS_PER_PAGE );
 
 		return new SearchResult<>(
 				searchResult.getTotalCount(),