root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Tidy up

This commit is contained in:
Jan Faracik 2025-02-10 16:44:39 +00:00
parent 46a9e5681a
commit 14a64885a2
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/hudson/search/Search.java
View File

@ -29,6 +29,8 @@ import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.ExtensionComponent;
import hudson.ExtensionList;
import hudson.Util; import hudson.Util;
import hudson.util.EditDistance; import hudson.util.EditDistance;
import io.jenkins.servlet.ServletExceptionWrapper; import io.jenkins.servlet.ServletExceptionWrapper;
@ -37,12 +39,16 @@ import java.io.IOException;
import java.util.AbstractList; import java.util.AbstractList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import jenkins.model.Jenkins; import jenkins.model.Jenkins;
import jenkins.search.SearchGroup;
import jenkins.security.stapler.StaplerNotDispatchable; import jenkins.security.stapler.StaplerNotDispatchable;
import jenkins.util.MemoryReductionUtil; import jenkins.util.MemoryReductionUtil;
import jenkins.util.SystemProperties; import jenkins.util.SystemProperties;
@ -176,6 +182,21 @@ public class Search implements StaplerProxy {
r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image", curItem.item.getSearchGroup().getDisplayName())); r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image", curItem.item.getSearchGroup().getDisplayName()));
} }
} }
// Sort results by group
ExtensionList<SearchGroup> groupsExtensionList = ExtensionList.lookup(SearchGroup.class);
List<ExtensionComponent<SearchGroup>> components = groupsExtensionList.getComponents();
Map<String, Double> searchGroupOrdinal = components.stream()
.collect(Collectors.toMap(
(k) -> k.getInstance().getDisplayName(),
ExtensionComponent::ordinal
));
r.suggestions.sort(
Comparator.comparingDouble((Item item) -> searchGroupOrdinal.getOrDefault(item.getGroup(), Double.MAX_VALUE))
.reversed()
.thenComparing(item -> item.name)
);
rsp.serveExposedBean(req, r, new ExportConfig()); rsp.serveExposedBean(req, r, new ExportConfig());
} }

12
core/src/main/java/jenkins/search/SearchGroup.java
View File

@ -1,17 +1,17 @@
package jenkins.search; package jenkins.search;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.ExtensionPoint;
import hudson.model.ModelObject;
import static jenkins.search.Messages.SearchGroup_ComputerSearchGroup_DisplayName; import static jenkins.search.Messages.SearchGroup_ComputerSearchGroup_DisplayName;
import static jenkins.search.Messages.SearchGroup_JobSearchGroup_DisplayName; import static jenkins.search.Messages.SearchGroup_JobSearchGroup_DisplayName;
import static jenkins.search.Messages.SearchGroup_UnclassifiedSearchGroup_DisplayName; import static jenkins.search.Messages.SearchGroup_UnclassifiedSearchGroup_DisplayName;
import static jenkins.search.Messages.SearchGroup_UserSearchGroup_DisplayName; import static jenkins.search.Messages.SearchGroup_UserSearchGroup_DisplayName;
import static jenkins.search.Messages.SearchGroup_ViewSearchGroup_DisplayName; import static jenkins.search.Messages.SearchGroup_ViewSearchGroup_DisplayName;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.ExtensionPoint;
import hudson.model.ModelObject;
public interface SearchGroup extends ExtensionPoint, ModelObject { public interface SearchGroup extends ExtensionPoint, ModelObject {
static ExtensionList<SearchGroup> all() { static ExtensionList<SearchGroup> all() {