The Unified and Autonomous Development Platform
feat: Issue query improvement: mix fuzzy text search and formal criterias (#1470)
Robin Shen7666dd0752e0
diff --git a/pom.xml b/pom.xmlindex 4b01441d0c..14d05bf4c6 100644--- a/pom.xml+++ b/pom.xml@@ -298,7 +298,7 @@<dependency><groupId>com.google.guava</groupId><artifactId>guava</artifactId>- <version>25.1-android</version>+ <version>32.0.1-jre</version></dependency><dependency><groupId>commons-fileupload</groupId>@@ -588,7 +588,7 @@<dependency><groupId>com.hazelcast</groupId><artifactId>hazelcast</artifactId>- <version>5.1.4</version>+ <version>5.1.7</version></dependency><dependency><groupId>com.hazelcast</groupId>@@ -614,8 +614,8 @@</repository></repositories><properties>- <commons.version>2.7.18</commons.version>- <agent.version>1.8.24</agent.version>+ <commons.version>2.7.20</commons.version>+ <agent.version>1.8.25</agent.version><slf4j.version>1.7.36</slf4j.version><logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 913c536840..3fe4483b78 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -85,7 +85,8 @@ import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.DefaultCodeIndexManager;import io.onedev.server.search.code.DefaultCodeSearchManager;-import io.onedev.server.search.entitytext.*;+import io.onedev.server.search.entitytext.DefaultIssueTextManager;+import io.onedev.server.search.entitytext.IssueTextManager;import io.onedev.server.security.*;import io.onedev.server.security.realm.AbstractAuthorizingRealm;import io.onedev.server.ssh.*;@@ -119,7 +120,10 @@ import io.onedev.server.web.editable.EditSupportLocator;import io.onedev.server.web.editable.EditSupportRegistry;import io.onedev.server.web.exception.PageExpiredExceptionHandler;import io.onedev.server.web.mapper.BasePageMapper;-import io.onedev.server.web.page.layout.*;+import io.onedev.server.web.page.layout.AdministrationMenuContribution;+import io.onedev.server.web.page.layout.AdministrationSettingContribution;+import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;+import io.onedev.server.web.page.layout.MainMenuCustomization;import io.onedev.server.web.page.project.blob.render.BlobRenderer;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.test.TestPage;@@ -163,7 +167,6 @@ import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;-import java.util.List;import java.util.concurrent.*;/**@@ -278,8 +281,6 @@ public class CoreModule extends AbstractPluginModule {bind(EmailAddressManager.class).to(DefaultEmailAddressManager.class);bind(GpgKeyManager.class).to(DefaultGpgKeyManager.class);bind(IssueTextManager.class).to(DefaultIssueTextManager.class);- bind(PullRequestTextManager.class).to(DefaultPullRequestTextManager.class);- bind(CodeCommentTextManager.class).to(DefaultCodeCommentTextManager.class);bind(PendingSuggestionApplyManager.class).to(DefaultPendingSuggestionApplyManager.class);bind(IssueAuthorizationManager.class).to(DefaultIssueAuthorizationManager.class);bind(DashboardManager.class).to(DefaultDashboardManager.class);@@ -293,8 +294,6 @@ public class CoreModule extends AbstractPluginModule {bind(ClusterManager.class).to(DefaultClusterManager.class);bind(StorageManager.class).to(DefaultStorageManager.class);bind(IssueTouchManager.class).to(DefaultIssueTouchManager.class);- bind(PullRequestTouchManager.class).to(DefaultPullRequestTouchManager.class);- bind(CodeCommentTouchManager.class).to(DefaultCodeCommentTouchManager.class);bind(AlertManager.class).to(DefaultAlertManager.class);bind(FeatureManager.class).to(DefaultFeatureManager.class);diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.javaindex a1f7e2d9ba..386c4ea2b5 100644--- a/server-core/src/main/java/io/onedev/server/ServerConfig.java+++ b/server-core/src/main/java/io/onedev/server/ServerConfig.java@@ -69,28 +69,17 @@ public class ServerConfig {if (dbUrl.startsWith("hsqldb")) {clusterIp = "127.0.0.1";} else {- String dbHost;+ String tempStr = StringUtils.substringAfter(dbUrl, "//");+ String dbHost = StringUtils.substringBefore(tempStr, ":");+ tempStr = StringUtils.substringAfter(tempStr, ":");int dbPort;- if (dbUrl.startsWith("oracle")) {- List<String> fields = Splitter.on(":").splitToList(dbUrl);- dbHost = StringUtils.stripStart(fields.get(2), "@");- String dbPortString = fields.get(3);- if (dbPortString.contains("/"))- dbPort = Integer.parseInt(StringUtils.substringBefore(dbPortString, "/"));- else- dbPort = Integer.parseInt(dbPortString);+ if (dbUrl.startsWith("sqlserver")) {+ dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, ";"));} else {- String tempStr = StringUtils.substringAfter(dbUrl, "//");- dbHost = StringUtils.substringBefore(tempStr, ":");- tempStr = StringUtils.substringAfter(tempStr, ":");- if (dbUrl.startsWith("sqlserver")) {- dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, ";"));- } else {- tempStr = StringUtils.substringBefore(tempStr, "/");- // Fix issue https://code.onedev.io/onedev/server/~issues/1086- tempStr = StringUtils.substringBefore(tempStr, ",");- dbPort = Integer.parseInt(tempStr);- }+ tempStr = StringUtils.substringBefore(tempStr, "/");+ // Fix issue https://code.onedev.io/onedev/server/~issues/1086+ tempStr = StringUtils.substringBefore(tempStr, ",");+ dbPort = Integer.parseInt(tempStr);}try (Socket socket = new Socket()) {diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex 4919c0757d..5621bc1736 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -915,9 +915,6 @@ public class Upgrade extends AbstractPlugin {hibernateProps = StringUtils.replace(hibernateProps,"hibernate.javax.cache.missing_cache_strategy=create","");- hibernateProps = StringUtils.replace(hibernateProps,- "org.hibernate.dialect.Oracle12cDialect",- "io.onedev.server.persistence.OracleDialect");hibernateProps = hibernateProps.replaceAll("\r\n(\r\n)+\r\n", "\r\n\r\n");diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 8409ef440d..30a4b69a34 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -5529,7 +5529,9 @@ public class DataMigrator {private void migrate131(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Alerts.xml")) {+ if (file.getName().startsWith("CodeCommentTouchs.xml") || file.getName().startsWith("PullRequestTouchs.xml")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("Alerts.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements())element.addElement("mailError").setText("false");diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.javadeleted file mode 100644index 8e1cd13c30..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.entitymanager;--import io.onedev.server.model.CodeCommentTouch;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.EntityManager;--import java.util.List;--public interface CodeCommentTouchManager extends EntityManager<CodeCommentTouch> {-- void touch(Project project, Long commentId);-- List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);--}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.javadeleted file mode 100644index 9ad796e5cc..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.entitymanager;--import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequestTouch;-import io.onedev.server.persistence.dao.EntityManager;--import java.util.List;--public interface PullRequestTouchManager extends EntityManager<PullRequestTouch> {-- void touch(Project project, Long requestId);-- List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);--}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.javaindex dfd74c2d3e..71661d0432 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java@@ -302,7 +302,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageprivate CriteriaQuery<Agent> buildCriteriaQuery(org.hibernate.Session session, EntityQuery<Agent> agentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Agent> query = builder.createQuery(Agent.class);+ CriteriaQuery<Agent> query = builder.createQuery(Agent.class).distinct(true);Root<Agent> root = query.from(Agent.class);query.select(root);@@ -345,7 +345,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageif (agentCriteria != null)criteriaQuery.where(agentCriteria.getPredicate(criteriaQuery, root, builder));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 286f35074d..9a314a4707 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -530,7 +530,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate CriteriaQuery<Build> buildCriteriaQuery(@Nullable Project project,Session session, EntityQuery<Build> buildQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class);+ CriteriaQuery<Build> query = builder.createQuery(Build.class).distinct(true);Root<Build> root = query.from(Build.class);query.select(root);@@ -596,7 +596,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuicriteriaQuery.where(getPredicates(project, buildCriteria, criteriaQuery, root, builder));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 4492175b5b..b41c24558e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -248,7 +248,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imprivate CriteriaQuery<CodeComment> buildCriteriaQuery(Project project, Session session,PullRequest request, EntityQuery<CodeComment> commentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);+ CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class).distinct(true);Root<CodeComment> root = query.from(CodeComment.class);query.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));@@ -288,7 +288,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imcriteriaQuery.where(getPredicates(project, commentCriteria, request, criteriaQuery, root, builder));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.javadeleted file mode 100644index 4462dc1ec0..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java+++ /dev/null@@ -1,90 +0,0 @@-package io.onedev.server.entitymanager.impl;--import io.onedev.server.entitymanager.CodeCommentTouchManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.event.Listen;-import io.onedev.server.event.entity.EntityPersisted;-import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.model.*;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.BaseEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import org.hibernate.criterion.Restrictions;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.List;--import static io.onedev.server.model.CodeCommentTouch.PROP_COMMENT_ID;-import static java.lang.String.format;--@Singleton-public class DefaultCodeCommentTouchManager extends BaseEntityManager<CodeCommentTouch>- implements CodeCommentTouchManager {-- private final ProjectManager projectManager;-- private final TransactionManager transactionManager;-- @Inject- public DefaultCodeCommentTouchManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager) {- super(dao);- this.projectManager = projectManager;- this.transactionManager = transactionManager;- }-- @Transactional- @Override- public void touch(Project project, Long commentId) {- var projectId = project.getId();- transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {- var innerProject = projectManager.load(projectId);- var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));- query.setParameter("project", innerProject);- query.setParameter(PROP_COMMENT_ID, commentId);- query.executeUpdate();-- var touch = new CodeCommentTouch();- touch.setProject(innerProject);- touch.setCommentId(commentId);- dao.persist(touch);- }));- }-- @Sessional- @Override- public List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {- EntityCriteria<CodeCommentTouch> criteria = EntityCriteria.of(CodeCommentTouch.class);- criteria.add(Restrictions.eq("project.id", projectId));- criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));- return dao.query(criteria, 0, count);- }-- @Transactional- @Listen- public void on(EntityPersisted event) {- if (event.getEntity() instanceof CodeComment) {- CodeComment comment = (CodeComment) event.getEntity();- touch(comment.getProject(), comment.getId());- } else if (event.getEntity() instanceof CodeCommentReply) {- CodeCommentReply reply = (CodeCommentReply) event.getEntity();- touch(reply.getComment().getProject(), reply.getComment().getId());- }- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof CodeComment) {- CodeComment comment = (CodeComment) event.getEntity();- touch(comment.getProject(), comment.getId());- } else if (event.getEntity() instanceof CodeCommentReply) {- CodeCommentReply reply = (CodeCommentReply) event.getEntity();- touch(reply.getComment().getProject(), reply.getComment().getId());- }- }--}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 252cc502ce..71494eb697 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -251,7 +251,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic List<Issue> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery,boolean loadFieldsAndLinks, int firstResult, int maxResults) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);+ CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class).distinct(true);Root<Issue> root = criteriaQuery.from(Issue.class);criteriaQuery.where(getPredicates(projectScope, issueQuery.getCriteria(), criteriaQuery, builder, root));@@ -284,7 +284,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IsscriteriaQuery.where(getPredicates(projectScope, issueCriteria, criteriaQuery, builder, root));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 6a748b6492..4719a51e78 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -843,7 +843,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, @Nullable Project targetProject,EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);+ CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class).distinct(true);Root<PullRequest> root = query.from(PullRequest.class);query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));@@ -894,7 +894,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>criteriaQuery.where(getPredicates(targetProject, requestCriteria, criteriaQuery, root, builder));- criteriaQuery.select(builder.count(root));+ criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.javadeleted file mode 100644index 3f88118001..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java+++ /dev/null@@ -1,97 +0,0 @@-package io.onedev.server.entitymanager.impl;--import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestTouchManager;-import io.onedev.server.event.Listen;-import io.onedev.server.event.entity.EntityPersisted;-import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.model.*;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.BaseEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import org.hibernate.criterion.Restrictions;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.List;--import static io.onedev.server.model.PullRequestTouch.PROP_REQUEST_ID;-import static java.lang.String.format;--@Singleton-public class DefaultPullRequestTouchManager extends BaseEntityManager<PullRequestTouch>- implements PullRequestTouchManager {-- private final ProjectManager projectManager;-- private final TransactionManager transactionManager;-- @Inject- public DefaultPullRequestTouchManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager) {- super(dao);- this.projectManager = projectManager;- this.transactionManager = transactionManager;- }-- @Transactional- @Override- public void touch(Project project, Long requestId) {- var projectId = project.getId();- transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {- var innerProject = projectManager.load(projectId);- var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));- query.setParameter("project", innerProject);- query.setParameter(PROP_REQUEST_ID, requestId);- query.executeUpdate();-- var touch = new PullRequestTouch();- touch.setProject(innerProject);- touch.setRequestId(requestId);- dao.persist(touch);- }));-- }-- @Sessional- @Override- public List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {- EntityCriteria<PullRequestTouch> criteria = EntityCriteria.of(PullRequestTouch.class);- criteria.add(Restrictions.eq("project.id", projectId));- criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));- return dao.query(criteria, 0, count);- }-- @Transactional- @Listen- public void on(EntityPersisted event) {- if (event.getEntity() instanceof PullRequest) {- PullRequest request = (PullRequest) event.getEntity();- touch(request.getProject(), request.getId());- } else if (event.getEntity() instanceof PullRequestComment) {- PullRequestComment comment = (PullRequestComment) event.getEntity();- touch(comment.getRequest().getProject(), comment.getRequest().getId());- } else if (event.getEntity() instanceof PullRequestUpdate) {- PullRequestUpdate update = (PullRequestUpdate) event.getEntity();- touch(update.getRequest().getProject(), update.getRequest().getId());- }- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof PullRequest) {- PullRequest request = (PullRequest) event.getEntity();- touch(request.getProject(), request.getId());- } else if (event.getEntity() instanceof PullRequestComment) {- PullRequestComment comment = (PullRequestComment) event.getEntity();- touch(comment.getRequest().getProject(), comment.getRequest().getId());- } else if (event.getEntity() instanceof PullRequestUpdate) {- PullRequestUpdate update = (PullRequestUpdate) event.getEntity();- touch(update.getRequest().getProject(), update.getRequest().getId());- }- }--}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.javadeleted file mode 100644index 6a353fd3f9..0000000000--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java+++ /dev/null@@ -1,55 +0,0 @@-package io.onedev.server.model;--import io.onedev.server.model.support.EntityTouch;--import javax.persistence.*;--import static io.onedev.server.model.CodeCommentTouch.*;--@Entity-@Table(- indexes={- @Index(columnList="o_project_id"),- @Index(columnList= PROP_COMMENT_ID)})-public class CodeCommentTouch extends EntityTouch {-- private static final long serialVersionUID = 1L;-- public static final String PROP_COMMENT_ID = "commentId";-- @ManyToOne(fetch=FetchType.LAZY)- private Project project;-- private Long commentId;-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- public Long getCommentId() {- return commentId;- }-- public void setCommentId(Long commentId) {- this.commentId = commentId;- }-- @Override- public Class<? extends AbstractEntity> getEntityClass() {- return CodeComment.class;- }-- @Override- public Long getProjectId() {- return getProject().getId();- }-- @Override- public Long getEntityId() {- return getCommentId();- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 8a24413bbd..fe3ebed511 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -229,9 +229,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@OneToMany(mappedBy="sourceProject")private Collection<PullRequest> outgoingRequests = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<PullRequestTouch> requestTouches = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Issue> issues = new ArrayList<>();@@ -268,9 +265,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<CodeComment> codeComments = new ArrayList<>();- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CodeCommentTouch> codeCommentTouches = new ArrayList<>();-@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<IssueQueryPersonalization> issueQueryPersonalizations = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.javadeleted file mode 100644index e81b5e74ba..0000000000--- a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java+++ /dev/null@@ -1,56 +0,0 @@-package io.onedev.server.model;--import io.onedev.server.model.support.EntityTouch;--import javax.persistence.*;--import static io.onedev.server.model.PullRequestTouch.*;--@Entity-@Table(- indexes={- @Index(columnList="o_project_id"),- @Index(columnList= PROP_REQUEST_ID)})-public class PullRequestTouch extends EntityTouch {-- private static final long serialVersionUID = 1L;-- public static final String PROP_REQUEST_ID = "requestId";-- @ManyToOne(fetch=FetchType.LAZY)- private Project project;-- private Long requestId;-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- public Long getRequestId() {- return requestId;- }-- public void setRequestId(Long requestId) {- this.requestId = requestId;- }-- @Override- public Class<? extends AbstractEntity> getEntityClass() {- return PullRequest.class;- }-- @Override- public Long getProjectId() {- return getProject().getId();- }-- @Override- public Long getEntityId() {- return getRequestId();- }--}diff --git a/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.java b/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.javadeleted file mode 100644index 509d527973..0000000000--- a/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.persistence;--import org.hibernate.dialect.Oracle12cDialect;--import java.sql.Types;--public class OracleDialect extends Oracle12cDialect {- @Override- protected void registerCharacterTypeMappings() {- super.registerCharacterTypeMappings();- registerColumnType( Types.VARCHAR, "clob" );- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.javaindex 9591171127..a6369718c3 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java@@ -62,7 +62,7 @@ public class BuildMetricQuery implements Serializable {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed metric query", e);+ throw new RuntimeException("Malformed query", e);}});diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4index 6566f1f4dd..416975ad74 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4@@ -2,6 +2,7 @@ grammar CommitQuery;query: WS* criteria (WS+ criteria)* WS* EOF+ | WS* EOF;criteria@@ -12,6 +13,7 @@ criteria| authorCriteria| pathCriteria| messageCriteria+ | fuzzyCriteria;revisionCriteria@@ -44,6 +46,10 @@ messageCriteria: MESSAGE Value;+fuzzyCriteria+ : Fuzzy+ ;+SINCE: 'since';@@ -103,7 +109,11 @@ CommittedByMeDefaultBranch: 'default-branch';-++Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';@@ -111,3 +121,7 @@ WSValue: '(' ('\\'.|~[\\()])+? ')';++Identifier+ : [a-zA-Z0-9:_/\\+\-;]++ ;diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex 40fe8092d0..d5c3cddab0 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -6,6 +6,8 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.search.entity.project.ProjectQueryBaseVisitor;+import io.onedev.server.util.criteria.Criteria;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CharStream;@@ -17,9 +19,7 @@ import org.antlr.v4.runtime.tree.TerminalNode;import org.apache.commons.lang.math.NumberUtils;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.project.RefUpdated;@@ -28,6 +28,9 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;+import static io.onedev.commons.codeassist.FenceAware.*;+import static io.onedev.commons.utils.StringUtils.*;+public class CommitQuery implements Serializable {private static final long serialVersionUID = 1L;@@ -49,7 +52,7 @@ public class CommitQuery implements Serializable {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed commit query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -64,6 +67,7 @@ public class CommitQuery implements Serializable {List<String> afterValues = new ArrayList<>();List<String> pathValues = new ArrayList<>();List<String> messageValues = new ArrayList<>();+ List<String> fuzzyValues = new ArrayList<>();List<Revision> revisions = new ArrayList<>();for (CriteriaContext criteria: parser.query().criteria()) {@@ -83,8 +87,10 @@ public class CommitQuery implements Serializable {} else {committerValues.add(getValue(criteria.committerCriteria().Value()));}- } else if (criteria.messageCriteria() != null) {+ } else if (criteria.messageCriteria() != null) {messageValues.add(getValue(criteria.messageCriteria().Value()));+ } else if (criteria.fuzzyCriteria() != null) {+ fuzzyValues.add(unescape(unfence(criteria.fuzzyCriteria().getText())));} else if (criteria.pathCriteria() != null) {pathValues.add(getValue(criteria.pathCriteria().Value()));} else if (criteria.beforeCriteria() != null) {@@ -137,13 +143,15 @@ public class CommitQuery implements Serializable {criterias.add(new AfterCriteria(afterValues));if (!revisions.isEmpty())criterias.add(new RevisionCriteria(revisions));+ if (!fuzzyValues.isEmpty())+ criterias.add(new FuzzyCriteria(fuzzyValues));}return new CommitQuery(criterias);}private static String getValue(TerminalNode valueNode) {- return StringUtils.unescape(FenceAware.unfence(valueNode.getText()));+ return unescape(unfence(valueNode.getText()));}public boolean matches(RefUpdated event) {@@ -173,7 +181,7 @@ public class CommitQuery implements Serializable {List<String> parts = new ArrayList<>();for (CommitCriteria criteria: criterias)parts.add(criteria.toString());- return StringUtils.join(parts, " ");+ return join(parts, " ");}}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.javanew file mode 100644index 0000000000..2a57348e07--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java@@ -0,0 +1,63 @@+package io.onedev.server.search.commit;++import com.google.common.base.Preconditions;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.git.command.RevListOptions;+import io.onedev.server.model.Project;+import org.eclipse.jgit.revwalk.RevCommit;++import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.util.match.WildcardUtils.matchString;++public class FuzzyCriteria extends CommitCriteria {++ private static final long serialVersionUID = 1L;++ private final List<String> values;++ public FuzzyCriteria(List<String> values) {+ Preconditions.checkArgument(!values.isEmpty());+ this.values = values;+ }++ public List<String> getValues() {+ return values;+ }++ @Override+ public void fill(Project project, RevListOptions options) {+ for (String value: values) {+ if (value.length() >= 4 && project.getObjectId(value, false) != null)+ options.revisions().add(value);+ else+ options.messages().add(value);+ }+ if (options.revisions().size() == 1)+ options.count(1);+ }++ @Override+ public boolean matches(RefUpdated event) {+ var project = event.getProject();+ RevCommit commit = project.getRevCommit(event.getNewCommitId(), true);+ for (String value: values) {+ if (value.length() >= 4 && commit.equals(project.getObjectId(value, false))+ || matchString("*" + value + "*", commit.getFullMessage())) {+ return true;+ }+ }+ return false;+ }++ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values)+ parts.add("~" + StringUtils.escape(value, "~") + "~");+ return StringUtils.join(parts, " ");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4index e045c87714..81b5e9df7e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4@@ -14,6 +14,7 @@ criteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;order@@ -96,6 +97,10 @@ Quoted: '"' ('\\'.|~[\\"])+? '"';+Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.javaindex 8830387a66..352003641f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java@@ -8,7 +8,6 @@ import io.onedev.server.model.Agent;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.agent.AgentQueryParser.*;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;@@ -17,10 +16,10 @@ import org.antlr.v4.runtime.*;import javax.annotation.Nullable;import java.util.ArrayList;-import java.util.Collection;import java.util.List;import static io.onedev.server.model.Agent.*;+import static io.onedev.server.search.entity.agent.AgentQueryParser.*;public class AgentQuery extends EntityQuery<Agent> {@@ -53,7 +52,7 @@ public class AgentQuery extends EntityQuery<Agent> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed agent query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -67,6 +66,11 @@ public class AgentQuery extends EntityQuery<Agent> {if (criteriaContext != null) {agentCriteria = new AgentQueryBaseVisitor<Criteria<Agent>>() {+ @Override+ public Criteria<Agent> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }+@Overridepublic Criteria<Agent> visitOperatorCriteria(OperatorCriteriaContext ctx) {if (forExecutor)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.javanew file mode 100644index 0000000000..02eb03bfc0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java@@ -0,0 +1,57 @@+package io.onedev.server.search.entity.agent;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Agent;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++import static com.google.common.collect.Lists.newArrayList;++public class FuzzyCriteria extends Criteria<Agent> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(Agent agent) {+ return parse(value).matches(agent);+ }++ private Criteria<Agent> parse(String value) {+ var criterias = new ArrayList<Criteria<Agent>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ criterias.add(new OrCriteria<>(newArrayList(+ new NameCriteria("*" + part + "*"),+ new IpAddressCriteria("*" + part + "*"),+ new OsCriteria("*" + part + "*"),+ new OsVersionCriteria("*" + part + "*"),+ new OsArchCriteria("*" + part + "*")+ )));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.javaindex ab108cbce1..94483e05e4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java@@ -20,7 +20,8 @@ public class OsCriteria extends Criteria<Agent> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {- return builder.equal(from.get(Agent.PROP_OS_NAME), value);+ String normalized = value.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(from.get(Agent.PROP_OS_NAME)), normalized);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 78e2255ad3..b4da54967e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -11,10 +11,12 @@ criteria| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria| operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|InPipelineOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | Hash? number=Number #NumberCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;order@@ -145,10 +147,22 @@ RParens: ')';+Hash+ : '#'+ ;+Quoted: '"' ('\\'.|~[\\"])+? '"';+Number+ : [0-9]++ ;++Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex c1c7dffba6..f13a78de2e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -1,36 +1,5 @@package io.onedev.server.search.entity.build;-import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;-import static io.onedev.server.model.Build.NAME_BRANCH;-import static io.onedev.server.model.Build.NAME_LABEL;-import static io.onedev.server.model.Build.NAME_COMMIT;-import static io.onedev.server.model.Build.NAME_FINISH_DATE;-import static io.onedev.server.model.Build.NAME_JOB;-import static io.onedev.server.model.Build.NAME_PENDING_DATE;-import static io.onedev.server.model.Build.NAME_PROJECT;-import static io.onedev.server.model.Build.NAME_PULL_REQUEST;-import static io.onedev.server.model.Build.NAME_RUNNING_DATE;-import static io.onedev.server.model.Build.NAME_STATUS;-import static io.onedev.server.model.Build.NAME_SUBMIT_DATE;-import static io.onedev.server.model.Build.NAME_TAG;-import static io.onedev.server.model.Build.NAME_VERSION;-import static io.onedev.server.model.Build.ORDER_FIELDS;-import static io.onedev.server.model.Build.QUERY_FIELDS;--import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -40,22 +9,21 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.build.BuildQueryParser.AndCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.CriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.NotCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.OperatorCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.OrCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;-import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;-import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;+import org.antlr.v4.runtime.*;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;+import static io.onedev.server.model.Build.*;+import static io.onedev.server.search.entity.build.BuildQueryParser.*;public class BuildQuery extends EntityQuery<Build> {@@ -89,7 +57,7 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed build query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -103,6 +71,16 @@ public class BuildQuery extends EntityQuery<Build> {if (criteriaContext != null) {buildCriteria = new BuildQueryBaseVisitor<Criteria<Build>>() {+ @Override+ public Criteria<Build> visitNumberCriteria(NumberCriteriaContext ctx) {+ return new SimpleNumberCriteria(getLongValue(ctx.number.getText()));+ }++ @Override+ public Criteria<Build> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }+@Overridepublic Criteria<Build> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.javanew file mode 100644index 0000000000..2a6ec3555a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java@@ -0,0 +1,54 @@+package io.onedev.server.search.entity.build;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++import static com.google.common.collect.Lists.newArrayList;++public class FuzzyCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(Build build) {+ return parse(value).matches(build);+ }++ private Criteria<Build> parse(String value) {+ var criterias = new ArrayList<Criteria<Build>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ criterias.add(new OrCriteria<>(newArrayList(+ new VersionCriteria("*" + part + "*"),+ new JobCriteria("*" + part + "*")+ )));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SimpleNumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SimpleNumberCriteria.javanew file mode 100644index 0000000000..8b1f889557--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SimpleNumberCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.build;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++public class SimpleNumberCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final long value;++ public SimpleNumberCriteria(long value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ return builder.equal(from.get(Build.PROP_NUMBER), value);+ }++ @Override+ public boolean matches(Build build) {+ return build.getNumber() == value;+ }++ @Override+ public String toStringWithoutParens() {+ return "#" + value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index b07a06c12b..75f2b5401e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -14,6 +14,7 @@ criteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;order@@ -116,6 +117,10 @@ Quoted: '"' ('\\'.|~[\\"])+? '"';+Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 9110b00df0..97dd477fae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -1,28 +1,5 @@package io.onedev.server.search.entity.codecomment;-import static io.onedev.server.model.CodeComment.NAME_CONTENT;-import static io.onedev.server.model.CodeComment.NAME_CREATE_DATE;-import static io.onedev.server.model.CodeComment.NAME_PATH;-import static io.onedev.server.model.CodeComment.NAME_REPLY;-import static io.onedev.server.model.CodeComment.NAME_REPLY_COUNT;-import static io.onedev.server.model.CodeComment.NAME_LAST_ACTIVITY_DATE;-import static io.onedev.server.model.CodeComment.ORDER_FIELDS;-import static io.onedev.server.model.CodeComment.QUERY_FIELDS;--import java.util.ArrayList;-import java.util.Date;-import java.util.List;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.CodeComment;@@ -30,21 +7,20 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.AndCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.CriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.NotCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OperatorCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;+import org.antlr.v4.runtime.*;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Date;+import java.util.List;++import static io.onedev.server.model.CodeComment.*;+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.*;public class CodeCommentQuery extends EntityQuery<CodeComment> {@@ -78,7 +54,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed code comment query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -91,6 +67,10 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {Criteria<CodeComment> commentCriteria;if (criteriaContext != null) {commentCriteria = new CodeCommentQueryBaseVisitor<Criteria<CodeComment>>() {+ @Override+ public Criteria<CodeComment> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }@Overridepublic Criteria<CodeComment> visitOperatorCriteria(OperatorCriteriaContext ctx) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.javanew file mode 100644index 0000000000..ad9735bf5a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.search.entity.codecomment;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.CodeComment;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++import static com.google.common.collect.Lists.newArrayList;++public class FuzzyCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(CodeComment comment) {+ return parse(value).matches(comment);+ }++ private Criteria<CodeComment> parse(String value) {+ var criterias = new ArrayList<Criteria<CodeComment>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ criterias.add(new OrCriteria<>(newArrayList(+ new ContentCriteria(part),+ new ReplyCriteria(part),+ new PathCriteria("*" + part + "*")+ )));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.javanew file mode 100644index 0000000000..f5197d212c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.search.entity.issue;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Issue;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++import static com.google.common.collect.Lists.newArrayList;++public class FuzzyCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(Issue issue) {+ return parse(value).matches(issue);+ }++ private Criteria<Issue> parse(String value) {+ var criterias = new ArrayList<Criteria<Issue>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ criterias.add(new OrCriteria<>(+ new TitleCriteria(part),+ new DescriptionCriteria(part),+ new CommentCriteria(part)+ ));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 7451649c34..ac4a0d2ab4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -12,11 +12,13 @@ criteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | Hash? number=Number #NumberCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| scope=(Any|All) WS+ linkSpec=Quoted WS+ Matching WS* LParens WS* criteria WS* RParens #LinkMatchCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;revisionCriteria@@ -82,7 +84,7 @@ SubmittedByMeCommentedByMe: 'commented' WS+ 'by' WS+ 'me';-+Confidential: 'confidential';@@ -120,13 +122,13 @@ IsLessThan;IsAfter- : 'is' WS+ 'after'+ : 'is' WS+ 'after';IsBefore: 'is' WS+ 'before';-+IsSince: 'is' WS+ 'since';@@ -174,7 +176,7 @@ AnyAll: 'all';-+HasAny: 'has' WS+ 'any';@@ -199,10 +201,22 @@ RParens: ')';+Hash+ : '#'+ ;+Quoted: '"' ('\\'.|~[\\"])+? '"';+Number+ : [0-9]++ ;++Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 15a2f7daab..f19cc6aa8d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -1,24 +1,5 @@package io.onedev.server.search.entity.issue;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -27,37 +8,12 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.field.spec.BooleanField;-import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.*;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;-import io.onedev.server.model.support.issue.field.spec.CommitField;-import io.onedev.server.model.support.issue.field.spec.DateField;-import io.onedev.server.model.support.issue.field.spec.DateTimeField;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;-import io.onedev.server.model.support.issue.field.spec.IntegerField;-import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;-import io.onedev.server.model.support.issue.field.spec.MilestoneChoiceField;-import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;-import io.onedev.server.model.support.issue.field.spec.TextField;import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.issue.IssueQueryParser.AndCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.CriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.FixedBetweenCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.LinkMatchCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.NotCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.OrCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.OrderContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;-import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;@@ -69,8 +25,12 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.util.WicketUtils;+import org.antlr.v4.runtime.*;-import static com.google.common.collect.Lists.newArrayList;+import javax.annotation.Nullable;+import java.util.*;++import static io.onedev.server.search.entity.issue.IssueQueryParser.*;public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue> {@@ -113,7 +73,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed issue query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -133,6 +93,16 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>return choices.indexOf(value);}+ @Override+ public Criteria<Issue> visitNumberCriteria(NumberCriteriaContext ctx) {+ return new SimpleNumberCriteria(getLongValue(ctx.number.getText()));+ }++ @Override+ public Criteria<Issue> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }+@Overridepublic Criteria<Issue> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {@@ -382,20 +352,6 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}}- public static IssueQuery parseFuzzy(@Nullable Project project, String queryString) {- try {- EntityQuery.getProjectScopedNumber(project, queryString);- return new IssueQuery(new NumberCriteria(project, queryString, IssueQueryLexer.Is));- } catch (Exception e2) {- List<Criteria<Issue>> criterias = newArrayList(- new TitleCriteria(queryString),- new DescriptionCriteria(queryString),- new CommentCriteria(queryString)- );- return new IssueQuery(new OrCriteria<>(criterias));- }- }-private static GlobalIssueSetting getGlobalIssueSetting() {if (WicketUtils.getPage() instanceof IssueSettingPage)return ((IssueSettingPage) WicketUtils.getPage()).getSetting();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SimpleNumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SimpleNumberCriteria.javanew file mode 100644index 0000000000..54811d145e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SimpleNumberCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.issue;++import io.onedev.server.model.Issue;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++public class SimpleNumberCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ private final long value;++ public SimpleNumberCriteria(long value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ return builder.equal(from.get(Issue.PROP_NUMBER), value);+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getNumber() == value;+ }++ @Override+ public String toStringWithoutParens() {+ return "#" + value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.javanew file mode 100644index 0000000000..dfd2b61447--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java@@ -0,0 +1,51 @@+package io.onedev.server.search.entity.project;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Project;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++public class FuzzyCriteria extends Criteria<Project> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(Project project) {+ return parse(value).matches(project);+ }++ private Criteria<Project> parse(String value) {+ var criterias = new ArrayList<Criteria<Project>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ if (Project.get() != null)+ criterias.add(new NameCriteria("*" + part + "*"));+ else+ criterias.add(new PathCriteria("*" + part + "*"));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.javaindex 11dc951dcd..89c30c6242 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java@@ -1,9 +1,6 @@package io.onedev.server.search.entity.project;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.*;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;@@ -23,7 +20,8 @@ public class PathCriteria extends Criteria<Project> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {- return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, from, value);+ Path<String> attribute = from.get(Project.PROP_PATH);+ return builder.like(builder.lower(attribute), value.toLowerCase().replace("*", "%"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4index ada6cba20c..423fbb8980 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4@@ -14,6 +14,7 @@ criteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;order@@ -116,6 +117,10 @@ Quoted: '"' ('\\'.|~[\\"])+? '"';+Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 9f8fd8c9da..aa6c2c4bdf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -6,7 +6,6 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.project.ProjectQueryParser.*;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;@@ -32,6 +31,7 @@ import static io.onedev.server.search.entity.project.ProjectQueryLexer.OwnedByNoimport static io.onedev.server.search.entity.project.ProjectQueryLexer.Roots;import static io.onedev.server.search.entity.project.ProjectQueryLexer.WithoutEnoughReplicas;import static io.onedev.server.search.entity.project.ProjectQueryLexer.ruleNames;+import static io.onedev.server.search.entity.project.ProjectQueryParser.*;public class ProjectQuery extends EntityQuery<Project> {@@ -73,7 +73,7 @@ public class ProjectQuery extends EntityQuery<Project> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed project query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -87,6 +87,11 @@ public class ProjectQuery extends EntityQuery<Project> {if (criteriaContext != null) {projectCriteria = new ProjectQueryBaseVisitor<Criteria<Project>>() {+ @Override+ public Criteria<Project> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }+@Overridepublic Criteria<Project> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.javanew file mode 100644index 0000000000..641c9cc1a8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.search.entity.pullrequest;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import java.util.ArrayList;++import static com.google.common.collect.Lists.newArrayList;++public class FuzzyCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public FuzzyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ return parse(value).getPredicate(query, from, builder);+ }++ @Override+ public boolean matches(PullRequest request) {+ return parse(value).matches(request);+ }++ private Criteria<PullRequest> parse(String value) {+ var criterias = new ArrayList<Criteria<PullRequest>>();+ for (var part: Splitter.on(' ').omitEmptyStrings().trimResults().split(value)) {+ criterias.add(new OrCriteria<>(newArrayList(+ new TitleCriteria(part),+ new DescriptionCriteria(part),+ new CommentCriteria(part)+ )));+ }+ return new AndCriteria<>(criterias);+ }++ @Override+ public String toStringWithoutParens() {+ return "~" + StringUtils.escape(value, "~") + "~";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index 01448f9238..5d1e9771d9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -10,10 +10,12 @@ criteria: operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|CommentedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria| operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | Hash? number=Number #NumberCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria+ | Fuzzy #FuzzyCriteria;order@@ -172,10 +174,22 @@ RParens: ')';+Hash+ : '#'+ ;+Quoted: '"' ('\\'.|~[\\"])+? '"';+Number+ : [0-9]++ ;++Fuzzy+ : '~' ('\\'.|~[~])+? '~'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 5688917078..aa7e01b7cf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -36,6 +36,8 @@ import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.*;+public class PullRequestQuery extends EntityQuery<PullRequest> {private static final long serialVersionUID = 1L;@@ -67,7 +69,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new RuntimeException("Malformed pull request query", e);+ throw new RuntimeException("Malformed query", e);}});@@ -81,6 +83,16 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (criteriaContext != null) {requestCriteria = new PullRequestQueryBaseVisitor<Criteria<PullRequest>>() {+ @Override+ public Criteria<PullRequest> visitNumberCriteria(NumberCriteriaContext ctx) {+ return new SimpleNumberCriteria(getLongValue(ctx.number.getText()));+ }++ @Override+ public Criteria<PullRequest> visitFuzzyCriteria(FuzzyCriteriaContext ctx) {+ return new FuzzyCriteria(getValue(ctx.getText()));+ }+@Overridepublic Criteria<PullRequest> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SimpleNumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SimpleNumberCriteria.javanew file mode 100644index 0000000000..a9f76a14e3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SimpleNumberCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.server.model.PullRequest;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++public class SimpleNumberCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final long value;++ public SimpleNumberCriteria(long value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ return builder.equal(from.get(PullRequest.PROP_NUMBER), value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getNumber() == value;+ }++ @Override+ public String toStringWithoutParens() {+ return "#" + value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.javadeleted file mode 100644index 19de77f0c9..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.java+++ /dev/null@@ -1,17 +0,0 @@-package io.onedev.server.search.entitytext;--import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Project;--public interface CodeCommentTextManager {-- long count(@Nullable Project project, String queryString);-- List<CodeComment> query(@Nullable Project project, String queryString,- int firstResult, int maxResults);--}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.javadeleted file mode 100644index 26d7875519..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java+++ /dev/null@@ -1,130 +0,0 @@-package io.onedev.server.search.entitytext;--import com.google.common.collect.Sets;-import io.onedev.commons.loader.ManagedSerializedForm;-import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.CodeCommentTouchManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.EntityTouch;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.concurrent.BatchWorkManager;-import io.onedev.server.util.lucene.BooleanQueryBuilder;-import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.document.Document;-import org.apache.lucene.document.LongPoint;-import org.apache.lucene.document.StringField;-import org.apache.lucene.document.TextField;-import org.apache.lucene.index.Term;-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;-import org.apache.lucene.queryparser.classic.ParseException;-import org.apache.lucene.search.BooleanClause.Occur;-import org.apache.lucene.search.BoostQuery;-import org.apache.lucene.search.PrefixQuery;-import org.apache.lucene.search.Query;-import org.apache.lucene.search.WildcardQuery;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.io.ObjectStreamException;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import static io.onedev.server.util.lucene.LuceneUtils.escape;-import static org.apache.lucene.document.Field.Store.NO;-import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;--@Singleton-public class DefaultCodeCommentTextManager extends ProjectTextManager<CodeComment>- implements CodeCommentTextManager {-- private static final String FIELD_PATH = "path";-- private static final String FIELD_COMMENT = "comment";-- private static final String FIELD_REPLY = "reply";-- private final CodeCommentTouchManager touchManager;-- @Inject- public DefaultCodeCommentTextManager(Dao dao, BatchWorkManager batchWorkManager, TransactionManager transactionManager,- ProjectManager projectManager, ClusterManager clusterManager,- SessionManager sessionManager, CodeCommentTouchManager touchManager) {- super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);- this.touchManager = touchManager;- }-- public Object writeReplace() throws ObjectStreamException {- return new ManagedSerializedForm(CodeCommentTextManager.class);- }-- @Override- protected int getIndexVersion() {- return 7;- }-- @Override- protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {- return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);- }-- @Override- protected void addFields(Document document, CodeComment entity) {- document.add(new StringField(FIELD_PATH, entity.getMark().getPath(), NO));- document.add(new TextField(FIELD_COMMENT, entity.getContent(), NO));- for (CodeCommentReply reply: entity.getReplies())- document.add(new TextField(FIELD_REPLY, reply.getContent(), NO));- }-- @Nullable- private EntityTextQuery buildQuery(Project project, String queryString) {- var escaped = escape(queryString);- if (escaped != null) {- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();- queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();-- Query pathQuery = new BoostQuery(new WildcardQuery(new Term(FIELD_PATH, "*" + escaped + "*")), 0.75f);- contentQueryBuilder.add(pathQuery, SHOULD);- try (Analyzer analyzer = newAnalyzer()) {- Map<String, Float> boosts = new HashMap<>();- boosts.put(FIELD_COMMENT, 0.75f);- boosts.put(FIELD_REPLY, 0.5f);- MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[] {FIELD_COMMENT, FIELD_REPLY}, analyzer, boosts) {-- protected Query newTermQuery(Term term, float boost) {- return new BoostQuery(new PrefixQuery(term), boost);- }-- };- contentQueryBuilder.add(parser.parse(escaped), SHOULD);- } catch (ParseException e) {- throw new RuntimeException(e);- }- queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);- var query = queryBuilder.build();- if (query != null)- return new EntityTextQuery(query, Sets.newHashSet(project.getId()));- }- return null;- }-- @Override- public List<CodeComment> query(@Nullable Project project, String queryString,- int firstResult, int maxResults) {- return search(buildQuery(project, queryString), firstResult, maxResults);- }-- @Override- public long count(@Nullable Project project, String queryString) {- return count(buildQuery(project, queryString));- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.javadeleted file mode 100644index 740288af48..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java+++ /dev/null@@ -1,166 +0,0 @@-package io.onedev.server.search.entitytext;--import io.onedev.commons.loader.ManagedSerializedForm;-import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.*;-import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.support.EntityTouch;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.util.concurrent.BatchWorkManager;-import io.onedev.server.util.lucene.BooleanQueryBuilder;-import io.onedev.server.util.lucene.LuceneUtils;-import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.document.Document;-import org.apache.lucene.document.LongPoint;-import org.apache.lucene.document.TextField;-import org.apache.lucene.index.Term;-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;-import org.apache.lucene.queryparser.classic.ParseException;-import org.apache.lucene.search.BooleanClause.Occur;-import org.apache.lucene.search.BoostQuery;-import org.apache.lucene.search.PrefixQuery;-import org.apache.lucene.search.Query;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.io.ObjectStreamException;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;--import static java.util.stream.Collectors.toList;-import static org.apache.lucene.document.Field.Store.NO;-import static org.apache.lucene.document.LongPoint.newExactQuery;--@Singleton-public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequest>- implements PullRequestTextManager {-- private static final String FIELD_NUMBER = "number";-- private static final String FIELD_TITLE = "title";-- private static final String FIELD_DESCRIPTION = "description";-- private static final String FIELD_COMMENT = "comment";-- private final PullRequestReviewManager reviewManager;-- private final BuildManager buildManager;-- private final UserManager userManager;-- private final PullRequestTouchManager touchManager;-- @Inject- public DefaultPullRequestTextManager(Dao dao, UserManager userManager, BatchWorkManager batchWorkManager,- TransactionManager transactionManager, ProjectManager projectManager,- PullRequestReviewManager reviewManager, BuildManager buildManager,- ClusterManager clusterManager, SessionManager sessionManager,- PullRequestTouchManager touchManager) {- super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);- this.reviewManager = reviewManager;- this.buildManager = buildManager;- this.userManager = userManager;- this.touchManager = touchManager;- }-- public Object writeReplace() throws ObjectStreamException {- return new ManagedSerializedForm(PullRequestTextManager.class);- }-- @Override- protected int getIndexVersion() {- return 7;- }-- @Override- protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {- return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);- }-- @Override- protected void addFields(Document entityDoc, PullRequest entity) {- entityDoc.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));- entityDoc.add(new TextField(FIELD_TITLE, entity.getTitle(), NO));- if (entity.getDescription() != null)- entityDoc.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), NO));- for (PullRequestComment comment: entity.getComments()) {- if (!comment.getUser().equals(userManager.getSystem()))- entityDoc.add(new TextField(FIELD_COMMENT, comment.getContent(), NO));- }- }-- @Nullable- private EntityTextQuery buildQuery(@Nullable Project project, String queryString) {- var escaped = LuceneUtils.escape(queryString);- if (escaped != null) {- var applicableProjectIds = new HashSet<Long>();- if (project != null) {- applicableProjectIds.add(project.getId());- } else {- applicableProjectIds.addAll(projectManager.getPermittedProjects(new ReadCode())- .stream().map(AbstractEntity::getId).collect(toList()));- }- if (!applicableProjectIds.isEmpty()) {- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();-- String numberString = queryString;- if (numberString.startsWith("#"))- numberString = numberString.substring(1);- try {- long number = Long.parseLong(numberString);- contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);- } catch (NumberFormatException ignored) {- }-- try (Analyzer analyzer = newAnalyzer()) {- Map<String, Float> boosts = new HashMap<>();- boosts.put(FIELD_TITLE, 0.75f);- boosts.put(FIELD_DESCRIPTION, 0.5f);- boosts.put(FIELD_COMMENT, 0.25f);- MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {-- protected Query newTermQuery(Term term, float boost) {- return new BoostQuery(new PrefixQuery(term), boost);- }-- };- contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);- } catch (ParseException e) {- throw new RuntimeException(e);- }- var contentQuery = contentQueryBuilder.build();- if (contentQuery != null)- return new EntityTextQuery(contentQuery, applicableProjectIds);- }- }- return null;- }-- @Override- public List<PullRequest> query(@Nullable Project project, String queryString,- boolean loadReviewsAndBuilds, int firstResult, int maxResults) {- List<PullRequest> requests = search(buildQuery(project, queryString), firstResult, maxResults);- if (!requests.isEmpty() && loadReviewsAndBuilds) {- reviewManager.populateReviews(requests);- buildManager.populateBuilds(requests);- }- return requests;- }-- @Override- public long count(@Nullable Project project, String queryString) {- return count(buildQuery(project, queryString));- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.javadeleted file mode 100644index 9766884696..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.java+++ /dev/null@@ -1,17 +0,0 @@-package io.onedev.server.search.entitytext;--import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;--public interface PullRequestTextManager {-- long count(@Nullable Project project, String queryString);-- List<PullRequest> query(@Nullable Project project, String queryString,- boolean loadReviewsAndBuilds, int firstResult, int maxResults);--}diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.javaindex 0867d86cc4..6638237c77 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java@@ -1,12 +1,6 @@package io.onedev.server.util.criteria;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.Set;+import java.util.*;import java.util.stream.Collectors;import javax.persistence.criteria.CriteriaBuilder;@@ -25,6 +19,10 @@ public class AndCriteria<T> extends Criteria<T> {protected final List<Criteria<T>> criterias;+ public AndCriteria(Criteria<T>...criterias) {+ this(Arrays.asList(criterias));+ }+public AndCriteria(List<Criteria<T>> criterias) {this.criterias = criterias;}diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.javaindex e7d743c7cc..35837f6d6c 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java@@ -1,12 +1,6 @@package io.onedev.server.util.criteria;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.Set;+import java.util.*;import java.util.stream.Collectors;import javax.persistence.criteria.CriteriaBuilder;@@ -24,6 +18,10 @@ public class OrCriteria<T> extends Criteria<T> {private static final long serialVersionUID = 1L;protected final List<Criteria<T>> criterias;++ public OrCriteria(Criteria<T>...criterias) {+ this(Arrays.asList(criterias));+ }public OrCriteria(List<Criteria<T>> criterias) {this.criterias = criterias;diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.javaindex 1ffc23d7f1..d60a0b24a0 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/AgentQueryValidator.java@@ -33,7 +33,7 @@ public class AgentQueryValidator implements ConstraintValidator<AgentQuery, Striif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed agent query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.javaindex db6384bbf7..fe57f17b8d 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/BuildQueryValidator.java@@ -39,7 +39,7 @@ public class BuildQueryValidator implements ConstraintValidator<BuildQuery, Striif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed build query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.javaindex eb5f7ca2d7..5ab090d77d 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CodeCommentQueryValidator.java@@ -32,7 +32,7 @@ public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommenif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed code comment query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.javaindex ba94856bce..7b6d4bd292 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CommitQueryValidator.java@@ -31,7 +31,7 @@ public class CommitQueryValidator implements ConstraintValidator<CommitQuery, Stif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed commit query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.javaindex 0f24eb1510..87d3f218da 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/IssueQueryValidator.java@@ -58,7 +58,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Striif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed issue query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.javaindex 1be61a5c38..dafe539133 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/ProjectQueryValidator.java@@ -30,7 +30,7 @@ public class ProjectQueryValidator implements ConstraintValidator<ProjectQuery,if (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed project query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.javaindex a5c52db326..a9adf8b967 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/PullRequestQueryValidator.java@@ -33,7 +33,7 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullRequesif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed pull request query";+ message = "Malformed query";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.javaindex bf042c2cf1..32aa57dd8a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java@@ -106,6 +106,20 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {return "value should be quoted";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {+ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query name/ip/os";+ }+}.suggest(terminalExpect);}}@@ -153,6 +167,7 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {if (!fieldElements.isEmpty()) {String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Agent.NAME_NAME)+ || fieldName.equals(Agent.NAME_OS_NAME)|| fieldName.equals(Agent.NAME_OS_ARCH)|| fieldName.equals(Agent.NAME_OS_VERSION)|| fieldName.equals(Agent.NAME_IP_ADDRESS)) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 882bb2f07a..3d0d90454c 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -1,17 +1,7 @@package io.onedev.server.web.behavior;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;-import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;@@ -31,6 +21,13 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")public class BuildQueryBehavior extends ANTLRAssistBehavior {@@ -72,7 +69,11 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if (spec.getRuleName().equals("Quoted")) {+ if (spec.getRuleName().equals("Number")) {+ return SuggestionUtils.suggestNumber(+ terminalExpect.getUnmatchedText(),+ "find build with this number");+ } else if (spec.getRuleName().equals("Quoted")) {return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Override@@ -172,6 +173,20 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return "value should be quoted";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {+ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query job/version";+ }+}.suggest(terminalExpect);}}@@ -195,6 +210,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return null;}}+ if (suggestedLiteral.equals("#"))+ return Optional.of("Find build by number");parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex 7570c3a7b8..5d429888db 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -109,6 +109,20 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {return "value should be quoted";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {+ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query path/content/reply";+ }+}.suggest(terminalExpect);}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex ca7d10856c..148c8208f2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -112,6 +112,21 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {return "value needs to be enclosed in parenthesis";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {++ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query hash/message";+ }+}.suggest(terminalExpect);}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex df3ffcc6f2..16f0fd3f67 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -31,6 +31,7 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;import org.apache.commons.lang3.StringUtils;+import org.apache.commons.lang3.math.NumberUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -82,7 +83,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if (spec.getRuleName().equals("Quoted")) {+ if (spec.getRuleName().equals("Number")) {+ return SuggestionUtils.suggestNumber(+ terminalExpect.getUnmatchedText(),+ "find issue with this number");+ } else if (spec.getRuleName().equals("Quoted")) {return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Override@@ -216,6 +221,21 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return "value should be quoted";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {++ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query title/description/comment";+ }+}.suggest(terminalExpect);}}@@ -231,6 +251,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {|| !option.withCurrentCommitCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))|| !option.withCurrentIssueCriteria() && suggestedLiteral.equals(getRuleName(CurrentIssue))) {return null;+ } else if (suggestedLiteral.equals("#")) {+ return Optional.of("Find issue by number");}parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 89d3a13a20..3fda0e42b2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -132,6 +132,20 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {return "value should be quoted";}+ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {+ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query name";+ }+}.suggest(terminalExpect);}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 7b0f315b3e..6698fb1ab3 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -1,22 +1,7 @@package io.onedev.server.web.behavior;-import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;-import static io.onedev.server.search.entity.EntityQuery.getValue;-import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.checkField;-import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getOperator;-import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getRuleName;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.*;--import java.util.ArrayList;-import java.util.List;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;-import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;@@ -33,6 +18,17 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;+import static io.onedev.server.search.entity.EntityQuery.getValue;+import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.*;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.*;@SuppressWarnings("serial")public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@@ -70,7 +66,11 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if (spec.getRuleName().equals("Quoted")) {+ if (spec.getRuleName().equals("Number")) {+ return SuggestionUtils.suggestNumber(+ terminalExpect.getUnmatchedText(),+ "find pull request with this number");+ } else if (spec.getRuleName().equals("Quoted")) {return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Override@@ -91,7 +91,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());- int operator = getOperator(operatorName);+ int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {if (operator == IncludesIssue)return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);@@ -103,14 +103,14 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {String fieldName = getValue(fieldElements.get(0).getMatchedText());try {checkField(fieldName, operator);- if (fieldName.equals(PullRequest.NAME_SUBMIT_DATE)+ if (fieldName.equals(PullRequest.NAME_SUBMIT_DATE)|| fieldName.equals(PullRequest.NAME_LAST_ACTIVITY_DATE)|| fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);- return !suggestions.isEmpty()? suggestions: null;+ return !suggestions.isEmpty() ? suggestions : null;} else if (fieldName.equals(PullRequest.NAME_STATUS)) {List<String> candidates = new ArrayList<>();- for (PullRequest.Status status: PullRequest.Status.values())+ for (PullRequest.Status status : PullRequest.Status.values())candidates.add(status.toString());return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)@@ -119,7 +119,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestProjectPaths(matchWith);elsereturn null;- } else if (fieldName.equals(PullRequest.NAME_TARGET_BRANCH)+ } else if (fieldName.equals(PullRequest.NAME_TARGET_BRANCH)|| fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)) {if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestBranches(project, matchWith);@@ -129,13 +129,13 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else if (fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)) {List<String> candidates = new ArrayList<>();- for (MergeStrategy strategy: MergeStrategy.values())+ for (MergeStrategy strategy : MergeStrategy.values())candidates.add(strategy.toString());return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(PullRequest.NAME_LABEL)) {return SuggestionUtils.suggestLabels(matchWith);- } else if (fieldName.equals(PullRequest.NAME_TITLE)- || fieldName.equals(PullRequest.NAME_DESCRIPTION)+ } else if (fieldName.equals(PullRequest.NAME_TITLE)+ || fieldName.equals(PullRequest.NAME_DESCRIPTION)|| fieldName.equals(PullRequest.NAME_COMMENT_COUNT)|| fieldName.equals(PullRequest.NAME_COMMENT)) {return null;@@ -146,15 +146,29 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {}return new ArrayList<>();}-+@Overrideprotected String getFencingDescription() {return "value should be quoted";}-++ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Fuzzy")) {+ return new FenceAware(codeAssist.getGrammar(), '~', '~') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "surround with ~ to query title/description/comment";+ }+}.suggest(terminalExpect);}- }+ }return null;}@@ -170,6 +184,8 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {|| suggestedLiteral.equals(getRuleName(ApprovedByMe))|| suggestedLiteral.equals(getRuleName(AssignedToMe)))) {return null;+ } else if (suggestedLiteral.equals("#")) {+ return Optional.of("Find pull request by number");}parseExpect = parseExpect.findExpectByLabel("operator");diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex d4f7717c59..b381502004 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.build.list;import com.google.common.collect.Sets;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;@@ -16,16 +15,13 @@ import io.onedev.server.model.Build.Status;import io.onedev.server.model.BuildLabel;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.build.*;+import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.RunJob;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.OrCriteria;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.BuildQueryBehavior;@@ -154,23 +150,13 @@ public abstract class BuildListPanel extends Panel {private BuildQuery parse(@Nullable String queryString, BuildQuery baseQuery) {try {return BuildQuery.merge(baseQuery, BuildQuery.parse(getProject(), queryString, true, true));- } catch (ExplicitException e) {- getFeedbackMessages().clear();- error(e.getMessage());- return null;} catch (Exception e) {getFeedbackMessages().clear();- info("Performing fuzzy query");- try {- EntityQuery.getProjectScopedNumber(getProject(), queryString);- return BuildQuery.merge(baseQuery,- new BuildQuery(new NumberCriteria(getProject(), queryString, BuildQueryLexer.Is)));- } catch (Exception e2) {- List<Criteria<Build>> criterias = new ArrayList<>();- criterias.add(new VersionCriteria("*" + queryString + "*"));- criterias.add(new JobCriteria("*" + queryString + "*"));- return BuildQuery.merge(baseQuery, new BuildQuery(new OrCriteria<Build>(criterias)));- }+ if (e instanceof ExplicitException)+ error(e.getMessage());+ else+ error("Malformed query");+ return null;}}@@ -862,13 +848,6 @@ public abstract class BuildListPanel extends Panel {.equals(StringUtils.trimToEmpty(inputContent));target.add(saveQueryLink);}-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on number/version/job");- return hints;- }});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex b59ba983d6..c497825225 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.codecomment;import com.google.common.collect.Sets;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;@@ -10,14 +9,12 @@ import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.*;import io.onedev.server.model.support.LastActivity;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.codecomment.*;-import io.onedev.server.search.entitytext.CodeCommentTextManager;+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;+import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Provider;import io.onedev.server.util.UrlUtils;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.OrCriteria;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ChangeObserver;@@ -85,29 +82,20 @@ public abstract class CodeCommentListPanel extends Panel {private final IModel<String> queryStringModel;- private final IModel<Object> queryModel = new LoadableDetachableModel<Object>() {+ private final IModel<CodeCommentQuery> queryModel = new LoadableDetachableModel<>() {@Override- protected Object load() {+ protected CodeCommentQuery load() {String queryString = queryStringModel.getObject();try {return CodeCommentQuery.parse(getProject(), queryString, true);- } catch (ExplicitException e) {- getFeedbackMessages().clear();- error(e.getMessage());- return null;} catch (Exception e) {getFeedbackMessages().clear();- info("Performing fuzzy query");- if (getPullRequest() == null) {- return queryString;- } else {- List<Criteria<CodeComment>> criterias = new ArrayList<>();- criterias.add(new ContentCriteria(queryString));- criterias.add(new ReplyCriteria(queryString));- criterias.add(new PathCriteria("*" + queryString + "*"));- return new CodeCommentQuery(new OrCriteria<CodeComment>(criterias));- }+ if (e instanceof ExplicitException)+ error(e.getMessage());+ else+ error("Malformed query");+ return null;}}@@ -136,10 +124,6 @@ public abstract class CodeCommentListPanel extends Panel {return OneDev.getInstance(CodeCommentManager.class);}- private CodeCommentTextManager getCodeCommentTextManager() {- return OneDev.getInstance(CodeCommentTextManager.class);- }-private void doQuery(AjaxRequestTarget target) {commentsTable.setCurrentPage(0);target.add(body);@@ -584,22 +568,22 @@ public abstract class CodeCommentListPanel extends Panel {@Overridepublic List<EntitySort> getObject() {- Object query = queryModel.getObject();+ var query = queryModel.getObject();CodeCommentListPanel.this.getFeedbackMessages().clear();- if (query instanceof CodeCommentQuery)- return ((CodeCommentQuery)query).getSorts();+ if (query != null)+ return query.getSorts();elsereturn new ArrayList<>();}@Overridepublic void setObject(List<EntitySort> object) {- Object query = queryModel.getObject();+ var query = queryModel.getObject();CodeCommentListPanel.this.getFeedbackMessages().clear();- if (!(query instanceof CodeCommentQuery))+ if (query == null)query = new CodeCommentQuery();- ((CodeCommentQuery)query).getSorts().clear();- ((CodeCommentQuery)query).getSorts().addAll(object);+ query.getSorts().clear();+ query.getSorts().addAll(object);queryModel.setObject(query);queryStringModel.setObject(query.toString());AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);@@ -644,13 +628,6 @@ public abstract class CodeCommentListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on path/comment/reply");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@@ -684,13 +661,10 @@ public abstract class CodeCommentListPanel extends Panel {@Overridepublic Iterator<? extends CodeComment> iterator(long first, long count) {- Object query = queryModel.getObject();- if (query instanceof CodeCommentQuery) {- return getCodeCommentManager().query(getProject(), getPullRequest(),- (CodeCommentQuery)query, (int)first, (int)count).iterator();- } else if (query instanceof String) {- return getCodeCommentTextManager()- .query(getProject(), (String)query, (int)first, (int)count).iterator();+ var query = queryModel.getObject();+ if (query != null) {+ return getCodeCommentManager().query(getProject(), getPullRequest(),+ query, (int)first, (int)count).iterator();} else {return new ArrayList<CodeComment>().iterator();}@@ -699,13 +673,9 @@ public abstract class CodeCommentListPanel extends Panel {@Overridepublic long calcSize() {try {- Object query = queryModel.getObject();- if (query instanceof CodeCommentQuery) {- return getCodeCommentManager().count(getProject(), getPullRequest(),- ((CodeCommentQuery)query).getCriteria());- } else if (query instanceof String) {- return getCodeCommentTextManager().count(getProject(), (String)query);- }+ var query = queryModel.getObject();+ if (query != null)+ return getCodeCommentManager().count(getProject(), getPullRequest(), query.getCriteria());} catch (ExplicitException e) {error(e.getMessage());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.javaindex da30869399..1afcffb1c5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.java@@ -1,16 +1,19 @@package io.onedev.server.web.component.commandpalette;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;+import io.onedev.server.search.entity.issue.FuzzyCriteria;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entitytext.IssueTextManager;+import io.onedev.server.search.entity.issue.SimpleNumberCriteria;import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;+import org.apache.commons.lang3.math.NumberUtils;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;public class IssueParam extends ParamSegment {@@ -26,12 +29,20 @@ public class IssueParam extends ParamSegment {Map<String, String> suggestions = new LinkedHashMap<>();List<Issue> issues;ProjectScope projectScope = new ProjectScope(ParsedUrl.getProject(paramValues), false, false);+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);if (matchWith.length() == 0) {- IssueManager issueManager = OneDev.getInstance(IssueManager.class);issues = issueManager.query(projectScope, new IssueQuery(), false, 0, count);} else {- IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);- issues = issueTextManager.query(projectScope, matchWith, false, 0, count);+ Criteria<Issue> criteria;++ var normalizedMatchWith = matchWith;+ if (normalizedMatchWith.startsWith("#"))+ normalizedMatchWith = normalizedMatchWith.substring(1);+ if (NumberUtils.isDigits(normalizedMatchWith))+ criteria = new SimpleNumberCriteria(Long.parseLong(normalizedMatchWith));+ else+ criteria = new FuzzyCriteria(matchWith);+ issues = issueManager.query(projectScope, new IssueQuery(criteria), false, 0, count);}for (Issue issue: issues) {suggestions.put("#" + issue.getNumber() + " - " + issue.getTitle(),diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.javaindex bbcb508b48..8a2f57dc88 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.java@@ -1,16 +1,19 @@package io.onedev.server.web.component.commandpalette;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.pullrequest.FuzzyCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.search.entitytext.PullRequestTextManager;+import io.onedev.server.search.entity.pullrequest.SimpleNumberCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;+import org.apache.commons.lang3.math.NumberUtils;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;public class PullRequestParam extends ParamSegment {@@ -25,13 +28,21 @@ public class PullRequestParam extends ParamSegment {Map<String, String> paramValues, int count) {Map<String, String> suggestions = new LinkedHashMap<>();Project project = ParsedUrl.getProject(paramValues);- List<PullRequest> requests;+ List<PullRequest> requests;+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);if (matchWith.length() == 0) {- PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);requests = pullRequestManager.query(project, new PullRequestQuery(), false, 0, count);} else {- PullRequestTextManager pullRequestTextManager = OneDev.getInstance(PullRequestTextManager.class);- requests = pullRequestTextManager.query(project, matchWith, false, 0, count);+ Criteria<PullRequest> criteria;++ var normalizedMatchWith = matchWith;+ if (normalizedMatchWith.startsWith("#"))+ normalizedMatchWith = normalizedMatchWith.substring(1);+ if (NumberUtils.isDigits(normalizedMatchWith))+ criteria = new SimpleNumberCriteria(Long.parseLong(normalizedMatchWith));+ else+ criteria = new FuzzyCriteria(matchWith);+ requests = pullRequestManager.query(project, new PullRequestQuery(criteria), false, 0, count);}for (PullRequest request: requests) {suggestions.put("#" + request.getNumber() + " - " + request.getTitle(),diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 71b5b2369d..2d2b9590c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.commit.list;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;@@ -94,20 +93,13 @@ public abstract class CommitListPanel extends Panel {String queryString = queryStringModel.getObject();try {return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString, true));- } catch (ExplicitException e) {- getFeedbackMessages().clear();- error(e.getMessage());- return null;} catch (Exception e) {getFeedbackMessages().clear();- info("Performing fuzzy query");- List<CommitCriteria> criterias = new ArrayList<>();- ObjectId commitId = getProject().getObjectId(queryString, false);- if (commitId != null)- criterias.add(new RevisionCriteria(Lists.newArrayList(new Revision(queryString, null))));- else- criterias.add(new MessageCriteria(Lists.newArrayList(queryString)));- return CommitQuery.merge(getBaseQuery(), new CommitQuery(criterias));+ if (e instanceof ExplicitException)+ error(e.getMessage());+ else+ error("Malformed query");+ return null;}}@@ -350,13 +342,6 @@ public abstract class CommitListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on revision/message");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@@ -560,6 +545,12 @@ public abstract class CommitListPanel extends Panel {if (criteria instanceof MessageCriteria) {for (String value: ((MessageCriteria) criteria).getValues())patterns.add(Pattern.compile(value, Pattern.CASE_INSENSITIVE));+ } else if (criteria instanceof FuzzyCriteria) {+ for (String value: ((FuzzyCriteria) criteria).getValues()) {+ if (getProject().getObjectId(value, false) == null) {+ patterns.add(Pattern.compile(value.replace(" ", ".*"), Pattern.CASE_INSENSITIVE));+ }+ }}}return patterns;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 5cc0815f61..b163692274 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.component.issue.list;import com.google.common.collect.Sets;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueLinkManager;@@ -22,7 +21,6 @@ import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;-import io.onedev.server.search.entitytext.IssueTextManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;@@ -113,7 +111,6 @@ import java.util.List;import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.search.entity.issue.IssueQuery.merge;-import static io.onedev.server.search.entity.issue.IssueQuery.parseFuzzy;import static java.util.Comparator.comparingInt;@SuppressWarnings("serial")@@ -121,10 +118,10 @@ public abstract class IssueListPanel extends Panel {private final IModel<String> queryStringModel;- private final IModel<Object> queryModel = new LoadableDetachableModel<Object>() {+ private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<>() {@Override- protected Object load() {+ protected IssueQuery load() {return parse(queryStringModel.getObject(), getBaseQuery());}@@ -153,10 +150,6 @@ public abstract class IssueListPanel extends Panel {return OneDev.getInstance(IssueManager.class);}- private IssueTextManager getIssueTextManager() {- return OneDev.getInstance(IssueTextManager.class);- }-@Overrideprotected void onDetach() {queryStringModel.detach();@@ -172,26 +165,19 @@ public abstract class IssueListPanel extends Panel {}@Nullable- private Object parse(@Nullable String queryString, IssueQuery baseQuery) {+ private IssueQuery parse(@Nullable String queryString, IssueQuery baseQuery) {IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);if (getProject() != null)option.withCurrentProjectCriteria(true);try {return merge(baseQuery, IssueQuery.parse(getProject(), queryString, option, true));} catch (Exception e) {- if (e instanceof ExplicitException) {- getFeedbackMessages().clear();+ getFeedbackMessages().clear();+ if (e instanceof ExplicitException)error(e.getMessage());- return null;- } else if (getBaseQuery().toString() != null) {- getFeedbackMessages().clear();- info("Performing fuzzy query");- return merge(getBaseQuery(), parseFuzzy(getProject(), queryString));- } else {- getFeedbackMessages().clear();- info("Performing fuzzy query");- return queryString;- }+ else+ error("Malformed query");+ return null;}}@@ -295,22 +281,22 @@ public abstract class IssueListPanel extends Panel {@Overridepublic List<EntitySort> getObject() {- Object query = parse(queryStringModel.getObject(), new IssueQuery());+ var query = parse(queryStringModel.getObject(), new IssueQuery());IssueListPanel.this.getFeedbackMessages().clear();- if (query instanceof IssueQuery)- return ((IssueQuery)query).getSorts();+ if (query != null)+ return query.getSorts();elsereturn new ArrayList<>();}@Overridepublic void setObject(List<EntitySort> object) {- Object query = parse(queryStringModel.getObject(), new IssueQuery());+ var query = parse(queryStringModel.getObject(), new IssueQuery());IssueListPanel.this.getFeedbackMessages().clear();- if (!(query instanceof IssueQuery))+ if (query == null)query = new IssueQuery();- ((IssueQuery)query).getSorts().clear();- ((IssueQuery)query).getSorts().addAll(object);+ query.getSorts().clear();+ query.getSorts().addAll(object);queryStringModel.setObject(query.toString());AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);target.add(queryInput);@@ -391,13 +377,6 @@ public abstract class IssueListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on number/title/description/comment");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@@ -618,7 +597,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected IssueQuery getIssueQuery() {- if (queryModel.getObject() instanceof IssueQuery)+ if (queryModel.getObject() != null)return (IssueQuery) queryModel.getObject();elsereturn null;@@ -919,8 +898,8 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected IssueQuery getIssueQuery() {- if (queryModel.getObject() instanceof IssueQuery)- return (IssueQuery) queryModel.getObject();+ if (queryModel.getObject() != null)+ return queryModel.getObject();elsereturn null;}@@ -1218,13 +1197,10 @@ public abstract class IssueListPanel extends Panel {@Overridepublic Iterator<? extends Issue> iterator(long first, long count) {try {- Object query = queryModel.getObject();- if (query instanceof IssueQuery) {+ var query = queryModel.getObject();+ if (query != null) {return getIssueManager().query(getProjectScope(), (IssueQuery) query,true, (int) first, (int) count).iterator();- } else if (query instanceof String) {- return getIssueTextManager().query(getProjectScope(), (String) query,- true, (int) first, (int) count).iterator();}} catch (ExplicitException e) {error(e.getMessage());@@ -1235,11 +1211,9 @@ public abstract class IssueListPanel extends Panel {@Overridepublic long calcSize() {try {- Object query = queryModel.getObject();- if (query instanceof IssueQuery)+ var query = queryModel.getObject();+ if (query != null)return getIssueManager().count(getProjectScope(), ((IssueQuery) query).getCriteria());- else if (query instanceof String)- return getIssueTextManager().count(getProjectScope(), (String) query);} catch (ExplicitException e) {error(e.getMessage());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 7af854b4c1..c2c3561fa5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -1,65 +1,8 @@package io.onedev.server.web.component.project.list;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Predicate;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.google.common.base.Splitter;--import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.*;import io.onedev.server.imports.ProjectImporter;import io.onedev.server.imports.ProjectImporterContribution;import io.onedev.server.model.Build;@@ -69,14 +12,12 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.project.ChildrenOfCriteria;-import io.onedev.server.search.entity.project.NameCriteria;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.CreateChildren;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectPullRequestStats;-import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;@@ -108,6 +49,41 @@ import io.onedev.server.web.page.project.imports.ProjectImportPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import javax.annotation.Nullable;+import java.util.*;@SuppressWarnings("serial")public class ProjectListPanel extends Panel {@@ -936,13 +912,6 @@ public class ProjectListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on name/path");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@@ -1200,42 +1169,13 @@ public class ProjectListPanel extends Panel {private ProjectQuery parse(@Nullable String queryString, ProjectQuery baseQuery) {try {return ProjectQuery.merge(baseQuery, ProjectQuery.parse(queryString));- } catch (ExplicitException e) {- getFeedbackMessages().clear();- error(e.getMessage());- return null;} catch (Exception e) {getFeedbackMessages().clear();- info("Performing fuzzy query");- if (getParentProject() != null) {- queryString = "*" + queryString.replace(" ", "*") + "*";- return ProjectQuery.merge(baseQuery, new ProjectQuery(new NameCriteria(queryString)));- } else {- ProjectQuery query = baseQuery;- for (String field: Splitter.on(' ').omitEmptyStrings().trimResults().split(queryString)) {- query = ProjectQuery.merge(query, new ProjectQuery(new Criteria<Project>() {-- @Override- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from,- CriteriaBuilder builder) {- Expression<String> attribute = from.get(Project.PROP_PATH);- return builder.like(builder.lower(attribute), "%" + field.toLowerCase().replace('*', '%') + "%");- }-- @Override- public boolean matches(Project project) {- return project.getPath().toLowerCase().contains(field.toLowerCase());- }-- @Override- public String toStringWithoutParens() {- throw new UnsupportedOperationException();- }-- }));- }- return query;- }+ if (e instanceof ExplicitException)+ error(e.getMessage());+ else+ error("Malformed query");+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 941f2a21fb..67f038351c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.pullrequest.list;import com.google.common.collect.Sets;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;@@ -15,7 +14,6 @@ import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.support.LastActivity;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.search.entitytext.PullRequestTextManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.DateUtils;@@ -91,13 +89,13 @@ public abstract class PullRequestListPanel extends Panel {private final IModel<String> queryStringModel;- private final IModel<Object> queryModel = new LoadableDetachableModel<Object>() {+ private final IModel<PullRequestQuery> queryModel = new LoadableDetachableModel<>() {@Override- protected Object load() {+ protected PullRequestQuery load() {return parse(queryStringModel.getObject(), getBaseQuery());}-+};private DataTable<PullRequest, Void> requestsTable;@@ -123,10 +121,6 @@ public abstract class PullRequestListPanel extends Panel {return OneDev.getInstance(PullRequestManager.class);}- private PullRequestTextManager getPullRequestTextManager() {- return OneDev.getInstance(PullRequestTextManager.class);- }-@Nullableprotected PagingHistorySupport getPagingHistorySupport() {return null;@@ -142,23 +136,16 @@ public abstract class PullRequestListPanel extends Panel {}@Nullable- private Object parse(@Nullable String queryString, PullRequestQuery baseQuery) {+ private PullRequestQuery parse(@Nullable String queryString, PullRequestQuery baseQuery) {try {return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString, true));- } catch (ExplicitException e) {- getFeedbackMessages().clear();- error(e.getMessage());- return null;} catch (Exception e) {- if (getBaseQuery().toString() != null) {- getFeedbackMessages().clear();+ getFeedbackMessages().clear();+ if (e instanceof ExplicitException)+ error(e.getMessage());+ elseerror("Malformed query");- return null;- } else {- getFeedbackMessages().clear();- info("Performing fuzzy query");- return queryString;- }+ return null;}}@@ -545,22 +532,22 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic List<EntitySort> getObject() {- Object query = parse(queryStringModel.getObject(), new PullRequestQuery());+ var query = parse(queryStringModel.getObject(), new PullRequestQuery());PullRequestListPanel.this.getFeedbackMessages().clear();- if (query instanceof PullRequestQuery)- return ((PullRequestQuery)query).getSorts();+ if (query != null)+ return query.getSorts();elsereturn new ArrayList<>();}@Overridepublic void setObject(List<EntitySort> object) {- Object query = parse(queryStringModel.getObject(), new PullRequestQuery());+ var query = parse(queryStringModel.getObject(), new PullRequestQuery());PullRequestListPanel.this.getFeedbackMessages().clear();- if (!(query instanceof PullRequestQuery))+ if (query == null)query = new PullRequestQuery();- ((PullRequestQuery)query).getSorts().clear();- ((PullRequestQuery)query).getSorts().addAll(object);+ query.getSorts().clear();+ query.getSorts().addAll(object);queryStringModel.setObject(query.toString());AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);target.add(queryInput);@@ -590,13 +577,6 @@ public abstract class PullRequestListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on number/title/description/comment");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@@ -794,18 +774,15 @@ public abstract class PullRequestListPanel extends Panel {});- dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {+ dataProvider = new LoadableDetachableDataProvider<>() {@Overridepublic Iterator<? extends PullRequest> iterator(long first, long count) {try {- Object query = queryModel.getObject();- if (query instanceof PullRequestQuery) {- return getPullRequestManager().query(getProject(), (PullRequestQuery)query,- true, (int)first, (int)count).iterator();- } else if (query instanceof String) {- return getPullRequestTextManager().query(getProject(), (String)query,- true, (int)first, (int)count).iterator();+ var query = queryModel.getObject();+ if (query != null) {+ return getPullRequestManager().query(getProject(), query,+ true, (int) first, (int) count).iterator();}} catch (ExplicitException e) {error(e.getMessage());@@ -816,11 +793,9 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic long calcSize() {try {- Object query = queryModel.getObject();- if (query instanceof PullRequestQuery)- return getPullRequestManager().count(getProject(), ((PullRequestQuery)query).getCriteria());- else if (query instanceof String)- return getPullRequestTextManager().count(getProject(), (String)query);+ var query = queryModel.getObject();+ if (query != null)+ return getPullRequestManager().count(getProject(), query.getCriteria());} catch (ExplicitException e) {error(e.getMessage());}@@ -836,13 +811,13 @@ public abstract class PullRequestListPanel extends Panel {protected PullRequest load() {return getPullRequestManager().load(requestId);}-+};}-+};- body.add(requestsTable = new DataTable<PullRequest, Void>("requests", columns, dataProvider, WebConstants.PAGE_SIZE) {+ body.add(requestsTable = new DataTable<>("requests", columns, dataProvider, WebConstants.PAGE_SIZE) {@Overrideprotected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {@@ -852,7 +827,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected String load() {var request = item.getModelObject();- return request.isVisitedAfter(request.getLastActivity().getDate())?"request":"request new";+ return request.isVisitedAfter(request.getLastActivity().getDate()) ? "request" : "request new";}}));var requestId = request.getId();@@ -865,7 +840,7 @@ public abstract class PullRequestListPanel extends Panel {});return item;}-+});if (getPagingHistorySupport() != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex cb69a21c34..c9b54af637 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -1,11 +1,28 @@package io.onedev.server.web.page.admin.buildsetting.agent;-import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import javax.annotation.Nullable;-+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.AgentManager;+import io.onedev.server.model.Agent;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.agent.AgentQuery;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.AgentQueryBehavior;+import io.onedev.server.web.component.AgentStatusBadge;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;+import io.onedev.server.web.component.orderedit.OrderEditPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.util.LoadableDetachableDataProvider;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QuerySaveSupport;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.Session;@@ -36,36 +53,10 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.AgentManager;-import io.onedev.server.model.Agent;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.agent.AgentQuery;-import io.onedev.server.search.entity.agent.NameCriteria;-import io.onedev.server.search.entity.agent.OsArchCriteria;-import io.onedev.server.search.entity.agent.OsCriteria;-import io.onedev.server.search.entity.agent.OsVersionCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.OrCriteria;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.AgentQueryBehavior;-import io.onedev.server.web.component.AgentStatusBadge;-import io.onedev.server.web.component.datatable.DefaultDataTable;-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;-import io.onedev.server.web.component.orderedit.OrderEditPanel;-import io.onedev.server.web.component.savedquery.SavedQueriesClosed;-import io.onedev.server.web.component.savedquery.SavedQueriesOpened;-import io.onedev.server.web.util.LoadableDetachableDataProvider;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.QuerySaveSupport;+import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;@SuppressWarnings("serial")class AgentListPanel extends Panel {@@ -79,17 +70,12 @@ class AgentListPanel extends Panel {String queryString = queryStringModel.getObject();try {return AgentQuery.parse(queryString, false);- } catch (ExplicitException e) {- error(e.getMessage());- return null;} catch (Exception e) {- info("Performing fuzzy query");- List<Criteria<Agent>> criterias = new ArrayList<>();- criterias.add(new NameCriteria("*" + queryString + "*"));- criterias.add(new OsCriteria("*" + queryString + "*"));- criterias.add(new OsVersionCriteria("*" + queryString + "*"));- criterias.add(new OsArchCriteria("*" + queryString + "*"));- return new AgentQuery(new OrCriteria<Agent>(criterias));+ if (e instanceof ExplicitException)+ error(e.getMessage());+ else+ error("Malformed query");+ return null;}}@@ -725,13 +711,6 @@ class AgentListPanel extends Panel {target.add(saveQueryLink);}- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on name/os");- return hints;- }-});queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 08ed9c4bb9..d713088edf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.project.issues.boards;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;@@ -141,23 +140,23 @@ public class IssueBoardsPage extends ProjectIssuesPage {IssueQuery query;try {query = IssueQuery.parse(getProject(), queryString, option, true);- } catch (ExplicitException e) {- contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));- return null;} catch (Exception e) {- contentFrag.info(new QueryParseMessage(backlog, "Performing fuzzy query"));- query = IssueQuery.parseFuzzy(getProject(), queryString);+ if (e instanceof ExplicitException)+ contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));+ else+ contentFrag.error(new QueryParseMessage(backlog, "Malformed %squery"));+ return null;}IssueQuery baseQuery;try {baseQuery = IssueQuery.parse(getProject(), baseQueryString, option, true);- } catch (ExplicitException e) {- contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));- return null;} catch (Exception e) {- contentFrag.info(new QueryParseMessage(backlog, "Performing fuzzy query"));- baseQuery = IssueQuery.parseFuzzy(getProject(), queryString);+ if (e instanceof ExplicitException)+ contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));+ else+ contentFrag.error(new QueryParseMessage(backlog, "Malformed %sbase query"));+ return null;}return IssueQuery.merge(baseQuery, query);}@@ -666,16 +665,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {});IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);- queryInput.add(new IssueQueryBehavior(projectModel, option, true) {-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- List<String> hints = super.getHints(terminalExpect);- hints.add("Free input for fuzzy query on number/title/description/comment");- return hints;- }-- });+ queryInput.add(new IssueQueryBehavior(projectModel, option, true));queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.javaindex 4d7d70fb19..f587d21cd2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java@@ -97,7 +97,7 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends ProparsedQuery = BuildMetricQuery.parse(getProject(), query);} catch (Exception e) {parsedQuery = null;- form.error("Malformed metric query");+ form.error("Malformed query");}}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex f9a20180dd..b1487e580f 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -28,6 +28,7 @@ import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import org.apache.commons.lang3.StringUtils;+import org.apache.commons.lang3.math.NumberUtils;import org.apache.shiro.authz.Permission;import javax.annotation.Nullable;@@ -325,6 +326,18 @@ public class SuggestionUtils {return suggest(linkNames, matchWith);}+ public static List<InputSuggestion> suggestNumber(String matchWith, String suggestDescription) {+ if (matchWith.startsWith("#"))+ matchWith = matchWith.substring(1);+ if (NumberUtils.isDigits(matchWith)) {+ var suggestions = new ArrayList<InputSuggestion>();+ suggestions.add(new InputSuggestion(matchWith, suggestDescription, null));+ return suggestions;+ } else {+ return null;+ }+ }+public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith, int count) {return suggest(project, matchWith, new ProjectScopedSuggester() {diff --git a/server-product/helm/templates/_helpers.tpl b/server-product/helm/templates/_helpers.tplindex 91332a9721..8b3dba8e9d 100644--- a/server-product/helm/templates/_helpers.tpl+++ b/server-product/helm/templates/_helpers.tpl@@ -109,8 +109,6 @@ Generate URL string based on the database type{{- $connectionURL = printf "jdbc:mariadb://%s:%s/%s" $.Values.database.dbHost $.Values.database.dbPort $.Values.database.dbName -}}{{- else if eq $.Values.database.dbType "mssql" }}{{- $connectionURL = printf "sqlserver://%s:%s;databaseName=%s" $.Values.database.dbHost $.Values.database.dbPort $.Values.database.dbName -}}-{{- else if eq $.Values.database.dbType "oracle" }}-{{- $connectionURL = printf "jdbc:oracle:thin:@%s:%s:%s" $.Values.database.dbHost $.Values.database.dbPort $.Values.database.dbName -}}{{- else -}}Invalid database type{{- end -}}@@ -126,7 +124,6 @@ Set dilect and driver env variables based database type"postgresql" (dict "dialect" "io.onedev.server.persistence.PostgreSQLDialect" "driver" "org.postgresql.Driver")"mariadb" (dict "dialect" "org.hibernate.dialect.MySQL5InnoDBDialect" "driver" "org.mariadb.jdbc.Driver")"mssql" (dict "dialect" "org.hibernate.dialect.SQLServer2012Dialect" "driver" "com.microsoft.sqlserver.jdbc.SQLServerDriver")- "oracle" (dict "dialect" "org.hibernate.dialect.Oracle10gDialect" "driver" "oracle.jdbc.driver.OracleDriver")-}}{{- with index $dbTypeMap $dbType }}- name: hibernate_dialectdiff --git a/server-product/helm/values.yaml b/server-product/helm/values.yamlindex cdd87b64ec..615f19c1b9 100644--- a/server-product/helm/values.yaml+++ b/server-product/helm/values.yaml@@ -38,7 +38,7 @@ onedev:database:# database.external -- Set to **true** when using external databaseexternal: false- # database.dbType -- Required: Set type of external database. Possible values `mysql`, `mariadb`, `postgresql`, `mssql`, `oracle`+ # database.dbType -- Required: Set type of external database. Possible values `mysql`, `mariadb`, `postgresql`, `mssql`# [external databases](https://docs.onedev.io/installation-guide/run-as-docker-container#use-external-database)dbType: "mysql"# database.dbHost -- IP address or hostname of databasediff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.propertiesindex e6d75f7a16..c73acbcf26 100644--- a/server-product/system/conf/hibernate.properties+++ b/server-product/system/conf/hibernate.properties@@ -47,10 +47,11 @@ hibernate.connection.password=#----------------------------------------------------------------------------------# To use PostgreSQL database, please follow below steps:# 1. Uncomment PostgreSQL settings below and comment out settings for other databases-# 2. Create an empty OneDev database at PostgreSQL side+# 2. Create an empty OneDev database at PostgreSQL side, and create a schema to be+# used by OneDev# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that OneDev can connect and write to-# the database created in step 2+# and "hibernate.connection.password" so that OneDev can connect and write to+# database schema created in step 2#----------------------------------------------------------------------------------#hibernate.dialect=io.onedev.server.persistence.PostgreSQLDialect@@ -78,27 +79,6 @@ hibernate.connection.password=#hibernate.connection.password=sa-#-----------------------------------------------------------------------------------# To use Oracle, please follow below steps:-# 1. Uncomment Oracle settings below and comment out settings for other databases-# 2. Create an empty Oracle database-# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that OneDev can connect and write to-# the database created in step 2-# 4. Change property "hibernate.dialect" based on different Oracle versions:-# 4.1 Use value "org.hibernate.dialect.Oracle9iDialect" if Oracle9i is used-# 4.2 Use value "org.hibernate.dialect.Oracle8iDialect" if Oracle8i is used-# 4.3 Use value "org.hibernate.dialect.Oracle10gDialect" if Oracle10g or higher version-# is used-#------------------------------------------------------------------------------------#hibernate.dialect=io.onedev.server.persistence.OracleDialect-#hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver-#hibernate.connection.url=jdbc:oracle:thin:@localhost:1521/XEPDB1-#hibernate.connection.username=ONEDEV-#hibernate.connection.password=ONEDEV--hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProviderhibernate.hikari.transactionIsolation=TRANSACTION_READ_COMMITTEDdiff --git a/server-product/system/site/lib/ojdbc8-23.2.0.0.jar b/server-product/system/site/lib/ojdbc8-23.2.0.0.jardeleted file mode 100644index 847c10b032..0000000000Binary files a/server-product/system/site/lib/ojdbc8-23.2.0.0.jar and /dev/null differ