[JENKINS-70822] Improve plugin manager search

core/src/main/java/hudson/PluginManager.java

@@ -89,8 +89,10 @@
 import java.security.CodeSource;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -1428,42 +1430,67 @@
 
  @Restricted(NoExternalUse.class)
  public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParameter Integer limit) {
+ String lQuery = query == null ? "" : query.toLowerCase(Locale.ENGLISH);
+
  List<JSONObject> plugins = new ArrayList<>();
  for (UpdateSite site : Jenkins.get().getUpdateCenter().getSiteList()) {
  List<JSONObject> sitePlugins = site.getAvailables().stream()
  .filter(plugin -> {
  if (query == null || query.isBlank()) {
  return true;
  }
- return (plugin.name != null && plugin.name.toLowerCase().contains(query.toLowerCase())) ||
- (plugin.title != null && plugin.title.toLowerCase().contains(query.toLowerCase())) ||
- (plugin.excerpt != null && plugin.excerpt.toLowerCase().contains(query.toLowerCase())) ||
- plugin.hasCategory(query) ||
- plugin.getCategoriesStream()
- .map(UpdateCenter::getCategoryDisplayName)
- .anyMatch(category -> category != null && category.toLowerCase().contains(query.toLowerCase())) ||
- plugin.hasWarnings() && query.equalsIgnoreCase("warning:");
- })
- .limit(Math.max(limit - plugins.size(), 1))
- .sorted((o1, o2) -> {
- String o1DisplayName = o1.getDisplayName();
- if (o1.name.equalsIgnoreCase(query) ||
- o1DisplayName.equalsIgnoreCase(query)) {
- return -1;
- }
- String o2DisplayName = o2.getDisplayName();
- if (o2.name.equalsIgnoreCase(query) || o2DisplayName.equalsIgnoreCase(query)) {
- return 1;
- }
- if (o1.name.equals(o2.name)) {
- return 0;
+ boolean matches = searchQueryMatches(query, plugin, lQuery);
+ if (matches) {
+ return true;
  }
- final int pop = Double.compare(o2.popularity, o1.popularity);
- if (pop != 0) {
- return pop; // highest popularity first
+
+ String[] tokenised = lQuery.split(" ");
+
+ if (tokenised.length > 1) {
+ return Arrays.stream(tokenised)
+ .anyMatch(q -> searchQueryMatchesLimited(q, plugin, q.toLowerCase()));
  }
- return o1DisplayName.compareTo(o2DisplayName);
+ return false;
  })
+ .limit(Math.max(limit - plugins.size(), 1))
+ .sorted(
+ Comparator.comparingLong(plugin -> {
+ long score = 0;
+ if (plugin.name.equalsIgnoreCase(lQuery) ||
+ plugin.getDisplayName().equalsIgnoreCase(lQuery)) {
+ return -1000L;
+ }
+
+ String[] tokenised = lQuery.toLowerCase().split(" ");
+
+ // if greater than 1 word match in the title
+ if (tokenised.length > 1) {
+ long o1Match = Arrays.stream(tokenised)
+ .filter(plugin.title.toLowerCase(Locale.ENGLISH)::contains)
+ .count();
+ if (o1Match > 1) {
+ score -= 100;
+ } else if (o1Match == 1) {
+ score -= 50;
+ }
+ }
+
+ if (plugin.isDeprecated()) {
+ score += 100;
+ } else {
+ if (plugin.popularity > 100000) {
+ score -= 40;
+ } else if (plugin.popularity > 10000) {
+ score -= 20;
+ } else if (plugin.popularity > 1000) {
+ score -= 10;
+ }
+ }
+
+ return score;
+ })
+ )
+
  .map(plugin -> {
  JSONObject jsonObject = new JSONObject();
  jsonObject.put("name", plugin.name);
@@ -1531,6 +1558,22 @@
  return hudson.util.HttpResponses.okJSON(mappedPlugins);
  }
 
+ private static boolean searchQueryMatches(String query, UpdateSite.Plugin plugin, String lQuery) {
+ return (plugin.name != null && plugin.name.toLowerCase().contains(lQuery)) ||
+ (plugin.title != null && plugin.title.toLowerCase().contains(lQuery)) ||
+ (plugin.excerpt != null && plugin.excerpt.toLowerCase().contains(lQuery)) ||
+ plugin.hasCategory(query) ||
+ plugin.getCategoriesStream()
+ .map(UpdateCenter::getCategoryDisplayName)
+ .anyMatch(category -> category != null && category.toLowerCase().contains(lQuery)) ||
+ plugin.hasWarnings() && query.equalsIgnoreCase("warning:");
+ }
+
+ private static boolean searchQueryMatchesLimited(String query, UpdateSite.Plugin plugin, String lQuery) {
+ return (plugin.name != null && plugin.name.toLowerCase().contains(lQuery)) ||
+ (plugin.title != null && plugin.title.toLowerCase().contains(lQuery));
+ }
+
  /**
  * Get the list of all plugins - available and installed.
  * @return The list of all plugins - available and installed.

core/src/main/java/hudson/model/UpdateSite.java

@@ -84,7 +84,6 @@
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.HttpResponse;
@@ -1573,7 +1572,7 @@ public Stream<String> getCategoriesStream() {
  /**
  * @since 2.40
  */
- @Restricted(DoNotUse.class)
+ @Restricted(NoExternalUse.class)
  public boolean hasWarnings() {
  return !getWarnings().isEmpty();
  }

test/src/test/java/hudson/PluginManagerTest.java

@@ -28,6 +28,8 @@
 import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
 import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.not;
@@ -81,6 +83,7 @@
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import javax.servlet.ServletException;
 import jenkins.ClassLoaderReflectionToolkit;
 import jenkins.RestartRequiredException;
@@ -637,6 +640,49 @@ public void doNotThrowWithUnknownPlugins() throws Exception {
  Assert.assertSame(FormValidation.Kind.OK, uc.getSite("default").updateDirectlyNow().kind);
  }
 
+ @Test @Issue("JENKINS-64840")
+ public void filteringMultipleTokens() throws Exception {
+ assumeFalse("TODO: Implement this test for Windows", Functions.isWindows());
+ PersistedList<UpdateSite> sites = r.jenkins.getUpdateCenter().getSites();
+ sites.clear();
+ URL url = PluginManagerTest.class.getResource("/plugins/large-update-center.json");
+ UpdateSite site = new UpdateSite(UpdateCenter.ID_DEFAULT, url.toString());
+ sites.add(site);
+ assertEquals(FormValidation.ok(), site.updateDirectly(false).get());
+ assertNotNull(site.getData());
+
+ //Dummy plugin is found in the second site (should have worked before the fix)
+ JenkinsRule.JSONWebResponse response = r.getJSON("pluginManager/pluginsSearch?query=build%20token&limit=50");
+ JSONObject json = response.getJSONObject();
+ assertTrue(json.has("data"));
+ JSONArray data = json.getJSONArray("data");
+
+ List<String> artifactIdResults = data.stream()
+ .map(obj -> (JSONObject) obj)
+ .map(obj -> obj.getString("name"))
+ .collect(Collectors.toList());
+
+ assertThat(artifactIdResults, hasItem("build-token-root"));
+ String firstArtifact = artifactIdResults.get(0);
+
+ assertThat(firstArtifact, is("build-token-root"));
+
+ response = r.getJSON("pluginManager/pluginsSearch?query=Pipeline%20Groovy&limit=50");
+ json = response.getJSONObject();
+ assertTrue(json.has("data"));
+ data = json.getJSONArray("data");
+
+ artifactIdResults = data.stream()
+ .map(obj -> (JSONObject) obj)
+ .map(obj -> obj.getString("name"))
+ .collect(Collectors.toList());
+
+ assertThat(artifactIdResults, hasItem("workflow-cps"));
+
+ firstArtifact = artifactIdResults.get(0);
+ assertThat(firstArtifact, is("workflow-cps"));
+ }
+
  @Test @Issue("JENKINS-64840")
  public void searchMultipleUpdateSites() throws Exception {
  assumeFalse("TODO: Implement this test for Windows", Functions.isWindows());