Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 10:41:06 +01:00
Code Issues Packages Projects Releases Activity

Return separate links for searchable types instead of single templated link (#1733)

Browse Source 
The search link of the index resource is now an array of links instead of single templated link.
The array contains one link for each searchable type.

Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Sebastian Sdorra
2021-07-21 10:07:41 +02:00
committed by GitHub
parent 8ba93422a2
commit 39d2f12b66
23 changed files with 443 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-webapp/src/main/java/sonia/scm/search/LuceneSearchEngine.java
View File

@@ -24,19 +24,35 @@
package sonia.scm.search;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import javax.inject.Inject;
import java.util.Collection;
import java.util.stream.Collectors;
public class LuceneSearchEngine implements SearchEngine {
private final SearchableTypeResolver resolver;
private final LuceneIndexFactory indexFactory;
private final LuceneQueryBuilderFactory queryBuilderFactory;
@Inject
public LuceneSearchEngine(LuceneIndexFactory indexFactory, LuceneQueryBuilderFactory queryBuilderFactory) {
public LuceneSearchEngine(SearchableTypeResolver resolver, LuceneIndexFactory indexFactory, LuceneQueryBuilderFactory queryBuilderFactory) {
this.resolver = resolver;
this.indexFactory = indexFactory;
this.queryBuilderFactory = queryBuilderFactory;
}
@Override
public Collection<SearchableType> getSearchableTypes() {
Subject subject = SecurityUtils.getSubject();
return resolver.getSearchableTypes()
.stream()
.filter(type -> type.getPermission().map(subject::isPermitted).orElse(true))
.collect(Collectors.toList());
}
@Override
public Index getOrCreate(String name, IndexOptions options) {
return indexFactory.create(name, options);