The Unified and Autonomous Development Platform
Sort various match result with match score
robin shena5fe1df96a8e
diff --git a/core/src/main/java/com/gitplex/server/model/Group.java b/core/src/main/java/com/gitplex/server/model/Group.javaindex 765b3d5002..f48f870d6a 100644--- a/core/src/main/java/com/gitplex/server/model/Group.java+++ b/core/src/main/java/com/gitplex/server/model/Group.java@@ -4,7 +4,6 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import javax.annotation.Nullable;import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;@@ -14,7 +13,6 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.facade.GroupFacade;@@ -95,10 +93,6 @@ public class Group extends AbstractEntity {this.memberships = memberships;}- public boolean matchesQuery(@Nullable String queryTerm) {- return StringUtils.matchesQuery(name, queryTerm);- }-public Collection<User> getMembers() {if (members == null) {members = new HashSet<>();diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.javaindex 8efbf48b2d..724961a9fa 100644--- a/core/src/main/java/com/gitplex/server/model/Project.java+++ b/core/src/main/java/com/gitplex/server/model/Project.java@@ -779,10 +779,6 @@ public class Project extends AbstractEntity {return version;}- public boolean matchesQuery(@Nullable String queryTerm) {- return StringUtils.matchesQuery(name, queryTerm);- }-public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision));}diff --git a/core/src/main/java/com/gitplex/server/util/StringUtils.java b/core/src/main/java/com/gitplex/server/util/StringUtils.javaindex 046eceaf38..eb012b994d 100644--- a/core/src/main/java/com/gitplex/server/util/StringUtils.java+++ b/core/src/main/java/com/gitplex/server/util/StringUtils.java@@ -307,16 +307,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {return TokenUtils.escapeHtml(text);}- public static boolean matchesQuery(@Nullable String name, @Nullable String queryTerm) {- if (queryTerm == null)- queryTerm = "";- else- queryTerm = queryTerm.toLowerCase().trim();- if (name == null)- name = "";- else- name = name.toLowerCase().trim();- return name.contains(queryTerm);- }-}diff --git a/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.javaindex 3444cde6bc..674231a518 100644--- a/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java@@ -1,9 +1,6 @@package com.gitplex.server.util.facade;-import javax.annotation.Nullable;-import com.gitplex.server.model.Group;-import com.gitplex.server.util.StringUtils;public class GroupFacade extends EntityFacade {@@ -34,8 +31,4 @@ public class GroupFacade extends EntityFacade {return canCreateProjects;}- public boolean matchesQuery(@Nullable String queryTerm) {- return StringUtils.matchesQuery(name, queryTerm);- }-}diff --git a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.javaindex 14cc427b89..473a74bf22 100644--- a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java@@ -2,14 +2,11 @@ package com.gitplex.server.util.facade;import java.util.Date;-import javax.annotation.Nullable;-import com.gitplex.server.GitPlex;import com.gitplex.server.manager.UserInfoManager;import com.gitplex.server.model.Project;import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.util.StringUtils;public class ProjectFacade extends EntityFacade {@@ -40,10 +37,6 @@ public class ProjectFacade extends EntityFacade {return uuid;}- public boolean matchesQuery(@Nullable String queryTerm) {- return StringUtils.matchesQuery(name, queryTerm);- }-public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {User user = SecurityUtils.getUser();if (user != null) {diff --git a/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.javaindex bb3de77a71..55016d142c 100644--- a/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java@@ -3,7 +3,7 @@ package com.gitplex.server.util.facade;import javax.annotation.Nullable;import com.gitplex.server.model.User;-import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.matchscore.MatchScoreUtils;public class UserFacade extends EntityFacade {@@ -53,8 +53,10 @@ public class UserFacade extends EntityFacade {return getName();}- public boolean matchesQuery(@Nullable String queryTerm) {- return StringUtils.matchesQuery(name, queryTerm) || StringUtils.matchesQuery(fullName, queryTerm);+ public double getMatchScore(@Nullable String queryTerm) {+ double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);+ double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);+ return Math.max(scoreOfName, scoreOfFullName);}}diff --git a/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreProvider.java b/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreProvider.javanew file mode 100644index 0000000000..cf5e27bea4--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreProvider.java@@ -0,0 +1,7 @@+package com.gitplex.server.util.matchscore;++public interface MatchScoreProvider<T> {++ double getMatchScore(T object);++}diff --git a/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreUtils.java b/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreUtils.javanew file mode 100644index 0000000000..73d4d07c7e--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/matchscore/MatchScoreUtils.java@@ -0,0 +1,64 @@+package com.gitplex.server.util.matchscore;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++public class MatchScoreUtils {++ public static <T> List<T> filterAndSort(Collection<T> list, MatchScoreProvider<T> matchScoreProvider) {+ Map<T, Double> matchScores = new HashMap<>();+ List<T> newList = new ArrayList<>();+ for (T item: list) {+ double matchScore = matchScoreProvider.getMatchScore(item);+ if (matchScore > 0) {+ matchScores.put(item, matchScore);+ newList.add(item);+ }+ }+ Collections.sort(newList, new Comparator<T>() {++ @Override+ public int compare(T o1, T o2) {+ double result = matchScores.get(o1) - matchScores.get(o2);+ if (result < 0)+ return 1;+ else if (result > 0)+ return -1;+ else+ return 0;+ }++ });++ return newList;+ }++ public static double getMatchScore(@Nullable String text, @Nullable String query) {+ if (query == null)+ query = "";+ else+ query = query.toLowerCase().trim();+ if (text == null)+ text = "";+ else+ text = text.toLowerCase().trim();++ if (query.length() != 0) {+ int index = text.indexOf(query);+ if (index == -1)+ return -1;+ else+ return query.length() * 1.0 / text.length();+ } else {+ return 1;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javaindex e4656b2ecc..7373ed5b00 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java@@ -10,16 +10,16 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.component.markdown.MarkdownEditor;import com.gitplex.server.web.component.markdown.PullRequestReferenceSupport;import com.gitplex.server.web.component.markdown.UserMentionSupport;@@ -36,20 +36,24 @@ public abstract class CommentInput extends MarkdownEditor {return new UserMentionSupport() {@Override- public List<User> findUsers(String query, int count) {- List<User> users = new ArrayList<>();- UserManager userManager = GitPlex.getInstance(UserManager.class);- for (UserFacade user:- SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.READ)) {- if (users.size() < count) {- if (user.matchesQuery(query))- users.add(userManager.load(user.getId()));- } else {- break;+ public List<UserFacade> findUsers(String query, int count) {+ List<UserFacade> users = new ArrayList<>(+ SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.READ));+ users.sort(Comparator.comparing(UserFacade::getDisplayName));++ users = MatchScoreUtils.filterAndSort(users, new MatchScoreProvider<UserFacade>() {++ @Override+ public double getMatchScore(UserFacade object) {+ return object.getMatchScore(query);}- }- users.sort(Comparator.comparing(User::getDisplayName));- return users;++ });++ if (users.size() > count)+ return users.subList(0, count);+ else+ return users;}};diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.javaindex d3464bc694..260bab538f 100644--- a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java@@ -2,12 +2,13 @@ package com.gitplex.server.web.component.groupchoice;import java.util.ArrayList;import java.util.Comparator;-import java.util.Iterator;import java.util.List;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CacheManager;import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -21,13 +22,17 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);List<GroupFacade> choices = new ArrayList<GroupFacade>(cacheManager.getGroups().values());- for (Iterator<GroupFacade> it = choices.iterator(); it.hasNext();) {- GroupFacade group = it.next();- if (!group.matchesQuery(term))- it.remove();- }choices.sort(Comparator.comparing(GroupFacade::getName));+ choices = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<GroupFacade>() {++ @Override+ public double getMatchScore(GroupFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ });+new ResponseFiller<GroupFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.javaindex f4a1d806ab..4b23d46b56 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java@@ -48,7 +48,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.markdown.emoji.EmojiOnes;import com.gitplex.server.web.component.modal.ModalPanel;@@ -271,7 +271,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);List<Map<String, String>> userList = new ArrayList<>();- for (User user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {+ for (UserFacade user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) {Map<String, String> userMap = new HashMap<>();userMap.put("name", user.getName());if (user.getFullName() != null)@@ -283,7 +283,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {} else {userMap.put("searchKey", noSpaceName);}- String avatarUrl = avatarManager.getAvatarUrl(user.getFacade());+ String avatarUrl = avatarManager.getAvatarUrl(user);userMap.put("avatarUrl", avatarUrl);userList.add(userMap);}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java b/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.javaindex 489f26f9a8..c83d8bd941 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/UserMentionSupport.java@@ -2,10 +2,10 @@ package com.gitplex.server.web.component.markdown;import java.util.List;-import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.UserFacade;public interface UserMentionSupport {- List<User> findUsers(String query, int count);+ List<UserFacade> findUsers(String query, int count);}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.javaindex 0acae66834..60b36a2881 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java@@ -1,6 +1,5 @@package com.gitplex.server.web.component.projectselector;-import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -29,6 +28,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.Project;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;@@ -118,13 +119,16 @@ public abstract class ProjectSelector extends Panel {@Overrideprotected List<Project> load() {- List<Project> projects = new ArrayList<>();- for (Project project: projectsModel.getObject()) {- if (project.matchesQuery(searchInput)) {- projects.add(project);+ MatchScoreProvider<Project> matchScoreProvider = new MatchScoreProvider<Project>() {++ @Override+ public double getMatchScore(Project object) {+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);}- }- return projects;++ };++ return MatchScoreUtils.filterAndSort(projectsModel.getObject(), matchScoreProvider);}}) {diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.javaindex 75b59b8110..367ac6e18a 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java@@ -3,7 +3,6 @@ package com.gitplex.server.web.component.requestreviewer;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;-import java.util.Iterator;import java.util.List;import org.apache.wicket.model.IModel;@@ -14,6 +13,8 @@ import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.QualityCheckStatus;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;@@ -42,12 +43,16 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {List<UserFacade> reviewers = new ArrayList<>(users);- for (Iterator<UserFacade> it = reviewers.iterator(); it.hasNext();) {- UserFacade user = it.next();- if (!user.matchesQuery(term))- it.remove();- }reviewers.sort(Comparator.comparing(UserFacade::getDisplayName));++ reviewers = MatchScoreUtils.filterAndSort(reviewers, new MatchScoreProvider<UserFacade>() {++ @Override+ public double getMatchScore(UserFacade object) {+ return object.getMatchScore(term);+ }++ });int first = page * WebConstants.PAGE_SIZE;int last = first + WebConstants.PAGE_SIZE;diff --git a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex ee6982693a..ed86198eb1 100644--- a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -191,11 +191,6 @@ public abstract class SymbolTooltipPanel extends Panel {revision = params.getParameterValue("revision").toString();symbolName = params.getParameterValue("symbol").toString();- if (symbolName.startsWith("#include")) {- // handle c/c++ include directive as CodeMirror return the whole line as a meta- symbolName = symbolName.substring("#include".length()).trim();- }-String charsToStrip = "@#'\"./\\";symbolName = StringUtils.stripEnd(StringUtils.stripStart(symbolName, charsToStrip), charsToStrip);symbolName = StringUtils.replace(symbolName, "\\", "/");diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.javaindex 77262a953e..8e09ef74f7 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java@@ -2,7 +2,6 @@ package com.gitplex.server.web.component.userchoice;import java.util.ArrayList;import java.util.Comparator;-import java.util.Iterator;import java.util.List;import com.gitplex.server.GitPlex;@@ -12,6 +11,8 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -44,12 +45,16 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {choices = new ArrayList<UserFacade>(GitPlex.getInstance(CacheManager.class).getUsers().values());}- for (Iterator<UserFacade> it = choices.iterator(); it.hasNext();) {- UserFacade user = it.next();- if (!user.matchesQuery(term))- it.remove();- }- choices.sort(Comparator.comparing(UserFacade::getName));+ choices.sort(Comparator.comparing(UserFacade::getDisplayName));++ choices = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<UserFacade>() {++ @Override+ public double getMatchScore(UserFacade object) {+ return object.getMatchScore(term);+ }++ });new ResponseFiller<UserFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.javaindex 04cf35250f..39e80601c7 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java@@ -42,6 +42,8 @@ import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.util.facade.GroupAuthorizationFacade;import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -106,11 +108,22 @@ public class GroupAuthorizationsPage extends GroupPage {authorizedProjectIds.add(authorization.getProjectId());}for (ProjectFacade project: cacheManager.getProjects().values()) {- if (project.matchesQuery(term) && !authorizedProjectIds.contains(project.getId()))+ if (!authorizedProjectIds.contains(project.getId()))notAuthorizedProjects.add(project);}Collections.sort(notAuthorizedProjects);Collections.reverse(notAuthorizedProjects);++ MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {++ @Override+ public double getMatchScore(ProjectFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ };+ notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);+new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.javaindex a8e888a60d..08f3c9c446 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java@@ -39,6 +39,8 @@ import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.facade.MembershipFacade;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;@@ -101,11 +103,21 @@ public class GroupMembershipsPage extends GroupPage {memberIds.add(membership.getUserId());}for (UserFacade user: cacheManager.getUsers().values()) {- if (user.matchesQuery(term) && !memberIds.contains(user.getId()))+ if (!memberIds.contains(user.getId()))nonMembers.add(user);}Collections.sort(nonMembers);Collections.reverse(nonMembers);++ nonMembers = MatchScoreUtils.filterAndSort(nonMembers, new MatchScoreProvider<UserFacade>() {++ @Override+ public double getMatchScore(UserFacade object) {+ return object.getMatchScore(term);+ }++ });+new ResponseFiller<>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.javaindex 8f72f7f8e9..d486b43507 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java@@ -3,7 +3,6 @@ package com.gitplex.server.web.page.project;import java.util.ArrayList;import java.util.Comparator;import java.util.HashSet;-import java.util.Iterator;import java.util.List;import java.util.Set;@@ -29,6 +28,8 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.facade.GroupAuthorizationFacade;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.ComponentRenderer;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;@@ -58,13 +59,20 @@ public class ProjectListPage extends LayoutPage {}for (ProjectFacade project: cacheManager.getProjects().values()) {- if (!projectIdsWithExplicitAdministrators.contains(project.getId())- && project.matchesQuery(searchInput)) {+ if (!projectIdsWithExplicitAdministrators.contains(project.getId())) {projects.add(project);}}projects.sort(Comparator.comparing(ProjectFacade::getName));- return projects;++ return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<ProjectFacade>() {++ @Override+ public double getMatchScore(ProjectFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);+ }++ });}};@@ -75,12 +83,16 @@ public class ProjectListPage extends LayoutPage {protected List<ProjectFacade> load() {List<ProjectFacade> projects = new ArrayList<>(GitPlex.getInstance(ProjectManager.class).getAccessibleProjects(getLoginUser()));- for (Iterator<ProjectFacade> it = projects.iterator(); it.hasNext();) {- if (!it.next().matchesQuery(searchInput))- it.remove();- }projects.sort(Comparator.comparing(ProjectFacade::getName));- return projects;++ return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<ProjectFacade>() {++ @Override+ public double getMatchScore(ProjectFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);+ }++ });}};diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 23b1b7a1b3..22d78eb300 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -75,6 +75,8 @@ import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;import com.gitplex.server.web.component.comment.CodeCommentPanel;@@ -954,13 +956,6 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe};}- private boolean matches(Symbol symbol, @Nullable String searchInput) {- if (searchInput != null)- return symbol.getName().toLowerCase().startsWith(searchInput.trim().toLowerCase());- else- return true;- }-private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,@Nullable String searchInput) {IModel<HashSet<Symbol>> state;@@ -971,8 +966,6 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe}NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols), state) {- private boolean matchFound;-@Overrideprotected void onInitialize() {super.onInitialize();@@ -1001,9 +994,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMefragment.add(link);- if (!matchFound && matches(symbol, searchInput)) {+ if (symbol == symbols.get(0)) {link.add(AttributeAppender.append("class", "active"));- matchFound = true;}return fragment;@@ -1048,17 +1040,28 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeif (key.equals("input")) {String searchInput = params.getParameterValue("param").toString();++ MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {++ @Override+ public double getMatchScore(Symbol object) {+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);+ }++ };++ List<Symbol> matchSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);+filteredSymbols = new ArrayList<>();- for (Symbol symbol: symbols) {- if (matches(symbol, searchInput)) {- Symbol current = symbol;- do {- if (!filteredSymbols.contains(current))- filteredSymbols.add(current);- current = current.getOutlineParent();- } while (current != null);+ for (Symbol symbol: matchSymbols) {+ Symbol current = symbol;+ while (current != null) {+ if (!filteredSymbols.contains(current))+ filteredSymbols.add(current);+ current = current.getOutlineParent();}}+NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);fragment.replace(tree);target.add(tree);diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 422ca10f53..dcda0e09a5 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -88,7 +88,7 @@ public abstract class QuickSearchPanel extends Panel {// now do wildcard search but exclude the exact match returned aboveif (symbolHits.size() < count) {- query = new SymbolQuery.Builder().term(searchInput+"*")+ query = new SymbolQuery.Builder().term("*"+searchInput+"*").excludeTerm(searchInput).primary(true).count(count-symbolHits.size())@@ -106,7 +106,7 @@ public abstract class QuickSearchPanel extends Panel {}if (symbolHits.size() < count) {- query = new FileQuery.Builder().fileNames(searchInput+"*")+ query = new FileQuery.Builder().fileNames("*"+searchInput+"*").excludeFileName(searchInput).count(count-symbolHits.size()).build();@@ -124,7 +124,7 @@ public abstract class QuickSearchPanel extends Panel {}if (symbolHits.size() < count) {- query = new SymbolQuery.Builder().term(searchInput+"*")+ query = new SymbolQuery.Builder().term("*"+searchInput+"*").excludeTerm(searchInput).primary(false).count(count-symbolHits.size())diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 91bb24dc15..bd45de2656 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -49,6 +49,8 @@ import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.util.facade.MembershipFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;import com.gitplex.server.util.facade.UserFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;@@ -227,11 +229,20 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {List<UserFacade> notAuthorized = new ArrayList<>();for (UserFacade user: GitPlex.getInstance(CacheManager.class).getUsers().values()) {- if (user.matchesQuery(term) && !getUserAuthorizations().containsKey(user.getId()))+ if (!getUserAuthorizations().containsKey(user.getId()))notAuthorized.add(user);}Collections.sort(notAuthorized);Collections.reverse(notAuthorized);++ notAuthorized = MatchScoreUtils.filterAndSort(notAuthorized, new MatchScoreProvider<UserFacade>() {++ @Override+ public double getMatchScore(UserFacade object) {+ return object.getMatchScore(term);+ }++ });new ResponseFiller<UserFacade>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);}@@ -433,13 +444,16 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {private List<Long> getUserIds() {- List<Long> userIds = new ArrayList<>();+ List<Long> userIds = new ArrayList<>(getUserAuthorizations().keySet());CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);- for (Long userId: getUserAuthorizations().keySet()) {- if (cacheManager.getUser(userId).matchesQuery(searchInput))- userIds.add(userId);- }- return userIds;+ return MatchScoreUtils.filterAndSort(userIds, new MatchScoreProvider<Long>() {++ @Override+ public double getMatchScore(Long object) {+ return cacheManager.getUser(object).getMatchScore(searchInput);+ }++ });}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.javaindex c181064f4b..ba697bb134 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java@@ -47,6 +47,8 @@ import com.gitplex.server.util.facade.GroupAuthorizationFacade;import com.gitplex.server.util.facade.MembershipFacade;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -209,11 +211,23 @@ public class UserAuthorizationsPage extends UserPage {List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();for (ProjectFacade project: GitPlex.getInstance(CacheManager.class).getProjects().values()) {- if (project.matchesQuery(term) && !getProjectAuthorizations().containsKey(project.getId()))+ if (!getProjectAuthorizations().containsKey(project.getId()))notAuthorizedProjects.add(project);}Collections.sort(notAuthorizedProjects);Collections.reverse(notAuthorizedProjects);++ MatchScoreProvider<ProjectFacade> matchScoreProvider = new MatchScoreProvider<ProjectFacade>() {++ @Override+ public double getMatchScore(ProjectFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ };++ notAuthorizedProjects = MatchScoreUtils.filterAndSort(notAuthorizedProjects, matchScoreProvider);+new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);}@@ -416,13 +430,17 @@ public class UserAuthorizationsPage extends UserPage {SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {private List<Long> getProjectIds() {- List<Long> projectIds = new ArrayList<>();+ List<Long> projectIds = new ArrayList<>(getProjectAuthorizations().keySet());CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);- for (Long projectId: getProjectAuthorizations().keySet()) {- if (cacheManager.getProject(projectId).matchesQuery(searchInput))- projectIds.add(projectId);- }- return projectIds;++ return MatchScoreUtils.filterAndSort(projectIds, new MatchScoreProvider<Long>() {++ @Override+ public double getMatchScore(Long object) {+ return MatchScoreUtils.getMatchScore(cacheManager.getProject(object).getName(), searchInput);+ }++ });}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.javaindex 8c3b1f5794..60f7432ac2 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java@@ -41,6 +41,8 @@ import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.matchscore.MatchScoreProvider;+import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -102,11 +104,21 @@ public class UserMembershipsPage extends UserPage {groupIds.add(membership.getGroupId());}for (GroupFacade group: cacheManager.getGroups().values()) {- if (group.matchesQuery(term) && !groupIds.contains(group.getId()))+ if (!groupIds.contains(group.getId()))notMembersOf.add(group);}Collections.sort(notMembersOf);Collections.reverse(notMembersOf);++ notMembersOf = MatchScoreUtils.filterAndSort(notMembersOf, new MatchScoreProvider<GroupFacade>() {++ @Override+ public double getMatchScore(GroupFacade object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);+ }++ });+new ResponseFiller<>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);}