Merge pull request #43 from yrodiere/and-by-default

Use the AND operator by default for multi-term queries
quarkusio · Nov 10, 2023 · 16cb34f · 16cb34f
2 parents dcc3904 + 8da3dc3
commit 16cb34f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/io/quarkus/search/app/SearchService.java b/src/main/java/io/quarkus/search/app/SearchService.java
@@ -13,6 +13,7 @@
 
 import org.eclipse.microprofile.openapi.annotations.Operation;
 
+import org.hibernate.search.engine.search.common.BooleanOperator;
 import org.hibernate.search.mapper.orm.session.SearchSession;
 
 import org.jboss.resteasy.reactive.RestQuery;
@@ -61,7 +62,8 @@ public SearchResult<SearchHit> search(@RestQuery @DefaultValue(QuarkusVersions.L
                                 .field("title_autocomplete").boost(1.0f)
                                 .field("summary_autocomplete").boost(0.5f)
                                 .field("fullContent_autocomplete").boost(0.1f)
-                                .matching(q))
+                                .matching(q)
+                                .defaultOperator(BooleanOperator.AND))
                                 .should(f.not(f.match().field("topics").matching("compatibility"))
                                         .boost(50.0f)));
                     }

diff --git a/src/test/java/io/quarkus/search/app/SearchServiceTest.java b/src/test/java/io/quarkus/search/app/SearchServiceTest.java
@@ -97,6 +97,15 @@ void queryMatchingPrefixTerm() {
         assertThat(result.total()).isEqualTo(8);
     }
 
+    @Test
+    void queryMatchingTwoTerms() {
+        var result = search("orm elasticsearch");
+        // We expect an AND by default
+        assertThat(result.hits()).extracting(SearchHit::id)
+                .containsExactlyInAnyOrder(GuideIds.HIBERNATE_SEARCH_ORM_ELASTICSEARCH);
+        assertThat(result.total()).isEqualTo(1);
+    }
+
     @Test
     void queryEmptyString() {
         var result = search("");