Skip to content

Commit 117f795

Browse files
committed
XWIKI-23532: The REST search API should take into account the configured search exclusions
1 parent 0a1e8b3 commit 117f795

File tree

1 file changed

+6
-0
lines changed
  • xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/src/main/java/org/xwiki/search/solr/internal/rest

1 file changed

+6
-0
lines changed

xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/src/main/java/org/xwiki/search/solr/internal/rest/SolrKeywordSearchSource.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.xwiki.model.reference.EntityReferenceProvider;
4444
import org.xwiki.query.Query;
4545
import org.xwiki.query.QueryException;
46+
import org.xwiki.query.QueryFilter;
4647
import org.xwiki.query.QueryManager;
4748
import org.xwiki.query.SecureQuery;
4849
import org.xwiki.rest.XWikiRestException;
@@ -128,6 +129,10 @@ public class SolrKeywordSearchSource implements KeywordSearchSource
128129
@Inject
129130
private SearchResultConverter searchResultConverter;
130131

132+
@Inject
133+
@Named("searchExclusions/solr")
134+
private QueryFilter searchExclusionsFilter;
135+
131136
@Override
132137
public List<SearchResult> search(String keywords, KeywordSearchOptions options, URI baseURI)
133138
throws XWikiRestException
@@ -182,6 +187,7 @@ private List<SearchResult> searchPages(String keywords, KeywordSearchOptions opt
182187
((SecureQuery) query).checkCurrentUser(true);
183188
query.setLimit(options.number());
184189
query.setOffset(options.start());
190+
query.addFilter(this.searchExclusionsFilter);
185191
query.bindValue("fq", filterQueries);
186192
addSortValue(options.orderField(), options.order(), query);
187193
return this.searchResultConverter.getSolrSearchResults(options.withPrettyNames(), query, baseURI, true);

0 commit comments

Comments
 (0)