Skip to content

The Unified and Autonomous Development Platform

Add commit query save and subscription support

Robin Shen741539aa7741
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index fd576b9690..6544f24aef 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -67,10 +67,6 @@ import com.vladsch.flexmark.Extension;
import io.onedev.launcher.bootstrap.Bootstrap;
import io.onedev.launcher.loader.AbstractPlugin;
import io.onedev.launcher.loader.AbstractPluginModule;
-import io.onedev.server.codesearch.DefaultIndexManager;
-import io.onedev.server.codesearch.DefaultSearchManager;
-import io.onedev.server.codesearch.IndexManager;
-import io.onedev.server.codesearch.SearchManager;
import io.onedev.server.command.ApplyDBConstraintsCommand;
import io.onedev.server.command.BackupDBCommand;
import io.onedev.server.command.CheckDataVersionCommand;
@@ -96,6 +92,7 @@ import io.onedev.server.manager.CodeCommentRelationInfoManager;
import io.onedev.server.manager.CodeCommentRelationManager;
import io.onedev.server.manager.CodeCommentReplyManager;
import io.onedev.server.manager.CommitInfoManager;
+import io.onedev.server.manager.CommitQuerySettingManager;
import io.onedev.server.manager.ConfigurationManager;
import io.onedev.server.manager.DataManager;
import io.onedev.server.manager.GroupAuthorizationManager;
@@ -127,17 +124,19 @@ import io.onedev.server.manager.UserAuthorizationManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.manager.WorkExecutor;
+import io.onedev.server.manager.impl.DefaultCodeCommentNotificationManager;
import io.onedev.server.manager.impl.DefaultAttachmentManager;
import io.onedev.server.manager.impl.DefaultBatchWorkManager;
import io.onedev.server.manager.impl.DefaultBuildManager;
import io.onedev.server.manager.impl.DefaultCacheManager;
import io.onedev.server.manager.impl.DefaultCodeCommentManager;
-import io.onedev.server.manager.impl.DefaultCodeCommentNotificationManager;
import io.onedev.server.manager.impl.DefaultCodeCommentQuerySettingManager;
import io.onedev.server.manager.impl.DefaultCodeCommentRelationInfoManager;
import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;
import io.onedev.server.manager.impl.DefaultCodeCommentReplyManager;
import io.onedev.server.manager.impl.DefaultCommitInfoManager;
+import io.onedev.server.manager.impl.DefaultCommitNotificationManager;
+import io.onedev.server.manager.impl.DefaultCommitQuerySettingManager;
import io.onedev.server.manager.impl.DefaultConfigurationManager;
import io.onedev.server.manager.impl.DefaultDataManager;
import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;
@@ -193,6 +192,10 @@ import io.onedev.server.rest.RestConstants;
import io.onedev.server.rest.jersey.DefaultServletContainer;
import io.onedev.server.rest.jersey.JerseyConfigurator;
import io.onedev.server.rest.jersey.ResourceConfigProvider;
+import io.onedev.server.search.code.DefaultIndexManager;
+import io.onedev.server.search.code.DefaultSearchManager;
+import io.onedev.server.search.code.IndexManager;
+import io.onedev.server.search.code.SearchManager;
import io.onedev.server.security.BasicAuthenticationFilter;
import io.onedev.server.security.FilterChainConfigurator;
import io.onedev.server.security.OneAuthorizingRealm;
@@ -317,6 +320,7 @@ public class CoreModule extends AbstractPluginModule {
bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
bind(DefaultPullRequestNotificationManager.class);
+ bind(DefaultCommitNotificationManager.class);
bind(DefaultIssueNotificationManager.class);
bind(DefaultCodeCommentNotificationManager.class);
bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
@@ -333,6 +337,7 @@ public class CoreModule extends AbstractPluginModule {
bind(IssueQuerySettingManager.class).to(DefaultIssueQuerySettingManager.class);
bind(PullRequestQuerySettingManager.class).to(DefaultPullRequestQuerySettingManager.class);
bind(CodeCommentQuerySettingManager.class).to(DefaultCodeCommentQuerySettingManager.class);
+ bind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
diff --git a/core/src/main/java/io/onedev/server/entityquery/ParensAware.java b/core/src/main/java/io/onedev/server/entityquery/ParensAware.java
deleted file mode 100644
index 53b793ef0e..0000000000
--- a/core/src/main/java/io/onedev/server/entityquery/ParensAware.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.entityquery;
-
-public interface ParensAware {
-
-}
diff --git a/core/src/main/java/io/onedev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.java
index 65dac2a69e..35dd45a35c 100644
--- a/core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -3,8 +3,10 @@ package io.onedev.server.git;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -40,6 +42,7 @@ import org.eclipse.jgit.revwalk.RevWalkUtils;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.SystemReader;
import org.eclipse.jgit.util.io.NullOutputStream;
@@ -474,6 +477,25 @@ public class GitUtils {
throw new RuntimeException(e);
}
}
+
+ public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId, ObjectId newCommitId) {
+ Collection<String> changedFiles = new HashSet<>();
+ try ( RevWalk revWalk = new RevWalk(repository);
+ TreeWalk treeWalk = new TreeWalk(repository)) {
+ treeWalk.setFilter(TreeFilter.ANY_DIFF);
+ treeWalk.setRecursive(true);
+ RevCommit oldCommit = revWalk.parseCommit(oldCommitId);
+ RevCommit newCommit = revWalk.parseCommit(newCommitId);
+ treeWalk.addTree(oldCommit.getTree());
+ treeWalk.addTree(newCommit.getTree());
+ while (treeWalk.next()) {
+ changedFiles.add(treeWalk.getPathString());
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return changedFiles;
+ }
public static boolean isValid(File gitDir) {
return new File(gitDir, "objects").exists();
diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
index c6b5f1b5a2..dd627a70a6 100644
--- a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
@@ -8,13 +8,14 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.EntityQuery;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
public interface CodeCommentManager extends EntityManager<CodeComment> {
@@ -31,9 +32,9 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {
void save(CodeComment comment, @Nullable PullRequest request);
- List<CodeComment> query(Project project, @Nullable PullRequest request,
+ List<CodeComment> query(Project project, @Nullable PullRequest request, User user,
EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);
- int count(Project project, @Nullable PullRequest request, EntityCriteria<CodeComment> commentCriteria);
+ int count(Project project, @Nullable PullRequest request, User user, EntityCriteria<CodeComment> commentCriteria);
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.java
new file mode 100644
index 0000000000..93ea56b0a7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.manager;
+
+import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface CommitQuerySettingManager extends EntityManager<CommitQuerySetting> {
+
+ CommitQuerySetting find(Project project, User user);
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 706277083b..79bb12ddab 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -6,13 +6,14 @@ import java.util.Map;
import javax.annotation.Nullable;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.issue.IssueCriteria;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;
@@ -25,13 +26,13 @@ public interface IssueManager extends EntityManager<Issue> {
void open(Issue issue);
- List<Issue> query(Project project, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);
+ List<Issue> query(Project project, User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);
- int count(Project project, @Nullable IssueCriteria issueCriteria);
+ int count(Project project, User user, @Nullable IssueCriteria issueCriteria);
List<Issue> query(Project project, @Nullable String term, int count);
- int count(Milestone milestone, @Nullable StateSpec.Category category);
+ int count(Milestone milestone, User user, @Nullable StateSpec.Category category);
Collection<String> getUndefinedStates(Project project);
diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
index 0f8a5a01a8..7b8cced8f6 100644
--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
@@ -5,8 +5,6 @@ import java.util.List;
import javax.annotation.Nullable;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.EntityQuery;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -14,6 +12,8 @@ import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
public interface PullRequestManager extends EntityManager<PullRequest> {
@@ -76,9 +76,9 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void checkQuality(PullRequest request);
- List<PullRequest> query(Project targetProject, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);
+ List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);
- int count(Project targetProject, EntityCriteria<PullRequest> requestCriteria);
+ int count(Project targetProject, User user, EntityCriteria<PullRequest> requestCriteria);
List<PullRequest> query(Project targetProject, String term, int count);
diff --git a/core/src/main/java/io/onedev/server/manager/UrlManager.java b/core/src/main/java/io/onedev/server/manager/UrlManager.java
index fc14beb721..021716a912 100644
--- a/core/src/main/java/io/onedev/server/manager/UrlManager.java
+++ b/core/src/main/java/io/onedev/server/manager/UrlManager.java
@@ -2,6 +2,8 @@ package io.onedev.server.manager;
import javax.annotation.Nullable;
+import org.eclipse.jgit.lib.ObjectId;
+
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
@@ -16,6 +18,8 @@ public interface UrlManager {
String urlFor(Project project);
+ String urlFor(Project project, ObjectId commitId);
+
String urlFor(PullRequest request);
String urlFor(PullRequestComment comment);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
index 9562282a00..b67e969386 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
@@ -39,12 +39,6 @@ import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.QueryBuildContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryBuildContext;
import io.onedev.server.event.codecomment.CodeCommentAdded;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.git.GitUtils;
@@ -55,6 +49,7 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.persistence.annotation.Sessional;
@@ -62,6 +57,12 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryBuildContext;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -252,8 +253,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
}
- private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<CodeComment> criteria, Project project,
- PullRequest request, QueryBuildContext<CodeComment> context) {
+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria, Project project,
+ PullRequest request, QueryBuildContext<CodeComment> context, User user) {
List<Predicate> predicates = new ArrayList<>();
if (request != null) {
Join<?, ?> relations = context.getRoot().join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);
@@ -262,22 +263,22 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));
}
if (criteria != null)
- predicates.add(criteria.getPredicate(project, context));
+ predicates.add(criteria.getPredicate(project, context, user));
return predicates.toArray(new Predicate[0]);
}
private CriteriaQuery<CodeComment> buildCriteriaQuery(Session session, Project project, PullRequest request,
- EntityQuery<CodeComment> requestQuery) {
+ EntityQuery<CodeComment> commentQuery, User user) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);
Root<CodeComment> root = query.from(CodeComment.class);
query.select(root).distinct(true);
QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
- query.where(getPredicates(requestQuery.getCriteria(), project, request, context));
+ query.where(getPredicates(commentQuery.getCriteria(), project, request, context, user));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
- for (EntitySort sort: requestQuery.getSorts()) {
+ for (EntitySort sort: commentQuery.getSorts()) {
if (sort.getDirection() == Direction.ASCENDING)
orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));
else
@@ -294,9 +295,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Sessional
@Override
- public List<CodeComment> query(Project project, PullRequest request, EntityQuery<CodeComment> commentQuery,
+ public List<CodeComment> query(Project project, PullRequest request, User user, EntityQuery<CodeComment> commentQuery,
int firstResult, int maxResults) {
- CriteriaQuery<CodeComment> criteriaQuery = buildCriteriaQuery(getSession(), project, request, commentQuery);
+ CriteriaQuery<CodeComment> criteriaQuery = buildCriteriaQuery(getSession(), project, request, commentQuery, user);
Query<CodeComment> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
@@ -305,14 +306,14 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Sessional
@Override
- public int count(Project project, PullRequest request,
- io.onedev.server.entityquery.EntityCriteria<CodeComment> commentCriteria) {
+ public int count(Project project, PullRequest request, User user,
+ io.onedev.server.search.entity.EntityCriteria<CodeComment> commentCriteria) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<CodeComment> root = criteriaQuery.from(CodeComment.class);
QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(commentCriteria, project, request, context));
+ criteriaQuery.where(getPredicates(commentCriteria, project, request, context, user));
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java
new file mode 100644
index 0000000000..f6008777ee
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java
@@ -0,0 +1,82 @@
+package io.onedev.server.manager.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.manager.MailManager;
+import io.onedev.server.manager.UrlManager;
+import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.search.commit.CommitQueryUtils;
+
+@Singleton
+public class DefaultCommitNotificationManager {
+
+ private final MailManager mailManager;
+
+ private final UrlManager urlManager;
+
+ @Inject
+ public DefaultCommitNotificationManager(MailManager mailManager, UrlManager urlManager) {
+ this.mailManager = mailManager;
+ this.urlManager = urlManager;
+ }
+
+ private void fillSubscribedQueryStrings(Map<User, Collection<String>> subscribedQueryStrings, User user, @Nullable NamedQuery query) {
+ if (query != null) {
+ Collection<String> value = subscribedQueryStrings.get(user);
+ if (value == null) {
+ value = new HashSet<>();
+ subscribedQueryStrings.put(user, value);
+ }
+ value.add(query.getQuery());
+ }
+ }
+
+ @Listen
+ public void on(RefUpdated event) {
+ if (!event.getNewCommitId().equals(ObjectId.zeroId())) {
+ Project project = event.getProject();
+ Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
+ for (CommitQuerySetting setting: project.getCommitQuerySettings()) {
+ for (String queryName: setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions())
+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), project.getSavedCommitQuery(queryName));
+ for (String queryName: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())
+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), setting.getUserQuery(queryName));
+ }
+
+ Collection<String> notifyEmails = new HashSet<>();
+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
+ User user = entry.getKey();
+ for (String queryString: entry.getValue()) {
+ try {
+ if (CommitQueryUtils.matches(event, user, queryString)) {
+ notifyEmails.add(user.getEmail());
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ RevCommit commit = project.getRevCommit(event.getNewCommitId());
+ String subject = String.format("Subscribed commit at ref '%s': %s", event.getRefName(), commit.getShortMessage());
+ String url = urlManager.urlFor(project, commit);
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(notifyEmails, subject, body.toString());
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.java
new file mode 100644
index 0000000000..6e968c0019
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.java
@@ -0,0 +1,52 @@
+package io.onedev.server.manager.impl;
+
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.manager.CommitQuerySettingManager;
+import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultCommitQuerySettingManager extends AbstractEntityManager<CommitQuerySetting>
+ implements CommitQuerySettingManager {
+
+ @Inject
+ public DefaultCommitQuerySettingManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public CommitQuerySetting find(Project project, User user) {
+ EntityCriteria<CommitQuerySetting> criteria = newCriteria();
+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void save(CommitQuerySetting setting) {
+ setting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(
+ setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
+ setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().retainAll(
+ setting.getProject().getSavedCommitQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
+ if (setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {
+ if (!setting.isNew())
+ delete(setting);
+ } else {
+ super.save(setting);
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 82d70585e2..2c7dc6d3cb 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -32,15 +32,6 @@ import org.hibernate.query.Query;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.QueryBuildContext;
-import io.onedev.server.entityquery.issue.AndCriteria;
-import io.onedev.server.entityquery.issue.IssueCriteria;
-import io.onedev.server.entityquery.issue.IssueQuery;
-import io.onedev.server.entityquery.issue.IssueQueryBuildContext;
-import io.onedev.server.entityquery.issue.MilestoneCriteria;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.issue.IssueCommitted;
import io.onedev.server.event.issue.IssueOpened;
@@ -52,6 +43,7 @@ import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.IssueBoard;
import io.onedev.server.model.support.issue.IssueConstants;
@@ -62,6 +54,15 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.issue.AndCriteria;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryBuildContext;
+import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.OneContext;
@@ -116,21 +117,21 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
listenerRegistry.post(new IssueOpened(issue));
}
- private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context) {
+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context, User user) {
List<Predicate> predicates = new ArrayList<>();
predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));
if (criteria != null)
- predicates.add(criteria.getPredicate(project, context));
+ predicates.add(criteria.getPredicate(project, context, user));
return predicates.toArray(new Predicate[0]);
}
- private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery) {
+ private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery, User user) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery<Issue> query = builder.createQuery(Issue.class);
Root<Issue> root = query.from(Issue.class);
QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);
- query.where(getPredicates(issueQuery.getCriteria(), project, context));
+ query.where(getPredicates(issueQuery.getCriteria(), project, context, user));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: issueQuery.getSorts()) {
@@ -159,8 +160,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
- public List<Issue> query(Project project, io.onedev.server.entityquery.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {
- CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery);
+ public List<Issue> query(Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {
+ CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);
Query<Issue> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
@@ -173,33 +174,33 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
- public int count(Project project, IssueCriteria issueCriteria) {
+ public int count(Project project, User user, IssueCriteria issueCriteria) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<Issue> root = criteriaQuery.from(Issue.class);
QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(issueCriteria, project, context));
+ criteriaQuery.where(getPredicates(issueCriteria, project, context, user));
criteriaQuery.select(builder.count(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
@Override
- public int count(Milestone milestone, @Nullable StateSpec.Category category) {
+ public int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {
if (category != null) {
IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getCategoryCriteria(category);
if (criteria != null) {
List<IssueCriteria> criterias = new ArrayList<>();
criterias.add(new MilestoneCriteria(milestone.getName()));
criterias.add(criteria);
- return count(milestone.getProject(), new AndCriteria(criterias));
+ return count(milestone.getProject(), user, new AndCriteria(criterias));
} else {
return 0;
}
} else {
IssueCriteria criteria = new MilestoneCriteria(milestone.getName());
- return count(milestone.getProject(), criteria);
+ return count(milestone.getProject(), user, criteria);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
index 8c1d7b29e4..ec9b42b64e 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
@@ -10,9 +10,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryWatchBuilder;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.issue.IssueActionEvent;
import io.onedev.server.event.issue.IssueCommented;
@@ -31,6 +28,9 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryWatchBuilder;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.markdown.MentionParser;
import jersey.repackaged.com.google.common.collect.Lists;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
index 9423013009..8d62b500a1 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
@@ -8,7 +8,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -23,9 +22,6 @@ import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -320,21 +316,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
cmd.fromRev(oldObjectId.name()).toRev(newObjectId.name());
return cmd.call();
} else {
- Set<String> changedFiles = new HashSet<>();
- try (TreeWalk treeWalk = new TreeWalk(project.getRepository())) {
- treeWalk.setFilter(TreeFilter.ANY_DIFF);
- treeWalk.setRecursive(true);
- RevCommit oldCommit = project.getRevCommit(oldObjectId);
- RevCommit newCommit = project.getRevCommit(newObjectId);
- treeWalk.addTree(oldCommit.getTree());
- treeWalk.addTree(newCommit.getTree());
- while (treeWalk.next()) {
- changedFiles.add(treeWalk.getPathString());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return changedFiles;
+ return GitUtils.getChangedFiles(project.getRepository(), oldObjectId, newObjectId);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index ac741b0cef..cd351dc132 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -57,12 +57,6 @@ import com.google.common.base.Throwables;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.QueryBuildContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryBuildContext;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.pullrequest.PullRequestActionEvent;
@@ -118,6 +112,12 @@ import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.persistence.dao.EntityRemoved;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;
import io.onedev.server.security.ProjectPrivilege;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
@@ -940,16 +940,16 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
return findAll(criteria);
}
- private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<PullRequest> criteria,
- Project targetProject, QueryBuildContext<PullRequest> context) {
+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,
+ Project targetProject, User user, QueryBuildContext<PullRequest> context) {
List<Predicate> predicates = new ArrayList<>();
predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), targetProject));
if (criteria != null)
- predicates.add(criteria.getPredicate(targetProject, context));
+ predicates.add(criteria.getPredicate(targetProject, context, user));
return predicates.toArray(new Predicate[0]);
}
- private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject,
+ private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,
EntityQuery<PullRequest> requestQuery) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);
@@ -957,7 +957,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
query.select(root).distinct(true);
QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);
- query.where(getPredicates(requestQuery.getCriteria(), targetProject, context));
+ query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, context));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: requestQuery.getSorts()) {
@@ -977,8 +977,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Sessional
@Override
- public List<PullRequest> query(Project targetProject, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {
- CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);
+ public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {
+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);
Query<PullRequest> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
@@ -987,13 +987,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Sessional
@Override
- public int count(Project targetProject, io.onedev.server.entityquery.EntityCriteria<PullRequest> requestCriteria) {
+ public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<PullRequest> root = criteriaQuery.from(PullRequest.class);
QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(requestCriteria, targetProject, context));
+ criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, context));
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
index 5bf274119c..ea9a14cf65 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
@@ -16,9 +16,6 @@ import org.hibernate.type.Type;
import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryWatchBuilder;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.pullrequest.PullRequestActionEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
@@ -49,6 +46,9 @@ import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;
import io.onedev.server.model.support.pullrequest.actiondata.RequestedForChangesData;
import io.onedev.server.persistence.PersistListener;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryWatchBuilder;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.util.markdown.MentionParser;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
index 7b49587803..fdfb6b5d0a 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
@@ -13,6 +13,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QuerySubscriptionSupport;
import io.onedev.server.model.support.QueryWatchSupport;
import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
@@ -69,5 +70,10 @@ public class CodeCommentQuerySetting extends QuerySetting<NamedCodeCommentQuery>
public QueryWatchSupport<NamedCodeCommentQuery> getQueryWatchSupport() {
return null;
}
+
+ @Override
+ public QuerySubscriptionSupport<NamedCodeCommentQuery> getQuerySubscriptionSupport() {
+ return null;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
new file mode 100644
index 0000000000..3abfab0631
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
@@ -0,0 +1,107 @@
+package io.onedev.server.model;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QuerySubscriptionSupport;
+import io.onedev.server.model.support.QueryWatchSupport;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}
+)
+public class CommitQuerySetting extends QuerySetting<NamedCommitQuery> {
+
+ private static final long serialVersionUID = 1L;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Project project;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private User user;
+
+ @Lob
+ @Column(nullable=false, length=65535)
+ private ArrayList<NamedCommitQuery> userQueries = new ArrayList<>();
+
+ @Lob
+ @Column(nullable=false, length=65535)
+ private LinkedHashSet<String> userQuerySubscriptions = new LinkedHashSet<>();
+
+ @Column(nullable=false, length=65535)
+ private LinkedHashSet<String> projectQuerySubscriptions = new LinkedHashSet<>();
+
+ @Override
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public ArrayList<NamedCommitQuery> getUserQueries() {
+ return userQueries;
+ }
+
+ @Override
+ public void setUserQueries(ArrayList<NamedCommitQuery> userQueries) {
+ this.userQueries = userQueries;
+ }
+
+ public void setUserQuerySubscriptions(LinkedHashSet<String> userQuerySubscriptions) {
+ this.userQuerySubscriptions = userQuerySubscriptions;
+ }
+
+ public void setProjectQuerySubscriptions(LinkedHashSet<String> projectQuerySubscriptions) {
+ this.projectQuerySubscriptions = projectQuerySubscriptions;
+ }
+
+ @Override
+ public QuerySubscriptionSupport<NamedCommitQuery> getQuerySubscriptionSupport() {
+ return new QuerySubscriptionSupport<NamedCommitQuery>() {
+
+ @Override
+ public LinkedHashSet<String> getUserQuerySubscriptions() {
+ return userQuerySubscriptions;
+ }
+
+ @Override
+ public LinkedHashSet<String> getProjectQuerySubscriptions() {
+ return projectQuerySubscriptions;
+ }
+
+ };
+ }
+
+ @Override
+ public QueryWatchSupport<NamedCommitQuery> getQueryWatchSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
index c95d7d31a0..74a932ef4c 100644
--- a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
@@ -14,6 +14,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QuerySubscriptionSupport;
import io.onedev.server.model.support.QueryWatchSupport;
import io.onedev.server.model.support.issue.NamedIssueQuery;
@@ -98,4 +99,9 @@ public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {
};
}
+ @Override
+ public QuerySubscriptionSupport<NamedIssueQuery> getQuerySubscriptionSupport() {
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 2554a148a1..6614bb58e2 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -76,6 +76,7 @@ import io.onedev.server.git.command.BlameCommand;
import io.onedev.server.git.exception.NotFileException;
import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.manager.CodeCommentQuerySettingManager;
+import io.onedev.server.manager.CommitQuerySettingManager;
import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.PullRequestQuerySettingManager;
@@ -84,6 +85,7 @@ import io.onedev.server.manager.StorageManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.CommitMessageTransformSetting;
+import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
import io.onedev.server.model.support.issue.IssueBoard;
@@ -181,6 +183,9 @@ public class Project extends AbstractEntity {
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();
+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
+ private Collection<CommitQuerySetting> commitQuerySettings = new ArrayList<>();
+
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<PullRequestQuerySetting> pullRequestQuerySettings = new ArrayList<>();
@@ -198,6 +203,10 @@ public class Project extends AbstractEntity {
@Column(length=65535)
private ArrayList<NamedIssueQuery> savedIssueQueries;
+ @Lob
+ @Column(length=65535)
+ private ArrayList<NamedCommitQuery> savedCommitQueries;
+
@Lob
@Column(length=65535)
private ArrayList<NamedPullRequestQuery> savedPullRequestQueries;
@@ -234,6 +243,8 @@ public class Project extends AbstractEntity {
private transient Optional<CodeCommentQuerySetting> codeCommentQuerySettingOfCurrentUserHolder;
+ private transient Optional<CommitQuerySetting> commitQuerySettingOfCurrentUserHolder;
+
@Editable(order=100)
@ProjectName
@NotEmpty
@@ -877,6 +888,22 @@ public class Project extends AbstractEntity {
this.savedIssueQueries = savedIssueQueries;
}
+ public ArrayList<NamedCommitQuery> getSavedCommitQueries() {
+ if (savedCommitQueries == null) {
+ savedCommitQueries = new ArrayList<>();
+ savedCommitQueries.add(new NamedCommitQuery("All", "all"));
+ savedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));
+ savedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));
+ savedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));
+ savedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));
+ }
+ return savedCommitQueries;
+ }
+
+ public void setSavedCommitQueries(ArrayList<NamedCommitQuery> savedCommitQueries) {
+ this.savedCommitQueries = savedCommitQueries;
+ }
+
public ArrayList<NamedPullRequestQuery> getSavedPullRequestQueries() {
if (savedPullRequestQueries == null) {
savedPullRequestQueries = new ArrayList<>();
@@ -907,6 +934,15 @@ public class Project extends AbstractEntity {
return null;
}
+ @Nullable
+ public NamedCommitQuery getSavedCommitQuery(String name) {
+ for (NamedCommitQuery namedQuery: getSavedCommitQueries()) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
@Nullable
public NamedPullRequestQuery getSavedPullRequestQuery(String name) {
for (NamedPullRequestQuery namedQuery: getSavedPullRequestQueries()) {
@@ -966,6 +1002,14 @@ public class Project extends AbstractEntity {
this.issueQuerySettings = issueQuerySettings;
}
+ public Collection<CommitQuerySetting> getCommitQuerySettings() {
+ return commitQuerySettings;
+ }
+
+ public void setCommitQuerySettings(Collection<CommitQuerySetting> commitQuerySettings) {
+ this.commitQuerySettings = commitQuerySettings;
+ }
+
public Collection<PullRequestQuerySetting> getPullRequestQuerySettings() {
return pullRequestQuerySettings;
}
@@ -1146,6 +1190,24 @@ public class Project extends AbstractEntity {
return issueQuerySettingOfCurrentUserHolder.orNull();
}
+ public CommitQuerySetting getCommitQuerySettingOfCurrentUser() {
+ if (commitQuerySettingOfCurrentUserHolder == null) {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ CommitQuerySetting setting = OneDev.getInstance(CommitQuerySettingManager.class).find(this, user);
+ if (setting == null) {
+ setting = new CommitQuerySetting();
+ setting.setProject(this);
+ setting.setUser(user);
+ }
+ commitQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ } else {
+ commitQuerySettingOfCurrentUserHolder = Optional.absent();
+ }
+ }
+ return commitQuerySettingOfCurrentUserHolder.orNull();
+ }
+
@Nullable
public PullRequestQuerySetting getPullRequestQuerySettingOfCurrentUser() {
if (pullRequestQuerySettingOfCurrentUserHolder == null) {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
index 2835a1580f..e94a64e397 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
@@ -14,6 +14,7 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QuerySubscriptionSupport;
import io.onedev.server.model.support.QueryWatchSupport;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
@@ -98,4 +99,9 @@ public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery>
};
}
+ @Override
+ public QuerySubscriptionSupport<NamedPullRequestQuery> getQuerySubscriptionSupport() {
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java
new file mode 100644
index 0000000000..e393386a95
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java
@@ -0,0 +1,48 @@
+package io.onedev.server.model.support;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.web.editable.annotation.CommitQuery;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class NamedCommitQuery implements NamedQuery {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String query;
+
+ public NamedCommitQuery(String name, String query) {
+ this.name = name;
+ this.query = query;
+ }
+
+ public NamedCommitQuery() {
+ }
+
+ @Editable
+ @NotEmpty
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable
+ @CommitQuery
+ @NotEmpty
+ @Override
+ public String getQuery() {
+ return query;
+ }
+
+ public void setQuery(String query) {
+ this.query = query;
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/model/support/QuerySetting.java b/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
index 1a21d1445f..c3d9df27b5 100644
--- a/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
@@ -25,6 +25,9 @@ public abstract class QuerySetting<T extends NamedQuery> extends AbstractEntity
@Nullable
public abstract QueryWatchSupport<T> getQueryWatchSupport();
+ @Nullable
+ public abstract QuerySubscriptionSupport<T> getQuerySubscriptionSupport();
+
@Nullable
public T getUserQuery(String name) {
for (T namedQuery: getUserQueries()) {
diff --git a/core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java b/core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java
new file mode 100644
index 0000000000..1f024d43ce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java
@@ -0,0 +1,11 @@
+package io.onedev.server.model.support;
+
+import java.util.LinkedHashSet;
+
+public abstract class QuerySubscriptionSupport<T extends NamedQuery> {
+
+ public abstract LinkedHashSet<String> getUserQuerySubscriptions();
+
+ public abstract LinkedHashSet<String> getProjectQuerySubscriptions();
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
index 573ee7c918..5452a2f0bf 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
@@ -144,7 +144,7 @@ public class IssueBoard implements Serializable {
Set<String> undefinedStates = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedStates.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));
+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));
} catch (Exception e) {
}
}
@@ -160,8 +160,8 @@ public class IssueBoard implements Serializable {
public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {
if (getBaseQuery() != null) {
try {
- io.onedev.server.entityquery.issue.IssueQuery query =
- io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false);
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false);
for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())
query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());
setBaseQuery(query.toString());
@@ -181,7 +181,7 @@ public class IssueBoard implements Serializable {
Set<String> undefinedFields = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedFields.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));
+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));
} catch (Exception e) {
}
}
@@ -196,8 +196,8 @@ public class IssueBoard implements Serializable {
public boolean fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {
if (getBaseQuery() != null) {
try {
- io.onedev.server.entityquery.issue.IssueQuery query =
- io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), false);
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false);
boolean remove = false;
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
UndefinedFieldResolution resolution = entry.getValue();
@@ -258,7 +258,7 @@ public class IssueBoard implements Serializable {
try {
if (getBaseQuery() != null) {
try {
- undefinedFieldValues.addAll(io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));
+ undefinedFieldValues.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));
} catch (Exception e) {
}
}
@@ -281,8 +281,8 @@ public class IssueBoard implements Serializable {
public boolean fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions) {
if (getBaseQuery() != null) {
try {
- io.onedev.server.entityquery.issue.IssueQuery query =
- io.onedev.server.entityquery.issue.IssueQuery.parse(project, getBaseQuery(), true);
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), true);
boolean remove = false;
for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
UndefinedFieldValueResolution resolution = entry.getValue();
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
index 8d3d5bd5f1..e9fda2a5dd 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
@@ -13,15 +13,15 @@ import javax.annotation.Nullable;
import com.google.common.collect.Lists;
-import io.onedev.server.entityquery.issue.IssueCriteria;
-import io.onedev.server.entityquery.issue.OrCriteria;
-import io.onedev.server.entityquery.issue.StateCriteria;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.support.authorized.ProjectWriters;
import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;
import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsEmpty;
import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsNotEmpty;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.OrCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.IssueChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
diff --git a/core/src/main/java/io/onedev/server/codesearch/CommitIndexed.java b/core/src/main/java/io/onedev/server/search/code/CommitIndexed.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/codesearch/CommitIndexed.java
rename to core/src/main/java/io/onedev/server/search/code/CommitIndexed.java
index 1f57bdbbf7..d1f3a2a8c7 100644
--- a/core/src/main/java/io/onedev/server/codesearch/CommitIndexed.java
+++ b/core/src/main/java/io/onedev/server/search/code/CommitIndexed.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.java
rename to core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
index 473871d02a..287f2e590f 100644
--- a/core/src/main/java/io/onedev/server/codesearch/DefaultIndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
@@ -1,21 +1,21 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_HASH;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_INDEX_VERSION;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_SECONDARY_SYMBOLS;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_SYMBOL_LIST;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_TEXT;
-import static io.onedev.server.codesearch.FieldConstants.COMMIT_HASH;
-import static io.onedev.server.codesearch.FieldConstants.COMMIT_INDEX_VERSION;
-import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT;
-import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT_HASH;
-import static io.onedev.server.codesearch.FieldConstants.LAST_COMMIT_INDEX_VERSION;
-import static io.onedev.server.codesearch.FieldConstants.META;
-import static io.onedev.server.codesearch.IndexConstants.MAX_INDEXABLE_SIZE;
-import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;
+import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;
+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;
+import static io.onedev.server.search.code.FieldConstants.COMMIT_HASH;
+import static io.onedev.server.search.code.FieldConstants.COMMIT_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_HASH;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.META;
+import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;
+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
import java.io.File;
import java.io.IOException;
diff --git a/core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.java
rename to core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
index 0516c331e7..a89f8e5f32 100644
--- a/core/src/main/java/io/onedev/server/codesearch/DefaultSearchManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
@@ -1,9 +1,9 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_HASH;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_INDEX_VERSION;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_SYMBOL_LIST;
+import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;
import java.io.IOException;
import java.nio.channels.ClosedByInterruptException;
@@ -46,13 +46,13 @@ import com.google.common.base.Throwables;
import io.onedev.jsymbol.Symbol;
import io.onedev.jsymbol.SymbolExtractorRegistry;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.query.BlobQuery;
import io.onedev.server.event.lifecycle.SystemStopping;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.EntityRemoved;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.query.BlobQuery;
@Singleton
public class DefaultSearchManager implements SearchManager {
diff --git a/core/src/main/java/io/onedev/server/codesearch/FieldConstants.java b/core/src/main/java/io/onedev/server/search/code/FieldConstants.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/codesearch/FieldConstants.java
rename to core/src/main/java/io/onedev/server/search/code/FieldConstants.java
index 3ea89b8b43..d8f1d02097 100644
--- a/core/src/main/java/io/onedev/server/codesearch/FieldConstants.java
+++ b/core/src/main/java/io/onedev/server/search/code/FieldConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TermQuery;
diff --git a/core/src/main/java/io/onedev/server/codesearch/IndexConstants.java b/core/src/main/java/io/onedev/server/search/code/IndexConstants.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/codesearch/IndexConstants.java
rename to core/src/main/java/io/onedev/server/search/code/IndexConstants.java
index a2e580baba..f661bb547e 100644
--- a/core/src/main/java/io/onedev/server/codesearch/IndexConstants.java
+++ b/core/src/main/java/io/onedev/server/search/code/IndexConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
public interface IndexConstants {
diff --git a/core/src/main/java/io/onedev/server/codesearch/IndexManager.java b/core/src/main/java/io/onedev/server/search/code/IndexManager.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/codesearch/IndexManager.java
rename to core/src/main/java/io/onedev/server/search/code/IndexManager.java
index cef0c5147d..56fbedc38e 100644
--- a/core/src/main/java/io/onedev/server/codesearch/IndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/IndexManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.java b/core/src/main/java/io/onedev/server/search/code/NGramAnalyzer.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.java
rename to core/src/main/java/io/onedev/server/search/code/NGramAnalyzer.java
index 0e8ff59ddb..2a330d81aa 100644
--- a/core/src/main/java/io/onedev/server/codesearch/NGramAnalyzer.java
+++ b/core/src/main/java/io/onedev/server/search/code/NGramAnalyzer.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
import java.io.IOException;
import java.io.Reader;
diff --git a/core/src/main/java/io/onedev/server/codesearch/SearchManager.java b/core/src/main/java/io/onedev/server/search/code/SearchManager.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/codesearch/SearchManager.java
rename to core/src/main/java/io/onedev/server/search/code/SearchManager.java
index 0bf4e62e70..0de3fe8635 100644
--- a/core/src/main/java/io/onedev/server/codesearch/SearchManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/SearchManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch;
+package io.onedev.server.search.code;
import java.util.List;
@@ -8,10 +8,10 @@ import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.jsymbol.Symbol;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.query.BlobQuery;
-import io.onedev.server.codesearch.query.TooGeneralQueryException;
import io.onedev.server.model.Project;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
public interface SearchManager {
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/FileHit.java b/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/codesearch/hit/FileHit.java
rename to core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
index 02e98eb8d6..c3422d5778 100644
--- a/core/src/main/java/io/onedev/server/codesearch/hit/FileHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.hit;
+package io.onedev.server.search.code.hit;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/PathHit.java b/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/codesearch/hit/PathHit.java
rename to core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
index 754748a3b1..b293586571 100644
--- a/core/src/main/java/io/onedev/server/codesearch/hit/PathHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.hit;
+package io.onedev.server.search.code.hit;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.java b/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.java
rename to core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
index 7db090fb18..50432ea196 100644
--- a/core/src/main/java/io/onedev/server/codesearch/hit/QueryHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.hit;
+package io.onedev.server.search.code.hit;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.java b/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.java
rename to core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
index 8b8694c391..f1c75264c0 100644
--- a/core/src/main/java/io/onedev/server/codesearch/hit/SymbolHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.hit;
+package io.onedev.server.search.code.hit;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/TextHit.java b/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/codesearch/hit/TextHit.java
rename to core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
index 38b625d497..2eedf80bb0 100644
--- a/core/src/main/java/io/onedev/server/codesearch/hit/TextHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.hit;
+package io.onedev.server.search.code.hit;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/bullet.gif b/core/src/main/java/io/onedev/server/search/code/hit/bullet.gif
similarity index 100%
rename from core/src/main/java/io/onedev/server/codesearch/hit/bullet.gif
rename to core/src/main/java/io/onedev/server/search/code/hit/bullet.gif
diff --git a/core/src/main/java/io/onedev/server/codesearch/hit/file.png b/core/src/main/java/io/onedev/server/search/code/hit/file.png
similarity index 100%
rename from core/src/main/java/io/onedev/server/codesearch/hit/file.png
rename to core/src/main/java/io/onedev/server/search/code/hit/file.png
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.java b/core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
index b4c96a0f08..eeeaa9256d 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/BlobQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/BlobQuery.java
@@ -1,6 +1,6 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
import java.util.List;
@@ -13,7 +13,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.server.codesearch.hit.QueryHit;
+import io.onedev.server.search.code.hit.QueryHit;
public abstract class BlobQuery {
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/FileQuery.java b/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/codesearch/query/FileQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
index 9bd8f0780e..4405830ce2 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/FileQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
@@ -1,6 +1,6 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
import java.util.List;
@@ -15,8 +15,8 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
-import io.onedev.server.codesearch.hit.FileHit;
-import io.onedev.server.codesearch.hit.QueryHit;
+import io.onedev.server.search.code.hit.FileHit;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.utils.Range;
import io.onedev.utils.stringmatch.WildcardUtils;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.java b/core/src/main/java/io/onedev/server/search/code/query/NGramLuceneQuery.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/NGramLuceneQuery.java
index f336f7c9f4..da82b282f0 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/NGramLuceneQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/NGramLuceneQuery.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
import java.io.IOException;
import java.io.StringReader;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/PathQuery.java b/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/codesearch/query/PathQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
index 555d243306..47da4063f9 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/PathQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
@@ -1,6 +1,6 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PATH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
import java.util.List;
@@ -13,8 +13,8 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.server.codesearch.hit.PathHit;
-import io.onedev.server.codesearch.hit.QueryHit;
+import io.onedev.server.search.code.hit.PathHit;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.utils.PathUtils;
import io.onedev.utils.Range;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.java b/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
index 3f5dde544b..cd1c0861c5 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/SymbolQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
@@ -1,8 +1,8 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_SECONDARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;
import java.util.List;
@@ -18,9 +18,9 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import io.onedev.jsymbol.Symbol;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.hit.SymbolHit;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.hit.SymbolHit;
import io.onedev.utils.Range;
import io.onedev.utils.stringmatch.WildcardUtils;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/TextQuery.java b/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/codesearch/query/TextQuery.java
rename to core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
index 2bf90ae361..12925d26d4 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/TextQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
@@ -1,8 +1,8 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_NAME;
-import static io.onedev.server.codesearch.FieldConstants.BLOB_TEXT;
-import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;
+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;
+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
import java.io.IOException;
import java.util.List;
@@ -21,10 +21,10 @@ import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.treewalk.TreeWalk;
import io.onedev.jsymbol.TokenPosition;
-import io.onedev.server.codesearch.IndexConstants;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.hit.TextHit;
-import io.onedev.server.codesearch.query.regex.RegexLiterals;
+import io.onedev.server.search.code.IndexConstants;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.hit.TextHit;
+import io.onedev.server.search.code.query.regex.RegexLiterals;
import io.onedev.server.util.ContentDetector;
import io.onedev.utils.Range;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.java b/core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.java
rename to core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
index bfab46b7b5..809cf86459 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/TooGeneralQueryException.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/TooGeneralQueryException.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query;
+package io.onedev.server.search.code.query;
public class TooGeneralQueryException extends RuntimeException {
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/AndLiterals.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/AndLiterals.java
index cbe8a57731..23132f52b6 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/AndLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/AndLiterals.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
index 6e2019fc30..264798df78 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/LeafLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/LeafLiterals.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.java b/core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
similarity index 99%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
index acb12207dc..84db404dc2 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralUtils.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/LiteralUtils.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.java b/core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
index 3074ca836e..500d492359 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/LiteralVisitor.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/LiteralVisitor.java
@@ -1,18 +1,17 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
-import io.onedev.server.codesearch.query.regex.PCREBaseVisitor;
-import io.onedev.server.codesearch.query.regex.PCREParser.AlternationContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.AtomContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.Cc_atomContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.ElementContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.ExprContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.ParseContext;
-import io.onedev.server.codesearch.query.regex.PCREParser.QuantifierContext;
+import io.onedev.server.search.code.query.regex.PCREParser.AlternationContext;
+import io.onedev.server.search.code.query.regex.PCREParser.AtomContext;
+import io.onedev.server.search.code.query.regex.PCREParser.Cc_atomContext;
+import io.onedev.server.search.code.query.regex.PCREParser.ElementContext;
+import io.onedev.server.search.code.query.regex.PCREParser.ExprContext;
+import io.onedev.server.search.code.query.regex.PCREParser.ParseContext;
+import io.onedev.server.search.code.query.regex.PCREParser.QuantifierContext;
public class LiteralVisitor extends PCREBaseVisitor<Literals> {
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/Literals.java
similarity index 69%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/Literals.java
index a428f4795b..ff1d4ca685 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/Literals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/Literals.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/LogicalLiterals.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/LogicalLiterals.java
index 92ab025b0e..83843b0096 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/LogicalLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/LogicalLiterals.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.Iterator;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/OrLiterals.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/OrLiterals.java
index f12ba82848..c25e77fea9 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/OrLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/OrLiterals.java
@@ -1,4 +1,4 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/PCRE.g4 b/core/src/main/java/io/onedev/server/search/code/query/regex/PCRE.g4
similarity index 100%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/PCRE.g4
rename to core/src/main/java/io/onedev/server/search/code/query/regex/PCRE.g4
diff --git a/core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.java
rename to core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
index 679a11888c..788e13e8f2 100644
--- a/core/src/main/java/io/onedev/server/codesearch/query/regex/RegexLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
@@ -1,6 +1,6 @@
-package io.onedev.server.codesearch.query.regex;
+package io.onedev.server.search.code.query.regex;
-import static io.onedev.server.codesearch.IndexConstants.NGRAM_SIZE;
+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
import java.util.List;
@@ -17,10 +17,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Strings;
-import io.onedev.server.codesearch.query.NGramLuceneQuery;
-import io.onedev.server.codesearch.query.TooGeneralQueryException;
-import io.onedev.server.codesearch.query.regex.PCRELexer;
-import io.onedev.server.codesearch.query.regex.PCREParser;
+import io.onedev.server.search.code.query.NGramLuceneQuery;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
public class RegexLiterals {
diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4
new file mode 100644
index 0000000000..5f7e16fc53
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4
@@ -0,0 +1,119 @@
+grammar CommitQuery;
+
+query
+ : WS* (ALL | criteria (WS+ criteria)*) WS* EOF
+ ;
+
+criteria
+ : revisionCriteria
+ | beforeCriteria
+ | afterCriteria
+ | committerCriteria
+ | authorCriteria
+ | pathCriteria
+ | messageCriteria
+ ;
+
+revisionCriteria
+ : ((UNTIL|SINCE) WS+)? ((BRANCH|TAG|REVISION) Value | DefaultBranch)
+ ;
+
+beforeCriteria
+ : BEFORE Value
+ ;
+
+afterCriteria
+ : AFTER Value
+ ;
+
+committerCriteria
+ : COMMITTER Value
+ | CommittedByMe
+ ;
+
+authorCriteria
+ : AUTHOR Value
+ | AuthoredByMe
+ ;
+
+pathCriteria
+ : PATH Value
+ ;
+
+messageCriteria
+ : MESSAGE Value
+ ;
+
+SINCE
+ : 'since'
+ ;
+
+UNTIL
+ : 'until'
+ ;
+
+BRANCH
+ : 'branch'
+ ;
+
+TAG
+ : 'tag'
+ ;
+
+REVISION
+ : 'revision'
+ ;
+
+BEFORE
+ : 'before'
+ ;
+
+AFTER
+ : 'after'
+ ;
+
+COMMITTER
+ : 'committer'
+ ;
+
+AUTHOR
+ : 'author'
+ ;
+
+PATH
+ : 'path'
+ ;
+
+MESSAGE
+ : 'message'
+ ;
+
+AuthoredByMe
+ : 'authored-by-me'
+ ;
+
+CommittedByMe
+ : 'committed-by-me'
+ ;
+
+DefaultBranch
+ : 'default-branch'
+ ;
+
+ALL
+ : 'all'
+ ;
+
+WS
+ : ' '
+ ;
+
+Value
+ : '(' (ESCAPE|~[()\\])+? ')'
+ ;
+
+fragment
+
+ESCAPE
+ : '\\'[()\\]
+ ;
diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
new file mode 100644
index 0000000000..863e7f1b0c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
@@ -0,0 +1,316 @@
+package io.onedev.server.search.commit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.RevListCommand;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;
+import io.onedev.server.search.commit.CommitQueryParser.QueryContext;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.utils.StringUtils;
+import io.onedev.utils.stringmatch.WildcardUtils;
+
+public class CommitQueryUtils {
+
+ private static final Logger logger = LoggerFactory.getLogger(CommitQueryUtils.class);
+
+ @Nullable
+ public static QueryContext parse(@Nullable String queryString) {
+ if (queryString != null) {
+ ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CommitQueryLexer lexer = new CommitQueryLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ if (e != null) {
+ logger.error("Error lexing commit query", e);
+ } else if (msg != null) {
+ logger.error("Error lexing commit query: " + msg);
+ }
+ throw new RuntimeException("Malformed commit query");
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ CommitQueryParser parser = new CommitQueryParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ return parser.query();
+ } else {
+ return null;
+ }
+ }
+
+ public static boolean needsLogin(@Nullable String queryString) {
+ QueryContext query = parse(queryString);
+ if (query != null) {
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.authorCriteria() != null && criteria.authorCriteria().AuthoredByMe() != null
+ || criteria.committerCriteria() != null && criteria.committerCriteria().CommittedByMe() != null) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private static String removeParens(String value) {
+ if (value.startsWith("("))
+ value = value.substring(1);
+ if (value.endsWith(")"))
+ value = value.substring(0, value.length()-1);
+ return value;
+ }
+
+ public static List<String> getMessages(QueryContext query) {
+ List<String> messages = new ArrayList<>();
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.messageCriteria() != null) {
+ String message = unescape(removeParens(criteria.messageCriteria().Value().getText()));
+ messages.add(StringUtils.replace(message, "*", ".*"));
+ }
+ }
+ return messages;
+ }
+
+ private static String unescape(String text) {
+ return text.replace("\\(", "(").replace("\\)", ")").replace("\\\\", "\\");
+ }
+
+ private static List<Revision> getRevisions(Project project, QueryContext query) {
+ List<Revision> revisions = new ArrayList<>();
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.revisionCriteria() != null) {
+ Revision revision = new Revision();
+ if (criteria.revisionCriteria().DefaultBranch() != null)
+ revision.value = project.getDefaultBranch();
+ else
+ revision.value = unescape(removeParens(criteria.revisionCriteria().Value().getText()));
+ if (criteria.revisionCriteria().SINCE() != null)
+ revision.since = true;
+ else if (criteria.revisionCriteria().UNTIL() != null)
+ revision.until = true;
+ revisions.add(revision);
+ }
+ }
+ return revisions;
+ }
+
+ private static boolean matches(String value, PersonIdent person) {
+ String formatted = String.format("%s <%s>", person.getName(), person.getEmailAddress());
+ return WildcardUtils.matchString(value, formatted);
+ }
+
+ public static boolean matches(RefUpdated event, User user, @Nullable String queryString) {
+ if (!event.getNewCommitId().equals(ObjectId.zeroId())) {
+ Project project = event.getProject();
+ RevCommit commit = project.getRevCommit(event.getNewCommitId());
+
+ QueryContext query = parse(queryString);
+ if (query != null && query.ALL() == null) {
+ boolean matches = false;
+ boolean matchAtLeastOnce = false;
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.authorCriteria() != null) {
+ matchAtLeastOnce = true;
+ if (criteria.authorCriteria().AuthoredByMe() != null) {
+ if (user.getEmail().equals(commit.getAuthorIdent().getEmailAddress())) {
+ matches = true;
+ break;
+ }
+ } else {
+ String value = unescape(removeParens(criteria.authorCriteria().Value().getText()));
+ if (matches("*" + value + "*", commit.getAuthorIdent())) {
+ matches = true;
+ break;
+ }
+ }
+ }
+ }
+ if (!matches && matchAtLeastOnce)
+ return false;
+
+ matches = matchAtLeastOnce = false;
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.committerCriteria() != null) {
+ matchAtLeastOnce = true;
+ if (criteria.committerCriteria().CommittedByMe() != null) {
+ if (user.getEmail().equals(commit.getCommitterIdent().getEmailAddress())) {
+ matches = true;
+ break;
+ }
+ } else {
+ String value = unescape(removeParens(criteria.committerCriteria().Value().getText()));
+ if (matches("*" + value + "*", commit.getCommitterIdent())) {
+ matches = true;
+ break;
+ }
+ }
+ }
+ }
+ if (!matches && matchAtLeastOnce)
+ return false;
+
+ matches = matchAtLeastOnce = false;
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.messageCriteria() != null) {
+ matchAtLeastOnce = true;
+ String value = unescape(removeParens(criteria.messageCriteria().Value().getText()));
+ if (WildcardUtils.matchString("*" + value + "*", commit.getFullMessage())) {
+ matches = true;
+ break;
+ }
+ }
+ }
+ if (!matches && matchAtLeastOnce)
+ return false;
+
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.beforeCriteria() != null) {
+ String value = unescape(removeParens(criteria.beforeCriteria().Value().getText()));
+ if (!commit.getCommitterIdent().getWhen().before(DateUtils.parseRelaxed(value)))
+ return false;
+ }
+ }
+
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.afterCriteria() != null) {
+ String value = unescape(removeParens(criteria.afterCriteria().Value().getText()));
+ if (!commit.getCommitterIdent().getWhen().after(DateUtils.parseRelaxed(value)))
+ return false;
+ }
+ }
+
+ matches = matchAtLeastOnce = false;
+ Collection<String> changedFiles;
+ if (!event.getOldCommitId().equals(ObjectId.zeroId()))
+ changedFiles = GitUtils.getChangedFiles(project.getRepository(), event.getOldCommitId(), event.getNewCommitId());
+ else if (commit.getParentCount() != 0)
+ changedFiles = GitUtils.getChangedFiles(project.getRepository(), commit.getParent(0), event.getNewCommitId());
+ else
+ changedFiles = new HashSet<>();
+
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.pathCriteria() != null) {
+ matchAtLeastOnce = true;
+ String value = unescape(removeParens(criteria.pathCriteria().Value().getText()));
+ for (String changedFile: changedFiles) {
+ if (WildcardUtils.matchString(value, changedFile)) {
+ matches = true;
+ break;
+ }
+ }
+ if (matches)
+ break;
+ }
+ }
+ if (!matches && matchAtLeastOnce)
+ return false;
+
+ matches = matchAtLeastOnce = false;
+ for (Revision revision: getRevisions(project, query)) {
+ if (!revision.since) {
+ matchAtLeastOnce = true;
+ try {
+ Ref ref = project.getRepository().findRef(revision.value);
+ if (ref != null && ref.getName().equals(event.getRefName())) {
+ matches = true;
+ break;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ if (!matches && matchAtLeastOnce)
+ return false;
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static void fill(Project project, @Nullable QueryContext query, RevListCommand command) {
+ if (query != null && query.ALL() == null) {
+ for (CriteriaContext criteria: query.criteria()) {
+ if (criteria.authorCriteria() != null) {
+ if (criteria.authorCriteria().AuthoredByMe() != null) {
+ if (SecurityUtils.getUser() != null)
+ command.authors().add("<" + SecurityUtils.getUser().getEmail() + ">");
+ else
+ throw new OneException("Please login to perform this query");
+ } else {
+ String value = criteria.authorCriteria().Value().getText();
+ value = StringUtils.replace(unescape(removeParens(value)), "*", ".*");
+ command.authors().add(value);
+ }
+ } else if (criteria.committerCriteria() != null) {
+ if (criteria.committerCriteria().CommittedByMe() != null) {
+ if (SecurityUtils.getUser() != null)
+ command.committers().add("<" + SecurityUtils.getUser().getEmail() + ">");
+ else
+ throw new OneException("Please login to perform this query");
+ } else {
+ String value = criteria.committerCriteria().Value().getText();
+ value = StringUtils.replace(unescape(removeParens(value)), "*", ".*");
+ command.committers().add(value);
+ }
+ } else if (criteria.pathCriteria() != null) {
+ command.paths().add(unescape(removeParens(criteria.pathCriteria().Value().getText())));
+ } else if (criteria.beforeCriteria() != null) {
+ command.before(removeParens(criteria.beforeCriteria().Value().getText()));
+ } else if (criteria.afterCriteria() != null) {
+ command.after(removeParens(criteria.afterCriteria().Value().getText()));
+ }
+ }
+ command.messages(getMessages(query));
+
+ boolean ranged = false;
+ for (Revision revision: getRevisions(project, query)) {
+ if (revision.since) {
+ command.revisions().add("^" + revision.value);
+ ranged = true;
+ } else if (revision.until) {
+ command.revisions().add(revision.value);
+ ranged = true;
+ } else if (project.getBranchRef(revision.value) != null) {
+ ranged = true;
+ command.revisions().add(revision.value);
+ } else {
+ command.revisions().add(revision.value);
+ }
+ }
+ if (command.revisions().size() == 1 && !ranged) {
+ command.count(1);
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/search/commit/Revision.java b/core/src/main/java/io/onedev/server/search/commit/Revision.java
new file mode 100644
index 0000000000..9dd0d7fff7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/commit/Revision.java
@@ -0,0 +1,15 @@
+package io.onedev.server.search.commit;
+
+import java.io.Serializable;
+
+class Revision implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public boolean since;
+
+ public boolean until;
+
+ public String value;
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.java
rename to core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
index 7d0937a6d0..9f0788f879 100644
--- a/core/src/main/java/io/onedev/server/entityquery/AndCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.util.ArrayList;
import java.util.List;
@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {
@@ -19,17 +20,17 @@ public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(project, context));
+ predicates.add(criteria.getPredicate(project, context, user));
return context.getBuilder().and(predicates.toArray(new Predicate[0]));
}
@Override
- public boolean matches(T entity) {
+ public boolean matches(T entity, User user) {
for (EntityCriteria<T> criteria: criterias) {
- if (!criteria.matches(entity))
+ if (!criteria.matches(entity, user))
return false;
}
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/EntityCriteria.java b/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/entityquery/EntityCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
index d884abf91c..7db7cc033d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/EntityCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.io.Serializable;
@@ -6,14 +6,15 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
public abstract class EntityCriteria<T extends AbstractEntity> implements Serializable {
private static final long serialVersionUID = 1L;
- public abstract Predicate getPredicate(Project project, QueryBuildContext<T> context);
+ public abstract Predicate getPredicate(Project project, QueryBuildContext<T> context, User user);
- public abstract boolean matches(T entity);
+ public abstract boolean matches(T entity, User user);
public abstract boolean needsLogin();
diff --git a/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/entityquery/EntityQuery.java
rename to core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 17efae4946..409fa41073 100644
--- a/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.io.IOException;
import java.io.Serializable;
@@ -16,6 +16,7 @@ import com.google.common.base.Splitter;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.util.DateUtils;
import io.onedev.utils.WordUtils;
@@ -71,8 +72,8 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
return getCriteria() != null && getCriteria().needsLogin();
}
- public boolean matches(T entity) {
- return getCriteria() == null || getCriteria().matches(entity);
+ public boolean matches(T entity, User user) {
+ return getCriteria() == null || getCriteria().matches(entity, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/EntitySort.java b/core/src/main/java/io/onedev/server/search/entity/EntitySort.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/entityquery/EntitySort.java
rename to core/src/main/java/io/onedev/server/search/entity/EntitySort.java
index 6de14d4ca0..d1d866a087 100644
--- a/core/src/main/java/io/onedev/server/entityquery/EntitySort.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntitySort.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.java
rename to core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
index e7873d101a..4ddb8aefdb 100644
--- a/core/src/main/java/io/onedev/server/entityquery/NotCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
@@ -1,9 +1,10 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {
@@ -16,13 +17,13 @@ public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context) {
- return criteria.getPredicate(project, context).not();
+ public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
+ return criteria.getPredicate(project, context, user).not();
}
@Override
- public boolean matches(T entity) {
- return !criteria.matches(entity);
+ public boolean matches(T entity, User user) {
+ return !criteria.matches(entity, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.java
rename to core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
index 9cfd9fbe70..f2749c625a 100644
--- a/core/src/main/java/io/onedev/server/entityquery/OrCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.util.ArrayList;
import java.util.List;
@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {
@@ -19,17 +20,17 @@ public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(project, context));
+ predicates.add(criteria.getPredicate(project, context, user));
return context.getBuilder().or(predicates.toArray(new Predicate[0]));
}
@Override
- public boolean matches(T entity) {
+ public boolean matches(T entity, User user) {
for (EntityCriteria<T> criteria: criterias) {
- if (criteria.matches(entity))
+ if (criteria.matches(entity, user))
return true;
}
return false;
diff --git a/core/src/main/java/io/onedev/server/search/entity/ParensAware.java b/core/src/main/java/io/onedev/server/search/entity/ParensAware.java
new file mode 100644
index 0000000000..d68d3a2565
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/entity/ParensAware.java
@@ -0,0 +1,5 @@
+package io.onedev.server.search.entity;
+
+public interface ParensAware {
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java
rename to core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java
index eaa4336c89..9e4c1214c5 100644
--- a/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.util.HashMap;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.java b/core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.java
rename to core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
index 9506a7b358..dee0150bc3 100644
--- a/core/src/main/java/io/onedev/server/entityquery/QueryWatchBuilder.java
+++ b/core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery;
+package io.onedev.server.search.entity;
import java.util.Collection;
import java.util.HashMap;
@@ -22,7 +22,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
for (QuerySetting<?> querySetting: getQuerySettings()) {
boolean watched = false;
for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getUserQueryWatches().entrySet()) {
- if (matches(querySetting.getUserQuery(entry.getKey()))) {
+ if (matches(querySetting.getUserQuery(entry.getKey()), querySetting.getUser())) {
watches.putIfAbsent(querySetting.getUser(), entry.getValue());
watched = true;
break;
@@ -30,7 +30,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
}
if (!watched) {
for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getProjectQueryWatches().entrySet()) {
- if (matches(getSavedProjectQuery(entry.getKey()))) {
+ if (matches(getSavedProjectQuery(entry.getKey()), querySetting.getUser())) {
watches.putIfAbsent(querySetting.getUser(), entry.getValue());
watched = true;
break;
@@ -40,7 +40,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
}
}
- private boolean matches(@Nullable NamedQuery namedQuery) {
+ private boolean matches(@Nullable NamedQuery namedQuery, User user) {
if (namedQuery != null) {
Optional<EntityQuery<T>> entityQuery = parsedQueries.get(namedQuery.getQuery());
if (entityQuery == null) {
@@ -51,7 +51,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
}
parsedQueries.put(namedQuery.getQuery(), entityQuery);
}
- return entityQuery.isPresent() && entityQuery.get().matches(getEntity());
+ return entityQuery.isPresent() && entityQuery.get().matches(getEntity(), user);
} else {
return false;
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
similarity index 100%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 48749308d7..e72ee7eac5 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_COMMIT;
import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_CONTENT;
@@ -22,29 +22,32 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.AndCriteriaHelper;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.NotCriteriaHelper;
-import io.onedev.server.entityquery.OrCriteriaHelper;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.AndCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.CriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.NotCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OperatorCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OperatorValueCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OrCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OrderContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.ParensCriteriaContext;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.QueryContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryBaseVisitor;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;
+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.exception.OneException;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.AndCriteriaHelper;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.NotCriteriaHelper;
+import io.onedev.server.search.entity.OrCriteriaHelper;
+import io.onedev.server.search.entity.EntitySort.Direction;
public class CodeCommentQuery extends EntityQuery<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java
index a69fe8afce..9190286721 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java
@@ -1,12 +1,12 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CodeCommentQueryBuildContext extends QueryBuildContext<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CommitCriteria.java
similarity index 74%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CommitCriteria.java
index 280531a050..44cfa14197 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CommitCriteria.java
@@ -1,15 +1,17 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommitCriteria extends EntityCriteria<CodeComment> {
@@ -22,13 +24,13 @@ public class CommitCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<?> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_COMMIT);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
return comment.getMarkPos().getCommit().equals(value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index e89c3a063b..81bc047fdc 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
public class ContentCriteria extends EntityCriteria<CodeComment> {
@@ -21,13 +22,13 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<String> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CONTENT);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
return comment.getContent().toLowerCase().contains(value.toLowerCase());
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
similarity index 79%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index f314f0c8c6..a57c01b2b1 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -1,15 +1,17 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@@ -28,7 +30,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<Date> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CREATE_DATE);
if (operator == CodeCommentQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +39,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
if (operator == CodeCommentQueryLexer.IsBefore)
return comment.getDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index 3b816331fd..91729b064d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
@@ -1,16 +1,17 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CreatedByCriteria extends EntityCriteria<CodeComment> {
@@ -23,13 +24,13 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<User> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
return Objects.equals(comment.getUser(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
similarity index 63%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 419bf5bbfe..806cbcafb8 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -1,30 +1,30 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<?> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);
- return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ return context.getBuilder().equal(attribute, user);
}
@Override
- public boolean matches(CodeComment comment) {
- return Objects.equals(comment.getUser(), SecurityUtils.getUser());
+ public boolean matches(CodeComment comment, User user) {
+ return Objects.equals(comment.getUser(), user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index e2fadb835e..be317e3b7f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -1,13 +1,15 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.utils.stringmatch.WildcardUtils;
public class PathCriteria extends EntityCriteria<CodeComment> {
@@ -21,7 +23,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<String> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_PATH);
String normalized = value.toLowerCase().replace('*', '%');
if (normalized.endsWith("/"))
@@ -30,7 +32,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
String normalized = value.toLowerCase();
if (normalized.endsWith("/"))
normalized += "*";
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
similarity index 80%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index f04a115346..27300ab404 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
@@ -1,13 +1,15 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
@@ -23,7 +25,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<Integer> attribute = context.getRoot().get(CodeCommentConstants.ATTR_REPLY_COUNT);
if (operator == CodeCommentQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +36,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
if (operator == CodeCommentQueryLexer.Is)
return comment.getReplyCount() == value;
else if (operator == CodeCommentQueryLexer.IsLessThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index 2e0bcf00cd..dbc9c1bd3e 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -1,15 +1,17 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ReplyCriteria extends EntityCriteria<CodeComment> {
@@ -22,14 +24,14 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
From<?, ?> join = context.getJoin(CodeCommentConstants.ATTR_REPLIES);
Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
for (CodeCommentReply reply: comment.getReplies()) {
if (reply.getContent().toLowerCase().contains(value.toLowerCase()))
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
similarity index 79%
rename from core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index 7d70116e68..8f66ff9a6a 100644
--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -1,15 +1,17 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@@ -28,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
Path<Date> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_UPDATE_DATE);
if (operator == CodeCommentQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +39,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public boolean matches(CodeComment comment) {
+ public boolean matches(CodeComment comment, User user) {
if (operator == CodeCommentQueryLexer.IsBefore)
return comment.getLastActivity().getDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
index b1e7fa257d..74fe3fcc8f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.Collection;
@@ -9,11 +9,12 @@ import java.util.Set;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.AndCriteriaHelper;
-import io.onedev.server.entityquery.ParensAware;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.AndCriteriaHelper;
+import io.onedev.server.search.entity.ParensAware;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class AndCriteria extends IssueCriteria implements ParensAware {
@@ -27,13 +28,13 @@ public class AndCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return new AndCriteriaHelper<Issue>(criterias).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return new AndCriteriaHelper<Issue>(criterias).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index 9916738d92..f152677a66 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
@@ -6,11 +6,11 @@ import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
public class BooleanFieldCriteria extends FieldCriteria {
@@ -24,13 +24,13 @@ public class BooleanFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);
return context.getBuilder().equal(attribute, String.valueOf(value));
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
return Objects.equals(value, issue.getFieldValue(getFieldName()));
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index ad28b7174e..f2bbc4a1b7 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.Collection;
@@ -10,10 +10,11 @@ import java.util.Set;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
@@ -38,7 +39,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
From<?, ?> join = context.getJoin(getFieldName());
if (allowMultiple) {
return context.getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_VALUE), value);
@@ -54,7 +55,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {
@SuppressWarnings("unchecked")
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
Object fieldValue = issue.getFieldValue(getFieldName());
if (allowMultiple) {
return ((List<String>)fieldValue).contains(value);
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
index 72b37ef427..3211bb6e2c 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/ClosedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
@@ -1,12 +1,12 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ClosedCriteria extends IssueCriteria {
@@ -17,13 +17,13 @@ public class ClosedCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return getCriteria(project).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return getCriteria(issue.getProject()).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return getCriteria(issue.getProject()).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index 5d45e787a9..c0fec074f9 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommentCountCriteria extends IssueCriteria {
@@ -23,7 +23,7 @@ public class CommentCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_COMMENT_COUNT);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +34,7 @@ public class CommentCountCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.Is)
return issue.getCommentCount() == value;
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index bb9fc34cfd..8c49242929 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommentCriteria extends IssueCriteria {
@@ -21,14 +22,14 @@ public class CommentCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
From<?, ?> join = context.getJoin(IssueConstants.FIELD_COMMENT);
Path<String> attribute = join.get(IssueComment.PATH_CONTENT);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
for (IssueComment comment: issue.getComments()) {
if (comment.getContent().toLowerCase().contains(value.toLowerCase()))
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index 58ebc41543..6ea19c453c 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Date;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DateFieldCriteria extends FieldCriteria {
@@ -28,7 +29,7 @@ public class DateFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
From<?, ?> join = context.getJoin(getFieldName());
if (operator == IssueQueryLexer.IsBefore)
return context.getBuilder().lessThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), value.getTime());
@@ -37,7 +38,7 @@ public class DateFieldCriteria extends FieldCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
Date fieldValue = (Date) issue.getFieldValue(getFieldName());
if (operator == IssueQueryLexer.IsBefore)
return fieldValue != null && fieldValue.before(value);
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index dc9165e5ee..b08b7672ab 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -1,14 +1,14 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.annotation.Nullable;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DescriptionCriteria extends IssueCriteria {
@@ -21,7 +21,7 @@ public class DescriptionCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Expression<String> attribute = context.getRoot().get(IssueConstants.ATTR_DESCRIPTION);
if (value != null)
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
@@ -30,7 +30,7 @@ public class DescriptionCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (value != null)
return issue.getDescription() != null && issue.getDescription().toLowerCase().contains(value.toLowerCase());
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index af2c5bfac3..4635450b13 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Collection;
import java.util.HashSet;
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
similarity index 79%
rename from core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index 8dfcf5dd34..4db0deb34b 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
@@ -6,11 +6,11 @@ import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.security.SecurityUtils;
public class FieldOperatorCriteria extends FieldCriteria {
@@ -25,21 +25,21 @@ public class FieldOperatorCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);
if (operator == IssueQueryLexer.IsEmpty)
return context.getBuilder().isNull(attribute);
else
- return context.getBuilder().equal(attribute, SecurityUtils.getUser().getName());
+ return context.getBuilder().equal(attribute, user.getName());
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
Object fieldValue = issue.getFieldValue(getFieldName());
if (operator == IssueQueryLexer.IsEmpty)
return fieldValue == null;
else
- return Objects.equals(fieldValue, SecurityUtils.getUser().getName());
+ return Objects.equals(fieldValue, user.getName());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
index 9747ee2cc5..551c87ed06 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Collection;
import java.util.HashSet;
@@ -8,17 +8,18 @@ import java.util.Set;
import javax.annotation.Nullable;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityCriteria;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public abstract class IssueCriteria extends EntityCriteria<Issue> {
private static final long serialVersionUID = 1L;
- public abstract Predicate getPredicate(Project project, QueryBuildContext<Issue> context);
+ public abstract Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user);
public final void fill(Issue issue) {
fill(issue, new HashSet<>());
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
similarity index 100%
rename from core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4
rename to core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
similarity index 93%
rename from core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 9c25d8d275..4b2ddb26d6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT;
import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT_COUNT;
@@ -30,26 +30,26 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.issue.IssueQueryParser.AndCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.CriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.FieldOperatorCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.NotCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.OperatorCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.OperatorValueCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.OrCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.OrderContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.ParensCriteriaContext;
-import io.onedev.server.entityquery.issue.IssueQueryParser.QueryContext;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
+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.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.util.EditContext;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.BuildChoiceInput;
@@ -413,12 +413,14 @@ public class IssueQuery extends EntityQuery<Issue> {
}
}
+ @Override
public boolean needsLogin() {
return criteria != null && criteria.needsLogin();
}
- public boolean matches(Issue issue) {
- return criteria == null || criteria.matches(issue);
+ @Override
+ public boolean matches(Issue issue, User user) {
+ return criteria == null || criteria.matches(issue, user);
}
public static String getRuleName(int rule) {
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
index be44656a01..acd0f35aed 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.model.IssueFieldUnary;
public class IssueQueryBuildContext extends QueryBuildContext<Issue> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index ee3d70eadb..4f2c04a944 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Set;
@@ -6,12 +6,12 @@ import javax.annotation.Nullable;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class MilestoneCriteria extends IssueCriteria {
@@ -28,7 +28,7 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<?> attribute = context.getJoin(IssueConstants.FIELD_MILESTONE).get(Milestone.FIELD_ATTR_NAME);
if (value != null)
return context.getBuilder().equal(attribute, value);
@@ -37,7 +37,7 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
similarity index 68%
rename from core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
index a7d907e3fe..26466244d0 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/MineCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
@@ -1,15 +1,14 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
@@ -17,8 +16,8 @@ public class MineCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
- private IssueCriteria getCriteria(Project project) {
- IssueCriteria submitterCriteria = new SubmittedByCriteria(SecurityUtils.getUser());
+ private IssueCriteria getCriteria(Project project, User user) {
+ IssueCriteria submitterCriteria = new SubmittedByCriteria(user);
List<IssueCriteria> fieldCriterias = new ArrayList<>();
for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {
if (field instanceof UserChoiceInput) {
@@ -35,13 +34,13 @@ public class MineCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return getCriteria(project, user).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return getCriteria(issue.getProject()).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return getCriteria(issue.getProject(), user).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
index 0a6bf2ae3d..0afca9b91f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
@@ -1,11 +1,12 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.NotCriteriaHelper;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.NotCriteriaHelper;
+import io.onedev.server.search.entity.QueryBuildContext;
public class NotCriteria extends IssueCriteria {
@@ -18,13 +19,13 @@ public class NotCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return new NotCriteriaHelper<Issue>(criteria).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return new NotCriteriaHelper<Issue>(criteria).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
index f9d6cbadc6..72b1b686c7 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class NumberCriteria extends IssueCriteria {
@@ -23,7 +23,7 @@ public class NumberCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +34,7 @@ public class NumberCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.Is)
return issue.getNumber() == value;
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
index ea4b782270..0877c9d646 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
@@ -6,11 +6,11 @@ import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
public class NumberFieldCriteria extends FieldCriteria {
@@ -27,7 +27,7 @@ public class NumberFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -38,7 +38,7 @@ public class NumberFieldCriteria extends FieldCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
Integer fieldValue = (Integer) issue.getFieldValue(getFieldName());
if (operator == IssueQueryLexer.Is)
return Objects.equals(fieldValue, value);
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
index 13bb13686e..023d35e4bd 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.Collection;
@@ -9,11 +9,12 @@ import java.util.Set;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.OrCriteriaHelper;
-import io.onedev.server.entityquery.ParensAware;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.OrCriteriaHelper;
+import io.onedev.server.search.entity.ParensAware;
+import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class OrCriteria extends IssueCriteria implements ParensAware {
@@ -27,13 +28,13 @@ public class OrCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return new OrCriteriaHelper<Issue>(criterias).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return new OrCriteriaHelper<Issue>(criterias).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
index 9e2994fe5e..24c9833df6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/OutstandingCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
@@ -1,12 +1,12 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.search.entity.QueryBuildContext;
public class OutstandingCriteria extends IssueCriteria {
@@ -17,13 +17,13 @@ public class OutstandingCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ return getCriteria(project).getPredicate(project, context, user);
}
@Override
- public boolean matches(Issue issue) {
- return getCriteria(issue.getProject()).matches(issue);
+ public boolean matches(Issue issue, User user) {
+ return getCriteria(issue.getProject()).matches(issue, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/ReferenceableFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/issue/ReferenceableFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
index 5586d13904..2f4dfadbb3 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/ReferenceableFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ReferenceableFieldCriteria extends FieldCriteria {
@@ -23,13 +23,13 @@ public class ReferenceableFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
Object fieldValue = issue.getFieldValue(getFieldName());
return Objects.equals(fieldValue, value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 9ba39c7206..de2db0bd0f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.Collection;
@@ -8,11 +8,11 @@ import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class StateCriteria extends IssueCriteria {
@@ -25,13 +25,13 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<?> attribute = context.getRoot().get(IssueConstants.ATTR_STATE);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
return issue.getState().equals(value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index 7139c59002..3ae9b5a318 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.QueryBuildContext;
public class StringFieldCriteria extends FieldCriteria {
@@ -29,7 +30,7 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());
@@ -38,7 +39,7 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
String fieldValue = (String) issue.getFieldValue(getFieldName());
if (operator == IssueQueryLexer.Is)
return value.equalsIgnoreCase(fieldValue);
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index eebfb5051c..13928d75c4 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmitDateCriteria extends IssueCriteria {
@@ -28,7 +28,7 @@ public class SubmitDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Date> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMIT_DATE);
if (operator == IssueQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +37,7 @@ public class SubmitDateCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.IsBefore)
return issue.getSubmitDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index 647fbda625..886f4866f8 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -1,16 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmittedByCriteria extends IssueCriteria {
@@ -23,13 +22,13 @@ public class SubmittedByCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
return Objects.equals(issue.getSubmitter(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index a28abe1495..8edcb4d9ea 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -1,31 +1,29 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmittedByMeCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ return context.getBuilder().equal(attribute, user);
}
@Override
- public boolean matches(Issue issue) {
- return Objects.equals(issue.getSubmitter(), SecurityUtils.getUser());
+ public boolean matches(Issue issue, User user) {
+ return Objects.equals(issue.getSubmitter(), user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index ba29934998..3b9bd1752f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class TitleCriteria extends IssueCriteria {
@@ -20,13 +20,13 @@ public class TitleCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<String> attribute = context.getRoot().get(IssueConstants.ATTR_TITLE);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
return issue.getTitle().toLowerCase().contains(value.toLowerCase());
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index da7e24430b..7cf7585472 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class UpdateDateCriteria extends IssueCriteria {
@@ -28,7 +28,7 @@ public class UpdateDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Date> attribute = IssueQuery.getPath(context.getRoot(), IssueConstants.ATTR_UPDATE_DATE);
if (operator == IssueQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +37,7 @@ public class UpdateDateCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.IsBefore)
return issue.getLastActivity().getDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index da857a7b4f..5d399e9fea 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class VoteCountCriteria extends IssueCriteria {
@@ -23,7 +23,7 @@ public class VoteCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_VOTE_COUNT);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +34,7 @@ public class VoteCountCriteria extends IssueCriteria {
}
@Override
- public boolean matches(Issue issue) {
+ public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.Is)
return issue.getVoteCount() == value;
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
similarity index 69%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
index aece8eab4f..3009f0840c 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.List;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.AndCriteriaHelper;
-import io.onedev.server.entityquery.ParensAware;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.AndCriteriaHelper;
+import io.onedev.server.search.entity.ParensAware;
+import io.onedev.server.search.entity.QueryBuildContext;
public class AndCriteria extends PullRequestCriteria implements ParensAware {
@@ -21,13 +22,13 @@ public class AndCriteria extends PullRequestCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return new AndCriteriaHelper<PullRequest>(criterias).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return new AndCriteriaHelper<PullRequest>(criterias).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
similarity index 63%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index 4a76ef6ff4..85d76fc790 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -1,16 +1,16 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ApprovedByCriteria extends PullRequestCriteria {
@@ -23,19 +23,19 @@ public class ApprovedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, value),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().equal(approved, true));
+ context.getBuilder().equal(userPath, value),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().equal(approvedPath, true));
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
PullRequestReview review = request.getReview(value);
return review != null && review.getExcludeDate() == null && review.getResult() != null
&& review.getResult().isApproved();
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
similarity index 55%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index f55f734ca4..405570356d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -1,36 +1,36 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ApprovedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, SecurityUtils.getUser()),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().equal(approved, true));
+ context.getBuilder().equal(userPath, user),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().equal(approvedPath, true));
}
@Override
- public boolean matches(PullRequest request) {
- PullRequestReview review = request.getReview(SecurityUtils.getUser());
+ public boolean matches(PullRequest request, User user) {
+ PullRequestReview review = request.getReview(user);
return review != null && review.getExcludeDate() == null && review.getResult() != null && review.getResult().isApproved();
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 296270d5b3..c29411315f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CloseDateCriteria extends PullRequestCriteria {
@@ -28,7 +28,7 @@ public class CloseDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +37,7 @@ public class CloseDateCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.IsBefore)
return request.getLastActivity().getDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index 3e3f5ff2dd..33c9420d37 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommentCountCriteria extends PullRequestCriteria {
@@ -23,7 +23,7 @@ public class CommentCountCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_COMMENT_COUNT);
if (operator == PullRequestQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +34,7 @@ public class CommentCountCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.Is)
return request.getCommentCount() == value;
else if (operator == PullRequestQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
similarity index 91%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index e022df5ca2..2f6687f05e 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -1,17 +1,18 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommentCriteria extends PullRequestCriteria {
@@ -24,7 +25,7 @@ public class CommentCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_COMMENTS);
Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);
Predicate commentPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
@@ -44,7 +45,7 @@ public class CommentCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
for (PullRequestComment comment: request.getComments()) {
if (comment.getContent().toLowerCase().contains(value.toLowerCase()))
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java
index 69d82bc287..90ffaa8fb6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Collection;
import java.util.HashSet;
@@ -9,12 +9,13 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.manager.CodeCommentRelationInfoManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class CommitCriteria extends PullRequestCriteria {
@@ -27,7 +28,7 @@ public class CommitCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Collection<Long> ids = new HashSet<>();
for (String uuid: getUUIDs(project, commitId)) {
PullRequest request = OneDev.getInstance(PullRequestManager.class).find(uuid);
@@ -45,7 +46,7 @@ public class CommitCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return getUUIDs(request.getTargetProject(), commitId).contains(request.getUUID());
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index 70d5a868e8..9efb8f2ba8 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DescriptionCriteria extends PullRequestCriteria {
@@ -20,13 +20,13 @@ public class DescriptionCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_DESCRIPTION);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return request.getDescription()!=null && request.getDescription().toLowerCase().contains(value.toLowerCase());
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
index d48a338fd0..14963d35d6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DiscardedByCriteria extends PullRequestCriteria {
@@ -22,13 +22,13 @@ public class DiscardedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User usert) {
return Objects.equals(request.getSubmitter(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
similarity index 68%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
index 1f11cdd855..a7799abcc5 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
@@ -1,30 +1,29 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DiscardedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);
- return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ return context.getBuilder().equal(attribute, user);
}
@Override
- public boolean matches(PullRequest request) {
- return Objects.equals(request.getSubmitter(), SecurityUtils.getUser());
+ public boolean matches(PullRequest request, User user) {
+ return Objects.equals(request.getSubmitter(), user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index 5909cb80b8..13bed37fd9 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
@@ -1,12 +1,12 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class DiscardedCriteria extends PullRequestCriteria {
@@ -17,13 +17,13 @@ public class DiscardedCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return getCriteria(project).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return getCriteria(request.getTargetProject()).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return getCriteria(request.getTargetProject()).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
index 87d0a06281..d8d7c4ea37 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
@@ -1,22 +1,23 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestBuild;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class HasFailedBuildsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);
Path<?> status = join.get(Build.STATUS);
@@ -26,7 +27,7 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
for (PullRequestBuild build: request.getBuilds()) {
if (build.getBuild() != null &&
(build.getBuild().getStatus() == Build.Status.ERROR || build.getBuild().getStatus() == Build.Status.FAILURE)) {
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index a1b72d9465..900546948a 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
@@ -1,20 +1,21 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class HasMergeConflictsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<?> requestHead = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);
Path<?> merged = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);
return context.getBuilder().and(
@@ -23,7 +24,7 @@ public class HasMergeConflictsCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
MergePreview preview = request.getLastMergePreview();
return preview != null && preview.getMerged() == null;
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
index 8ed707360c..3e8801840c 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
@@ -1,22 +1,23 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestBuild;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class HasPendingBuildsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);
Path<?> status = join.get(Build.STATUS);
@@ -26,7 +27,7 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
for (PullRequestBuild build: request.getBuilds()) {
if (build.getBuild() == null || build.getBuild().getStatus() == Build.Status.RUNNING)
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
similarity index 58%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index 65fe73ca76..a3ccc6eb75 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -1,34 +1,35 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class HasPendingReviewsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().isNotNull(user),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().isNull(approved));
+ context.getBuilder().isNotNull(userPath),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().isNull(approvedPath));
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
for (PullRequestReview review: request.getReviews()) {
if (review.getExcludeDate() == null && review.getResult() == null)
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index 07e2df7d11..6882707bd8 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
@@ -1,14 +1,14 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class MergeStrategyCriteria extends PullRequestCriteria {
@@ -21,13 +21,13 @@ public class MergeStrategyCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_MERGE_STRATEGY);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return request.getMergeStrategy() == value;
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index b07de79342..43df1408d6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
@@ -1,12 +1,12 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class MergedCriteria extends PullRequestCriteria {
@@ -17,13 +17,13 @@ public class MergedCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return getCriteria(project).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return getCriteria(request.getTargetProject()).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return getCriteria(request.getTargetProject()).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
index cf4765c99c..fcc6534b7f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
@@ -1,11 +1,12 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.NotCriteriaHelper;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.NotCriteriaHelper;
+import io.onedev.server.search.entity.QueryBuildContext;
public class NotCriteria extends PullRequestCriteria {
@@ -18,13 +19,13 @@ public class NotCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return new NotCriteriaHelper<PullRequest>(criteria).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return new NotCriteriaHelper<PullRequest>(criteria).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
index 87813aca09..074d220246 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class NumberCriteria extends PullRequestCriteria {
@@ -23,7 +23,7 @@ public class NumberCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_NUMBER);
if (operator == PullRequestQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
@@ -34,7 +34,7 @@ public class NumberCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.Is)
return request.getNumber() == value;
else if (operator == PullRequestQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index ed5d0964ab..d7fce545da 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -1,11 +1,12 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class OpenCriteria extends PullRequestCriteria {
@@ -16,13 +17,13 @@ public class OpenCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return getCriteria(project).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return getCriteria(project).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return getCriteria(request.getTargetProject()).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return getCriteria(request.getTargetProject()).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
similarity index 69%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
index ccc96ef465..c377efaa58 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.List;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.OrCriteriaHelper;
-import io.onedev.server.entityquery.ParensAware;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.OrCriteriaHelper;
+import io.onedev.server.search.entity.ParensAware;
+import io.onedev.server.search.entity.QueryBuildContext;
public class OrCriteria extends PullRequestCriteria implements ParensAware {
@@ -21,13 +22,13 @@ public class OrCriteria extends PullRequestCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, context);
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, context, user);
}
@Override
- public boolean matches(PullRequest request) {
- return new OrCriteriaHelper<PullRequest>(criterias).matches(request);
+ public boolean matches(PullRequest request, User user) {
+ return new OrCriteriaHelper<PullRequest>(criterias).matches(request, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.java
similarity index 63%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.java
index a035fdda5d..6cf9be74bf 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.java
@@ -1,7 +1,7 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
-import io.onedev.server.entityquery.EntityCriteria;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.entity.EntityCriteria;
public abstract class PullRequestCriteria extends EntityCriteria<PullRequest> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
similarity index 100%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index e5306dab06..e51e8515f4 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.ArrayList;
import java.util.Date;
@@ -14,19 +14,19 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.EntitySort;
-import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.AndCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.CriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.NotCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OperatorCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OperatorValueCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrderContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.ParensCriteriaContext;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.QueryContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryBaseVisitor;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrderContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.QueryContext;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.UserManager;
@@ -35,6 +35,9 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.EntitySort.Direction;
public class PullRequestQuery extends EntityQuery<PullRequest> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java
index 21a91ee4e9..e03e2f0d5d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Root;
import com.google.common.base.Splitter;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.entity.QueryBuildContext;
public class PullRequestQueryBuildContext extends QueryBuildContext<PullRequest> {
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
index 36c9a8aaed..465a1618d1 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
@@ -1,16 +1,16 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class RequestForChangesByCriteria extends PullRequestCriteria {
@@ -23,19 +23,19 @@ public class RequestForChangesByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, value),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().equal(approved, false));
+ context.getBuilder().equal(userPath, value),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().equal(approvedPath, false));
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
PullRequestReview review = request.getReview(value);
return review != null && review.getExcludeDate() == null && review.getResult() != null
&& !review.getResult().isApproved();
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
similarity index 56%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
index 0d1a66ec30..7e63b842a3 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
@@ -1,36 +1,36 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class RequestForChangesByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, SecurityUtils.getUser()),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().equal(approved, false));
+ context.getBuilder().equal(userPath, user),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().equal(approvedPath, false));
}
@Override
- public boolean matches(PullRequest request) {
- PullRequestReview review = request.getReview(SecurityUtils.getUser());
+ public boolean matches(PullRequest request, User user) {
+ PullRequestReview review = request.getReview(user);
return review != null && review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved();
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
similarity index 60%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index 45d549d4ee..b7158267e6 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -1,34 +1,35 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().isNotNull(user),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().equal(approved, false));
+ context.getBuilder().isNotNull(userPath),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().equal(approvedPath, false));
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
for (PullRequestReview review: request.getReviews()) {
if (review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved())
return true;
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index 264cb9c2ca..aed67cf58d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -1,16 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SourceBranchCriteria extends PullRequestCriteria {
@@ -23,13 +22,13 @@ public class SourceBranchCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_BRANCH);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return Objects.equals(request.getSourceBranch(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index c268a0a24d..ed56d50c29 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -1,16 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SourceProjectCriteria extends PullRequestCriteria {
@@ -23,13 +22,13 @@ public class SourceProjectCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_PROJECT);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return Objects.equals(request.getSourceProject(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StateCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/StateCriteria.java
index 3e544aefe1..05524dfa8a 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StateCriteria.java
@@ -1,13 +1,14 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class StateCriteria extends PullRequestCriteria {
@@ -20,7 +21,7 @@ public class StateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<?> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_STATUS);
if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))
return context.getBuilder().isNull(attribute);
@@ -29,7 +30,7 @@ public class StateCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))
return request.getCloseInfo() == null;
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index c8ce88f370..199db0b81f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -1,14 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmitDateCriteria extends PullRequestCriteria {
@@ -27,7 +28,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<Date> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMIT_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -36,7 +37,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.IsBefore)
return request.getSubmitDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
similarity index 80%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 40ae9e0ac2..70e1713cc3 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -1,16 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmittedByCriteria extends PullRequestCriteria {
@@ -23,13 +22,13 @@ public class SubmittedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return Objects.equals(request.getSubmitter(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
similarity index 62%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index d25440ca2f..96f127e5ec 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -1,30 +1,29 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.QueryBuildContext;
public class SubmittedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ return context.getBuilder().equal(attribute, user);
}
@Override
- public boolean matches(PullRequest request) {
- return Objects.equals(request.getSubmitter(), SecurityUtils.getUser());
+ public boolean matches(PullRequest request, User user) {
+ return Objects.equals(request.getSubmitter(), user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index f90a50fd27..bfef12a9be 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -1,16 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class TargetBranchCriteria extends PullRequestCriteria {
@@ -23,13 +22,13 @@ public class TargetBranchCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_TARGET_BRANCH);
return context.getBuilder().equal(attribute, value);
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return Objects.equals(request.getTargetBranch(), value);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 2c22fa64b6..8c7772164d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -1,13 +1,13 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class TitleCriteria extends PullRequestCriteria {
@@ -20,13 +20,13 @@ public class TitleCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_TITLE);
return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
return request.getTitle().toLowerCase().contains(value.toLowerCase());
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
similarity index 63%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index 1339c7c12f..134eb50673 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
@@ -1,16 +1,16 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ToBeReviewedByCriteria extends PullRequestCriteria {
@@ -23,19 +23,19 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, value),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().isNull(approved));
+ context.getBuilder().equal(userPath, value),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().isNull(approvedPath));
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
PullRequestReview review = request.getReview(value);
return review != null && review.getExcludeDate() == null && review.getResult() == null;
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
similarity index 55%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index b7e50b73fc..c1973cea8a 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -1,36 +1,36 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.QueryBuildContext;
public class ToBeReviewedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
- Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
return context.getBuilder().and(
- context.getBuilder().equal(user, SecurityUtils.getUser()),
- context.getBuilder().isNull(excludeDate),
- context.getBuilder().isNull(approved));
+ context.getBuilder().equal(userPath, user),
+ context.getBuilder().isNull(excludeDatePath),
+ context.getBuilder().isNull(approvedPath));
}
@Override
- public boolean matches(PullRequest request) {
- PullRequestReview review = request.getReview(SecurityUtils.getUser());
+ public boolean matches(PullRequest request, User user) {
+ PullRequestReview review = request.getReview(user);
return review != null && review.getExcludeDate() == null && review.getResult() == null;
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java
rename to core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index 4bdae84c9c..6f43ee3d46 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -1,15 +1,15 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.QueryBuildContext;
public class UpdateDateCriteria extends PullRequestCriteria {
@@ -28,7 +28,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_UPDATE_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
return context.getBuilder().lessThan(attribute, value);
@@ -37,7 +37,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {
}
@Override
- public boolean matches(PullRequest request) {
+ public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.IsBefore)
return request.getLastActivity().getDate().before(value);
else
diff --git a/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
index 512f4976fd..ce4ce11508 100644
--- a/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
@@ -21,7 +21,7 @@ public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommen
} else {
Project project = OneContext.get().getProject();
try {
- io.onedev.server.entityquery.codecomment.CodeCommentQuery.parse(project, value, true);
+ io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value, true);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java
new file mode 100644
index 0000000000..85722e85ce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java
@@ -0,0 +1,38 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.search.commit.CommitQueryUtils;
+import io.onedev.server.web.editable.annotation.CommitQuery;
+import io.onedev.utils.StringUtils;
+
+public class CommitQueryValidator implements ConstraintValidator<CommitQuery, String> {
+
+ @Override
+ public void initialize(CommitQuery constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ CommitQueryUtils.parse(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message;
+ if (StringUtils.isNotBlank(e.getMessage()))
+ message = e.getMessage();
+ else
+ message = "Malformed commit query";
+
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
index 425281b948..0dd0c30881 100644
--- a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
@@ -21,7 +21,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri
} else {
Project project = OneContext.get().getProject();
try {
- io.onedev.server.entityquery.issue.IssueQuery.parse(project, value, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, value, true);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
index d56255b916..7533e5093e 100644
--- a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
@@ -21,7 +21,7 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullReques
} else {
Project project = OneContext.get().getProject();
try {
- io.onedev.server.entityquery.pullrequest.PullRequestQuery.parse(project, value, true);
+ io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value, true);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index 9469a54913..776dc5d7a2 100644
--- a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -7,6 +7,7 @@ import javax.inject.Singleton;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Splitter;
@@ -110,4 +111,9 @@ public class DefaultUrlManager implements UrlManager {
return urlFor(change.getIssue()) + "#" + change.getAnchor();
}
+ @Override
+ public String urlFor(Project project, ObjectId commitId) {
+ return urlFor(project) + "/commits/" + commitId.name();
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 11574a727c..dae480a6e1 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -18,13 +18,13 @@ import io.onedev.codeassist.parser.Element;
import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
-import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.codecomment.CodeCommentConstants;
+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index a57ebb2817..48d11e3857 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -31,8 +31,6 @@ import io.onedev.codeassist.parser.Element;
import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
-import io.onedev.server.entityquery.issue.IssueQueryParser;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.GroupManager;
@@ -45,6 +43,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryParser;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EditContext;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 8468908bb7..397c31e188 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -19,8 +19,6 @@ import io.onedev.codeassist.parser.Element;
import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;
import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -30,6 +28,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.utils.Range;
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index 3c6c24ddf3..8ba429945e 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -10,7 +10,7 @@
</div>
</form>
<div class="others clearfix">
- <a wicket:id="saveQuery" class="pull-left"><i class="fa fa-save"></i> Save Query</a>
+ <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>
<div wicket:id="pageInfo" class="page-info pull-right"></div>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 317f340b44..b3ea24f1ba 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -38,11 +38,11 @@ import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
@@ -170,15 +170,15 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {
@Override
public Iterator<? extends CodeComment> iterator(long first, long count) {
- return getCodeCommentManager().query(getProject(), getPullRequest(), parsedQueryModel.getObject(),
- (int)first, (int)count).iterator();
+ return getCodeCommentManager().query(getProject(), getPullRequest(), SecurityUtils.getUser(),
+ parsedQueryModel.getObject(), (int)first, (int)count).iterator();
}
@Override
public long size() {
CodeCommentQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
- return getCodeCommentManager().count(getProject(), getPullRequest(), parsedQuery.getCriteria());
+ return getCodeCommentManager().count(getProject(), getPullRequest(), SecurityUtils.getUser(), parsedQuery.getCriteria());
else
return 0;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
index 3a5d0d6cb7..021b59dad4 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
@@ -1,16 +1,6 @@
.code-comments>.head>* {
margin-bottom: 20px;
}
-.code-comments>.head>.others>* {
- margin-right: 16px;
- color: #666;
-}
-.code-comments>.head>.others a[disabled] {
- text-decoration: none;
- color: #999;
- cursor: default;
-}
-
.code-comments .new-indicator {
width: 4px;
padding: 0;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index 1910c43520..526cb639a8 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -42,7 +42,6 @@ import io.onedev.jsyntax.TextToken;
import io.onedev.jsyntax.TokenUtils;
import io.onedev.jsyntax.Tokenized;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.hit.QueryHit;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.BlameCommit;
import io.onedev.server.git.BlobChange;
@@ -55,6 +54,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.diff.DiffBlock;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index f7e6eca448..a9b0774890 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -63,7 +63,6 @@ import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
import io.onedev.jsymbol.util.NoAntiCacheImage;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.IndexManager;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobChange;
import io.onedev.server.git.BlobIdent;
@@ -76,6 +75,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.ProjectAndRevision;
+import io.onedev.server.search.code.IndexManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java
index 66a88ad4b2..6a66894b23 100644
--- a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java
@@ -13,8 +13,9 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.protocol.http.WebSession;
-import io.onedev.server.entityquery.EntityQuery;
import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.utils.ReflectionUtils;
import io.onedev.utils.WordUtils;
@@ -63,7 +64,7 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
int offset = getPosition().getOffset() - 1;
List<T> entities = query(query, offset, 1);
if (!entities.isEmpty()) {
- if (!query.matches(getEntity()))
+ if (!query.matches(getEntity(), SecurityUtils.getUser()))
count--;
QueryPosition prevPosition = new QueryPosition(getPosition().getQuery(), count, offset);
navTo(entities.get(0), prevPosition);
@@ -94,7 +95,7 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
EntityQuery<T> query = parse(getPosition().getQuery());
int offset = getPosition().getOffset();
int count = getPosition().getCount();
- if (query.matches(getEntity()))
+ if (query.matches(getEntity(), SecurityUtils.getUser()))
offset++;
else
count--;
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java
index 39c93815f1..21f1de09e6 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java
@@ -30,12 +30,12 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.manager.IssueActionManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html
index 0ae0ba6c70..8a279fc80a 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html
@@ -11,7 +11,7 @@
</form>
<a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a>
<div class="others clearfix">
- <a wicket:id="saveQuery" class="pull-left"><i class="fa fa-save"></i> Save Query</a>
+ <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>
<a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a>
<a wicket:id="batchEditAll" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit All</a>
<a wicket:id="displayFields" class="display-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a>
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
index c58d06b2f1..b0766451a2 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
@@ -40,13 +40,13 @@ import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueField;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
@@ -386,14 +386,14 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Override
public Iterator<? extends Issue> iterator(long first, long count) {
- return getIssueManager().query(getProject(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();
+ return getIssueManager().query(getProject(), SecurityUtils.getUser(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();
}
@Override
public long size() {
IssueQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
- return getIssueManager().count(getProject(), parsedQuery.getCriteria());
+ return getIssueManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());
else
return 0;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css
index 4f3725a775..e4a1a2a856 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css
@@ -16,11 +16,6 @@
margin-right: 16px;
color: #666;
}
-.issue-list>.head>.others a[disabled] {
- text-decoration: none;
- color: #999;
- cursor: default;
-}
.issue-list>.body td.submitter,
.issue-list>.body th.custom-field,
.issue-list>.body td.custom-field {
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java
index 52d48466c8..bdc460bb07 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java
@@ -5,9 +5,9 @@ import java.util.List;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java
new file mode 100644
index 0000000000..f4e22c0aca
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java
@@ -0,0 +1,45 @@
+package io.onedev.server.web.component.link;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.search.commit.CommitQueryUtils;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
+
+public class FirstCommitQueryLink extends ViewStateAwarePageLink<Void> {
+
+ private static final long serialVersionUID = 1L;
+
+ public FirstCommitQueryLink(String id, Project project) {
+ super(id, ProjectCommitsPage.class, getPageParameters(project));
+ }
+
+ private static PageParameters getPageParameters(Project project) {
+ String query = null;
+ List<String> queries = new ArrayList<>();
+ if (project.getCommitQuerySettingOfCurrentUser() != null) {
+ for (NamedCommitQuery namedQuery: project.getCommitQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCommitQuery namedQuery: project.getSavedCommitQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CommitQueryUtils.needsLogin(each)) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ ProjectCommitsPage.State state = new ProjectCommitsPage.State();
+ state.query = query;
+ return ProjectCommitsPage.paramsOf(project, state);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
index f85a5155ec..fbed3792d8 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
@@ -5,9 +5,9 @@ import java.util.List;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java
index 44f503b8ca..69a21a6cbd 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java
@@ -5,9 +5,9 @@ import java.util.List;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java
index 84ad773aa2..f4a7279149 100644
--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java
@@ -18,9 +18,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import io.onedev.server.entityquery.issue.IssueCriteria;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputContext;
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java
new file mode 100644
index 0000000000..d46224dd2b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java
@@ -0,0 +1,65 @@
+package io.onedev.server.web.component.subscriptionstatus;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+
+@SuppressWarnings("serial")
+public abstract class SubscriptionStatusLink extends DropdownLink {
+
+ public SubscriptionStatusLink(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (getSubscriptionStatus())
+ return "subscribed";
+ else
+ return "not-subscribed";
+ }
+
+ }));
+
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new SubscriptionStatusPanel(id) {
+
+ @Override
+ protected boolean getSubscriptionStatus() {
+ return SubscriptionStatusLink.this.getSubscriptionStatus();
+ }
+
+ @Override
+ protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {
+ SubscriptionStatusLink.this.onSubscriptionStatusChange(target, subscriptionStatus);
+ dropdown.close();
+ }
+
+ };
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new SubscriptionStatusResourceReference()));
+ }
+
+ protected abstract boolean getSubscriptionStatus();
+
+ protected abstract void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.html
new file mode 100644
index 0000000000..90db14eeeb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="subscription-status">
+ <a wicket:id="doNotSubscribe">
+ <div class="title">Not subscribed</div>
+ <div class="description">Will not be notified of new entries</div>
+ </a>
+ <a wicket:id="subscribe">
+ <div class="title">Subscribed</div>
+ <div class="description">Will be notified of new entries</div>
+ </a>
+ </div>
+</wicket:panel>
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.java
new file mode 100644
index 0000000000..4fcc6459ec
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusPanel.java
@@ -0,0 +1,63 @@
+package io.onedev.server.web.component.subscriptionstatus;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+abstract class SubscriptionStatusPanel extends Panel {
+
+ public SubscriptionStatusPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("subscribe") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSubscriptionStatusChange(target, true);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (getSubscriptionStatus())
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ });
+ add(new AjaxLink<Void>("doNotSubscribe") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSubscriptionStatusChange(target, false);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (!getSubscriptionStatus())
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new SubscriptionStatusResourceReference()));
+ }
+
+ protected abstract boolean getSubscriptionStatus();
+
+ protected abstract void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus);
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusResourceReference.java b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusResourceReference.java
new file mode 100644
index 0000000000..49aa47b474
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.subscriptionstatus;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class SubscriptionStatusResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SubscriptionStatusResourceReference() {
+ super(SubscriptionStatusResourceReference.class, "subscription-status.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css
new file mode 100644
index 0000000000..24074f3ee3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css
@@ -0,0 +1,39 @@
+.subscription-status:BEFORE {
+ font-family: "Glyphicons Halflings";
+ font-size: 14px;
+}
+.subscription-status.subscribed:BEFORE {
+ content: "\e038";
+}
+.subscription-status.not-subscribed:BEFORE {
+ content: "\e036";
+}
+
+.floating .subscription-status {
+ padding: 16px 0;
+}
+.floating .subscription-status a {
+ display: block;
+ color: #333;
+ padding: 8px 8px 8px 28px;
+ text-decoration: none;
+ position: relative;
+}
+.floating .subscription-status a.active:before {
+ font-family: "FontAwesome";
+ content: "\f00c";
+ position: absolute;
+ left: 8px;
+}
+.floating .subscription-status a .title {
+ font-weight: bold;
+}
+.floating .subscription-status a .description {
+ font-size: 13px;
+ color: #666;
+ margin-top: 4px;
+}
+
+.floating .subscription-status a:hover {
+ background: #F5F5F5;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index beac09e09e..18850957bb 100644
--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -31,17 +31,17 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.jsymbol.Symbol;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.IndexConstants;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.hit.SymbolHit;
-import io.onedev.server.codesearch.query.BlobQuery;
-import io.onedev.server.codesearch.query.SymbolQuery;
-import io.onedev.server.codesearch.query.TextQuery;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.IndexConstants;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.hit.SymbolHit;
+import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.query.SymbolQuery;
+import io.onedev.server.search.code.query.TextQuery;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
diff --git a/core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css b/core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
index b033a221e9..999e6e20ac 100644
--- a/core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
+++ b/core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css
@@ -12,13 +12,13 @@
content: "Watch if involved";
}
.watch-status.watch:BEFORE {
- content: "\f0a2";
+ content: "\f06e";
}
.watch-status.watch:AFTER {
content: "Watch";
}
.watch-status.do-not-watch:BEFORE {
- content: "\f1f7";
+ content: "\f070";
}
.watch-status.do-not-watch:AFTER {
content: "Do not watch";
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java b/core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java
new file mode 100644
index 0000000000..79621e254b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java
@@ -0,0 +1,23 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.CommitQueryValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=CommitQueryValidator.class)
+public @interface CommitQuery {
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java
new file mode 100644
index 0000000000..f8bac9e8dc
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditSupport.java
@@ -0,0 +1,58 @@
+package io.onedev.server.web.editable.commitquery;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.server.web.editable.annotation.CommitQuery;
+
+@SuppressWarnings("serial")
+public class CommitQueryEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(CommitQuery.class) != null) {
+ if (propertyGetter.getReturnType() != String.class) {
+ throw new RuntimeException("Annotation 'CommitQuery' should be applied to property "
+ + "with type 'String'");
+ }
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ String refMatch = model.getObject();
+ if (refMatch != null) {
+ return new Label(id, refMatch);
+ } else {
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new CommitQueryEditor(componentId, descriptor, model);
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.html b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.html
new file mode 100644
index 0000000000..1b6893780c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.html
@@ -0,0 +1,5 @@
+<wicket:panel>
+ <div class="clearable-wrapper">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java
new file mode 100644
index 0000000000..3f841196ce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java
@@ -0,0 +1,65 @@
+package io.onedev.server.web.editable.commitquery;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.commits.CommitQueryBehavior;
+
+@SuppressWarnings("serial")
+public class CommitQueryEditor extends PropertyEditor<String> {
+
+ private TextField<String> input;
+
+ public CommitQueryEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new TextField<String>("input", getModel());
+ input.add(new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return ((ProjectPage) getPage()).getProject();
+ }
+
+ }));
+
+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
+
+ add(input);
+ input.add(new OnTypingDoneBehavior() {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+
+ });
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 39f6389d79..f8d7fa8a29 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -35,6 +35,7 @@ import io.onedev.server.web.ComponentRenderer;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.FirstCodeCommentQueryLink;
+import io.onedev.server.web.component.link.FirstCommitQueryLink;
import io.onedev.server.web.component.link.FirstIssueQueryLink;
import io.onedev.server.web.component.link.FirstPullRequestQueryLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -139,7 +140,20 @@ public abstract class ProjectPage extends LayoutPage {
List<PageTab> tabs = new ArrayList<>();
tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));
tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,
- ProjectCommitsPage.class, CommitDetailPage.class));
+ ProjectCommitsPage.class, CommitDetailPage.class) {
+
+ @Override
+ public Component render(String componentId) {
+ return new ProjectTabLink(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
+ return new FirstCommitQueryLink(linkId, getProject());
+ }
+ };
+ }
+
+ });
tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",
0, ProjectBranchesPage.class));
tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index c6047fd32a..98b081ac40 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -52,12 +52,6 @@ import io.onedev.jsymbol.TokenPosition;
import io.onedev.jsymbol.util.NoAntiCacheImage;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
-import io.onedev.server.codesearch.IndexManager;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.query.BlobQuery;
-import io.onedev.server.codesearch.query.TextQuery;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobContent;
import io.onedev.server.git.BlobEdits;
@@ -76,6 +70,12 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.persistence.UnitOfWork;
+import io.onedev.server.search.code.CommitIndexed;
+import io.onedev.server.search.code.IndexManager;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.query.TextQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.PrioritizedComponentRenderer;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index c4558a0981..b5f9bcb443 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -11,13 +11,13 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.jsymbol.TokenPosition;
-import io.onedev.server.codesearch.hit.QueryHit;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.hit.QueryHit;
public interface BlobRenderContext extends Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index ef842c9fac..fddae76c4f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -61,8 +61,6 @@ import io.onedev.jsymbol.SymbolExtractor;
import io.onedev.jsymbol.SymbolExtractorRegistry;
import io.onedev.jsymbol.TokenPosition;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
@@ -77,6 +75,8 @@ import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.ProjectAndRevision;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
index 27bc1b74c4..dcf4cb6a9b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
@@ -36,15 +36,15 @@ import org.eclipse.jgit.lib.ObjectId;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.query.BlobQuery;
-import io.onedev.server.codesearch.query.FileQuery;
-import io.onedev.server.codesearch.query.SymbolQuery;
-import io.onedev.server.codesearch.query.TextQuery;
-import io.onedev.server.codesearch.query.TooGeneralQueryException;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.query.FileQuery;
+import io.onedev.server.search.code.query.SymbolQuery;
+import io.onedev.server.search.code.query.TextQuery;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.tabbable.AjaxActionTab;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index bc70fe3c95..e31135e1f5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -33,15 +33,15 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.SearchManager;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.query.BlobQuery;
-import io.onedev.server.codesearch.query.FileQuery;
-import io.onedev.server.codesearch.query.SymbolQuery;
-import io.onedev.server.codesearch.query.TooGeneralQueryException;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.query.BlobQuery;
+import io.onedev.server.search.code.query.FileQuery;
+import io.onedev.server.search.code.query.SymbolQuery;
+import io.onedev.server.search.code.query.TooGeneralQueryException;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.RunTaskBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
index 62fc0ec7e9..78d4d8ef7e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.blob.search.result;
import java.io.Serializable;
import java.util.List;
-import io.onedev.server.codesearch.hit.QueryHit;
+import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.utils.Range;
public class MatchedBlob implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 6f0e80cf34..63df5dab5e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -30,11 +30,11 @@ import org.eclipse.jgit.lib.FileMode;
import io.onedev.jsymbol.TokenPosition;
import io.onedev.jsymbol.util.HighlightableLabel;
-import io.onedev.server.codesearch.hit.FileHit;
-import io.onedev.server.codesearch.hit.QueryHit;
-import io.onedev.server.codesearch.hit.TextHit;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.hit.FileHit;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.search.code.hit.TextHit;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 9cc72c90ad..d051bbd74c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -53,7 +53,6 @@ import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -65,7 +64,8 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branchchoice.BranchChoiceProvider;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html
index 8c26b57c92..55b690d736 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="project-code-comments">
+ <div id="project-code-comments" class="query-save-support">
<div wicket:id="side" class="side"></div>
<div wicket:id="main" class="main"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
index 7ac3dd4168..ffe443fa76 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
@@ -14,7 +14,6 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
import io.onedev.server.manager.CodeCommentQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.CodeCommentQuerySetting;
@@ -22,6 +21,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
+import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 18723591c9..dc22548afb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -38,7 +38,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -50,6 +49,7 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.ContributorAvatars;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQuery.g4 b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQuery.g4
deleted file mode 100644
index 347bf3a70c..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQuery.g4
+++ /dev/null
@@ -1,54 +0,0 @@
-grammar CommitQuery;
-
-query
- : ' '* criteria (' '+ criteria)* ' '* EOF
- ;
-
-criteria
- : fuzzyCriteria
- | revisionCriteria
- | beforeCriteria
- | afterCriteria
- | committerCriteria
- | authorCriteria
- | pathCriteria
- | messageCriteria
- ;
-
-fuzzyCriteria
- : ((UNTIL|SINCE) ' '+)? FuzzyValue
- ;
-
-revisionCriteria
- : ((UNTIL|SINCE) ' '+)? (BRANCH|TAG|REVISION) Value
- ;
-
-beforeCriteria: BEFORE Value;
-
-afterCriteria: AFTER Value;
-
-committerCriteria: COMMITTER Value;
-
-authorCriteria: AUTHOR Value;
-
-pathCriteria: PATH Value;
-
-messageCriteria: MESSAGE Value;
-
-SINCE: 'since';
-UNTIL: 'until';
-BRANCH: 'branch';
-TAG: 'tag';
-REVISION: 'revision';
-BEFORE: 'before';
-AFTER: 'after';
-COMMITTER: 'committer';
-AUTHOR: 'author';
-PATH: 'path';
-MESSAGE: 'message';
-
-Value: '(' (ESCAPE|~[()\\])+? ')';
-FuzzyValue: ~[ ()]+;
-
-fragment
-ESCAPE: '\\'[()\\];
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
index 93f33644a8..61b28ae715 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
@@ -21,6 +21,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.git.NameAndEmail;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.model.Project;
+import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java
new file mode 100644
index 0000000000..ea7529e1c1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.page.project.commits;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
+
+@Editable
+public class NamedCommitQueriesBean extends NamedQueriesBean<NamedCommitQuery> {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<NamedCommitQuery> queries = new ArrayList<>();
+
+ @Override
+ @NotNull
+ @Editable
+ @OmitName
+ public List<NamedCommitQuery> getQueries() {
+ return queries;
+ }
+
+ @Override
+ public void setQueries(List<NamedCommitQuery> queries) {
+ this.queries = queries;
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index 66b13f3e43..16778ed0aa 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -1,25 +1,31 @@
<wicket:extend>
- <div id="repo-commits">
- <div class="head">
- <form wicket:id="query" class="query no-autofocus clearable-wrapper">
- <div class="input-group">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message"></input>
- <span class="input-group-btn">
- <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
- </span>
+ <div id="project-commits" class="query-save-support">
+ <div wicket:id="side" class="side"></div>
+ <div class="main">
+ <div class="head">
+ <form wicket:id="query" class="query no-autofocus clearable-wrapper">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message"></input>
+ <span class="input-group-btn">
+ <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
+ </span>
+ </div>
+ </form>
+ <div class="others clearfix">
+ <a wicket:id="saveQuery" class="save-query pull-left"><i class="fa fa-save"></i> Save Query</a>
</div>
- </form>
- <div wicket:id="feedback"></div>
- </div>
- <div wicket:id="body" class="body">
- <ul class="list list-unstyled">
- <li wicket:id="commits"></li>
- </ul>
- <div wicket:id="noCommits" class="no-records">No commits found</div>
- </div>
- <div wicket:id="commitsFoot" class="foot">
- <a wicket:id="more" class="btn btn-default">More commits</a>
- <div wicket:id="tooMany" class="alert alert-warning">Too many commits to load</div>
+ <div wicket:id="feedback"></div>
+ </div>
+ <div wicket:id="body" class="body">
+ <ul class="list list-unstyled">
+ <li wicket:id="commits"></li>
+ </ul>
+ <div wicket:id="noCommits" class="no-records">No commits found</div>
+ </div>
+ <div wicket:id="commitsFoot" class="foot">
+ <a wicket:id="more" class="btn btn-default">More commits</a>
+ <div wicket:id="tooMany" class="alert alert-warning">Too many commits to load</div>
+ </div>
</div>
</div>
<wicket:fragment wicket:id="commitFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index e93d2412a6..a2de56a99d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -8,18 +8,14 @@ import java.util.regex.Pattern;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+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.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -28,6 +24,7 @@ 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.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
@@ -44,20 +41,29 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.exception.OneException;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.manager.BuildManager;
+import io.onedev.server.manager.CommitQuerySettingManager;
+import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Build;
+import io.onedev.server.model.CommitQuerySetting;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.ProjectAndRevision;
+import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;
+import io.onedev.server.search.commit.CommitQueryParser.QueryContext;
+import io.onedev.server.search.commit.CommitQueryUtils;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Constants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.ContributorAvatars;
@@ -67,12 +73,13 @@ import io.onedev.server.web.component.commitgraph.CommitGraphUtils;
import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.commits.CommitQueryParser.CriteriaContext;
-import io.onedev.server.web.page.project.commits.CommitQueryParser.FuzzyCriteriaContext;
-import io.onedev.server.web.page.project.commits.CommitQueryParser.QueryContext;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
+import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;
+import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;
import io.onedev.server.web.util.ajaxlistener.ShowGlobalLoadingIndicatorImmediatelyListener;
import io.onedev.server.web.util.model.CommitRefsModel;
import io.onedev.utils.StringUtils;
@@ -121,50 +128,11 @@ public class ProjectCommitsPage extends ProjectPage {
command.ignoreCase(true);
if (state.page > MAX_PAGES)
- throw new RuntimeException("Page should be no more than " + MAX_PAGES);
+ throw new OneException("Page should be no more than " + MAX_PAGES);
command.count(state.page*COUNT);
- QueryContext queryContext = getQueryContext();
- if (queryContext != null) {
- for (CriteriaContext criteria: queryContext.criteria()) {
- if (criteria.authorCriteria() != null) {
- String value = criteria.authorCriteria().Value().getText();
- value = StringUtils.replace(unescape(removeParens(value)), "*", ".*");
- command.authors().add(value);
- } else if (criteria.committerCriteria() != null) {
- String value = criteria.committerCriteria().Value().getText();
- value = StringUtils.replace(unescape(removeParens(value)), "*", ".*");
- command.committers().add(value);
- } else if (criteria.pathCriteria() != null) {
- command.paths().add(unescape(removeParens(criteria.pathCriteria().Value().getText())));
- } else if (criteria.beforeCriteria() != null) {
- command.before(removeParens(criteria.beforeCriteria().Value().getText()));
- } else if (criteria.afterCriteria() != null) {
- command.after(removeParens(criteria.afterCriteria().Value().getText()));
- }
- }
- command.messages(getMessages(queryContext));
-
- boolean ranged = false;
- for (Revision revision: getRevisions(queryContext)) {
- if (revision.since) {
- command.revisions().add("^" + revision.value);
- ranged = true;
- } else if (revision.until) {
- command.revisions().add(revision.value);
- ranged = true;
- } else if (getProject().getBranchRef(revision.value) != null) {
- ranged = true;
- command.revisions().add(revision.value);
- } else {
- command.revisions().add(revision.value);
- }
- }
- if (command.revisions().size() == 1 && !ranged) {
- command.count(1);
- }
- }
+ CommitQueryUtils.fill(getProject(), getQueryContext(), command);
if (command.revisions().isEmpty() && state.compareWith != null)
command.revisions(Lists.newArrayList(state.compareWith));
@@ -221,10 +189,6 @@ public class ProjectCommitsPage extends ProjectPage {
state.page = page.intValue();
}
- private String unescape(String text) {
- return text.replace("\\(", "(").replace("\\)", ")").replace("\\\\", "\\");
- }
-
@SuppressWarnings("deprecation")
private Component replaceItem(AjaxRequestTarget target, int index) {
Component item = commitsView.get(index);
@@ -234,11 +198,128 @@ public class ProjectCommitsPage extends ProjectPage {
return newItem;
}
+ private CommitQuerySettingManager getCommitQuerySettingManager() {
+ return OneDev.getInstance(CommitQuerySettingManager.class);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- TextField<String> queryInput = new TextField<String>("input", Model.of(state.query));
+ Component side;
+ add(side = new SavedQueriesPanel<NamedCommitQuery>("side") {
+
+ @Override
+ protected NamedQueriesBean<NamedCommitQuery> newNamedQueriesBean() {
+ return new NamedCommitQueriesBean();
+ }
+
+ @Override
+ protected boolean needsLogin(NamedCommitQuery namedQuery) {
+ return CommitQueryUtils.needsLogin(namedQuery.getQuery());
+ }
+
+ @Override
+ protected Link<Void> newQueryLink(String componentId, NamedCommitQuery namedQuery) {
+ State state = new State();
+ state.query = namedQuery.getQuery();
+ return new BookmarkablePageLink<Void>(componentId, ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject(), state));
+ }
+
+ @Override
+ protected QuerySetting<NamedCommitQuery> getQuerySetting() {
+ return getProject().getCommitQuerySettingOfCurrentUser();
+ }
+
+ @Override
+ protected ArrayList<NamedCommitQuery> getProjectQueries() {
+ return getProject().getSavedCommitQueries();
+ }
+
+ @Override
+ protected void onSaveQuerySetting(QuerySetting<NamedCommitQuery> querySetting) {
+ getCommitQuerySettingManager().save((CommitQuerySetting) querySetting);
+ }
+
+ @Override
+ protected void onSaveProjectQueries(ArrayList<NamedCommitQuery> projectQueries) {
+ getProject().setSavedCommitQueries(projectQueries);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ }
+
+ });
+
+ Component querySave;
+ add(querySave = new AjaxLink<Void>("saveQuery") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(StringUtils.isNotBlank(state.query));
+ setVisible(SecurityUtils.getUser() != null);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Input query to save");
+ }
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new SaveQueryPanel(id) {
+
+ @Override
+ protected void onSaveForMine(AjaxRequestTarget target, String name) {
+ CommitQuerySetting setting = getProject().getCommitQuerySettingOfCurrentUser();
+ NamedCommitQuery namedQuery = setting.getUserQuery(name);
+ if (namedQuery == null) {
+ namedQuery = new NamedCommitQuery(name, state.query);
+ setting.getUserQueries().add(namedQuery);
+ } else {
+ namedQuery.setQuery(state.query);
+ }
+ getCommitQuerySettingManager().save(setting);
+ target.add(side);
+ close();
+ }
+
+ @Override
+ protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ NamedCommitQuery namedQuery = getProject().getSavedCommitQuery(name);
+ if (namedQuery == null) {
+ namedQuery = new NamedCommitQuery(name, state.query);
+ getProject().getSavedCommitQueries().add(namedQuery);
+ } else {
+ namedQuery.setQuery(state.query);
+ }
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ target.add(side);
+ close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ });
+
+ TextField<String> input = new TextField<String>("input", Model.of(state.query));
queryForm = new Form<Void>("query") {
@@ -248,8 +329,8 @@ public class ProjectCommitsPage extends ProjectPage {
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
try {
- String query = queryInput.getModelObject();
- queryContext = Optional.fromNullable(parse(query)); // validate query
+ String query = input.getModelObject();
+ queryContext = Optional.fromNullable(CommitQueryUtils.parse(query)); // validate query
state.query = query;
updateCommits(target);
} catch (Exception e) {
@@ -271,7 +352,18 @@ public class ProjectCommitsPage extends ProjectPage {
};
- queryForm.add(queryInput.add(new CommitQueryBehavior(projectModel)));
+ input.add(new CommitQueryBehavior(projectModel));
+ input.add(new AjaxFormComponentUpdatingBehavior("input"){
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ state.query = input.getModelObject();
+ if (SecurityUtils.getUser() != null)
+ target.add(querySave);
+ }
+
+ });
+ queryForm.add(input);
queryForm.add(new AjaxButton("submit") {});
queryForm.setOutputMarkupId(true);
@@ -343,7 +435,7 @@ public class ProjectCommitsPage extends ProjectPage {
addCommitClass(item, commitIndex++);
commitsView.add(item);
target.add(item);
- builder.append(String.format("$('#repo-commits>.body>.list').append(\"<li id='%s'></li>\");",
+ builder.append(String.format("$('#project-commits>.body>.list').append(\"<li id='%s'></li>\");",
item.getMarkupId()));
}
target.prependJavaScript(builder);
@@ -430,9 +522,9 @@ public class ProjectCommitsPage extends ProjectPage {
@Override
protected List<Pattern> load() {
List<Pattern> patterns = new ArrayList<>();
- QueryContext queryContext = getQueryContext();
- if (queryContext != null) {
- for (String message: getMessages(queryContext)) {
+ QueryContext query = getQueryContext();
+ if (query != null) {
+ for (String message: CommitQueryUtils.getMessages(query)) {
patterns.add(Pattern.compile(message, Pattern.CASE_INSENSITIVE));
}
}
@@ -616,99 +708,14 @@ public class ProjectCommitsPage extends ProjectPage {
List<RevCommit> current;
}
- private String removeParens(String value) {
- if (value.startsWith("("))
- value = value.substring(1);
- if (value.endsWith(")"))
- value = value.substring(0, value.length()-1);
- return value;
- }
-
- private List<String> getMessages(QueryContext queryContext) {
- List<String> messages = new ArrayList<>();
- List<String> fuzzyMessages = new ArrayList<>();
- for (CriteriaContext criteria: queryContext.criteria()) {
- if (criteria.messageCriteria() != null) {
- String message = unescape(removeParens(criteria.messageCriteria().Value().getText()));
- messages.add(StringUtils.replace(message, "*", ".*"));
- } else {
- FuzzyCriteriaContext fuzzyCriteria = criteria.fuzzyCriteria();
- if (fuzzyCriteria != null && fuzzyCriteria.UNTIL() == null
- && fuzzyCriteria.SINCE() == null
- && getProject().getObjectId(fuzzyCriteria.getText(), false) == null) {
- fuzzyMessages.add(fuzzyCriteria.getText());
- }
- }
- }
- if (!fuzzyMessages.isEmpty())
- messages.add(Joiner.on(".*").join(fuzzyMessages));
- return messages;
- }
-
- private List<Revision> getRevisions(QueryContext queryContext) {
- List<Revision> revisions = new ArrayList<>();
- for (CriteriaContext criteria: queryContext.criteria()) {
- if (criteria.revisionCriteria() != null) {
- Revision revision = new Revision();
- revision.value = unescape(removeParens(criteria.revisionCriteria().Value().getText()));
- if (criteria.revisionCriteria().SINCE() != null)
- revision.since = true;
- else if (criteria.revisionCriteria().UNTIL() != null)
- revision.until = true;
- revisions.add(revision);
- } else {
- FuzzyCriteriaContext fuzzyCriteria = criteria.fuzzyCriteria();
- if (fuzzyCriteria != null && getProject().getObjectId(fuzzyCriteria.FuzzyValue().getText(), false) != null) {
- Revision revision = new Revision();
- revision.value = fuzzyCriteria.FuzzyValue().getText();
- if (fuzzyCriteria.SINCE() != null)
- revision.since = true;
- else if (fuzzyCriteria.UNTIL() != null)
- revision.until = true;
- revisions.add(revision);
- }
- }
- }
- return revisions;
- }
@Nullable
private QueryContext getQueryContext() {
if (queryContext == null)
- queryContext = Optional.fromNullable(parse(state.query));
+ queryContext = Optional.fromNullable(CommitQueryUtils.parse(state.query));
return queryContext.orNull();
}
-
- @Nullable
- private QueryContext parse(@Nullable String query) {
- if (query != null) {
- ANTLRInputStream is = new ANTLRInputStream(query);
- CommitQueryLexer lexer = new CommitQueryLexer(is);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new BaseErrorListener() {
-
- @Override
- public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
- int charPositionInLine, String msg, RecognitionException e) {
- if (e != null) {
- logger.error("Error lexing commit query", e);
- } else if (msg != null) {
- logger.error("Error lexing commit query: " + msg);
- }
- throw new RuntimeException("Malformed commit query");
- }
-
- });
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- CommitQueryParser parser = new CommitQueryParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- return parser.query();
- } else {
- return null;
- }
- }
-
+
public static class State implements Serializable {
private static final long serialVersionUID = 1L;
@@ -720,14 +727,4 @@ public class ProjectCommitsPage extends ProjectPage {
public int page = 1;
}
-
- private static class Revision implements Serializable {
-
- public boolean since;
-
- public boolean until;
-
- public String value;
-
- }
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
index 2d95f24748..21ff13ae31 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
@@ -1,64 +1,65 @@
-#repo-commits {
+#project-commits>.main {
position: relative;
}
-#repo-commits>.head>.query {
+#project-commits>.main>.head>.query {
margin-bottom: 20px;
}
-#repo-commits>.body .no-commits {
+
+#project-commits>.main>.body .no-commits {
font-size: 16px;
}
-#repo-commits>.body li {
+#project-commits>.main>.body li {
padding: 4px 0;
}
-#repo-commits>.body li.commit>.avatar {
+#project-commits>.main>.body li.commit>.avatar {
margin-top: 4px;
}
-#repo-commits>.body .label {
+#project-commits>.main>.body .label {
margin: 3px 0 0 4px;
}
-#repo-commits>.body a {
+#project-commits>.main>.body a {
color: #555;
}
-#repo-commits>.body a.summary {
+#project-commits>.main>.body a.summary {
font-weight: bold;
font-size: 15px;
}
-#repo-commits>.body .detail {
+#project-commits>.main>.body .detail {
padding-left: 8px;
padding-right: 8px;
}
-#repo-commits>.body li.commit:hover, #repo-commits>.body li.commit.hover {
+#project-commits>.main>.body li.commit:hover, #project-commits>.main>.body li.commit.hover {
background: #F7ECB9;
}
-#repo-commits>.body .commit-message .highlight {
+#project-commits>.main>.body .commit-message .highlight {
background: yellow;
}
-#repo-commits>.body li.commit .contribution {
+#project-commits>.main>.body li.commit .contribution {
font-size: 12px;
}
-#repo-commits>.body .message-and-labels {
+#project-commits>.main>.body .message-and-labels {
margin-bottom: 4px;
}
-#repo-commits>.body .actions {
+#project-commits>.main>.body .actions {
margin: 6px 0 0 8px;
}
-#repo-commits>.body .hash {
+#project-commits>.main>.body .hash {
margin-top: 6px;
}
-#repo-commits>.body .actions .compare {
+#project-commits>.main>.body .actions .compare {
color: #777;
}
-#repo-commits>.body>.list {
+#project-commits>.main>.body>.list {
margin-bottom: 0;
}
-#repo-commits>.foot {
+#project-commits>.main>.foot {
text-align: center;
}
-#repo-commits>.foot>.alert, #repo-commits>.foot>.btn {
+#project-commits>.main>.foot>.alert, #project-commits>.main>.foot>.btn {
margin-top: 8px;
margin-bottom: 0;
}
-#repo-commits li.date {
+#project-commits>.main li.date {
font-size: 18px;
margin-top: 12px;
text-align: left;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 90427589ee..fe1d2be011 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -30,7 +30,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.manager.PullRequestManager;
@@ -41,6 +40,7 @@ import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.ProjectAndRevision;
+import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.TooltipBehavior;
import io.onedev.server.web.component.commitlist.CommitListPanel;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java
index a6f3001899..b4a2ba1b09 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java
@@ -21,13 +21,13 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueCriteria;
-import io.onedev.server.entityquery.issue.IssueQuery;
-import io.onedev.server.entityquery.issue.MilestoneCriteria;
import io.onedev.server.manager.IssueActionManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.modal.ModalLink;
@@ -105,7 +105,7 @@ abstract class BacklogColumnPanel extends Panel {
@Override
protected String load() {
return String.valueOf(OneDev.getInstance(IssueManager.class)
- .count(getProject(), getQuery().getCriteria()));
+ .count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria()));
}
}) {
@@ -127,7 +127,7 @@ abstract class BacklogColumnPanel extends Panel {
if (!SecurityUtils.canModify(issue))
throw new UnauthorizedException("Permission denied");
OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, null);
- if (getQuery().matches(issue)) {
+ if (getQuery().matches(issue, SecurityUtils.getUser())) {
target.add(BacklogColumnPanel.this);
} else {
new ModalPanel(target) {
@@ -173,7 +173,7 @@ abstract class BacklogColumnPanel extends Panel {
issue = SerializationUtils.clone(issue);
issue.setMilestone(null);
}
- if (getQuery().matches(issue)) {
+ if (getQuery().matches(issue, SecurityUtils.getUser())) {
String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());
issueDragging.getHandler().appendJavaScript(script);
}
@@ -184,7 +184,7 @@ abstract class BacklogColumnPanel extends Panel {
@Override
protected List<Issue> queryIssues(int offset, int count) {
if (getQuery() != null)
- return OneDev.getInstance(IssueManager.class).query(getProject(), getQuery(), offset, count);
+ return OneDev.getInstance(IssueManager.class).query(getProject(), SecurityUtils.getUser(), getQuery(), offset, count);
else
return new ArrayList<>();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java
index d02124b257..7bd7a9d478 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java
@@ -27,13 +27,6 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.ChoiceFieldCriteria;
-import io.onedev.server.entityquery.issue.FieldOperatorCriteria;
-import io.onedev.server.entityquery.issue.IssueCriteria;
-import io.onedev.server.entityquery.issue.IssueQuery;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
-import io.onedev.server.entityquery.issue.MilestoneCriteria;
-import io.onedev.server.entityquery.issue.StateCriteria;
import io.onedev.server.manager.IssueActionManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.UserManager;
@@ -46,6 +39,13 @@ import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
+import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.issue.MilestoneCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
@@ -149,7 +149,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
issue = SerializationUtils.clone(issue);
issue.setMilestone(getMilestone());
}
- if (getQuery().matches(issue)) {
+ if (getQuery().matches(issue, SecurityUtils.getUser())) {
String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());
issueDragging.getHandler().appendJavaScript(script);
}
@@ -160,7 +160,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Override
protected List<Issue> queryIssues(int offset, int count) {
if (getQuery() != null)
- return OneDev.getInstance(IssueManager.class).query(getProject(), getQuery(), offset, count);
+ return OneDev.getInstance(IssueManager.class).query(getProject(), SecurityUtils.getUser(), getQuery(), offset, count);
else
return new ArrayList<>();
}
@@ -231,7 +231,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Override
protected String load() {
- return String.valueOf(OneDev.getInstance(IssueManager.class).count(getProject(), getQuery().getCriteria()));
+ return String.valueOf(OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria()));
}
}) {
@@ -292,7 +292,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
}
private void checkMatched(AjaxRequestTarget target, Issue issue) {
- if (getQuery().matches(issue)) {
+ if (getQuery().matches(issue, SecurityUtils.getUser())) {
target.add(BoardColumnPanel.this);
} else {
new ModalPanel(target) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java
index 56e6f875be..c5770631d5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java
@@ -36,12 +36,12 @@ import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java
index 25f07f8732..ce146211d6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java
@@ -8,10 +8,11 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueCriteria;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.newissue.NewIssueEditor;
@@ -52,7 +53,7 @@ abstract class NewCardPanel extends Panel {
super.onSubmit(target, form);
Issue issue = editor.getConvertedInput();
OneDev.getInstance(IssueManager.class).open(issue);
- if (getTemplate().matches(issue)) {
+ if (getTemplate().matches(issue, SecurityUtils.getUser())) {
onAdded(target, issue);
} else {
new ModalPanel(target) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
index 111b7ae3b9..1df7a20a39 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
@@ -49,8 +49,6 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.manager.IssueActionManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueVoteManager;
@@ -69,6 +67,8 @@ import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputContext;
@@ -441,7 +441,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
protected List<Issue> query(EntityQuery<Issue> query, int offset, int count) {
- return getIssueManager().query(getProject(), query, offset, count);
+ return getIssueManager().query(getProject(), getLoginUser(), query, offset, count);
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
index 2bd6a48643..0d13ff952a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="issue-list">
+ <div id="issue-list" class="query-save-support">
<div wicket:id="side" class="side"></div>
<div wicket:id="main" class="main"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index 0a3c47f45f..b61c14e099 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -14,13 +14,13 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.web.component.issuelist.IssueListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.issues.IssuesPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
index e385efc525..e69de29bb2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
@@ -1,18 +0,0 @@
-#issue-list {
- display: table;
- width: 100%;
-}
-#issue-list>div {
- display: table-cell;
-}
-#issue-list>.side {
- width: 240px;
- border: 1px solid #E0E0E0;
- padding: 20px;
- border-radius: 4px;
-}
-#issue-list>.main {
- padding-left: 20px;
- vertical-align: top;
-}
-
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
index b9e36c9337..73ee27c0e1 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import io.onedev.server.entityquery.issue.IssueCriteria;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.web.component.milestoneprogress.MilestoneProgressBar;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
index 8df91b0aec..b40c83f818 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
@@ -19,6 +19,7 @@ import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
@@ -64,7 +65,7 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@Override
protected Component newContent(String id) {
- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), StateSpec.Category.OPEN) != 0) {
+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), SecurityUtils.getUser(), StateSpec.Category.OPEN) != 0) {
Fragment fragment = new Fragment(id, "confirmCloseWithOpenIssuesFrag", MilestoneActionsPanel.this);
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
@@ -167,7 +168,7 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@Override
protected Component newContent(String id) {
- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), null) != 0) {
+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), SecurityUtils.getUser(), null) != 0) {
Fragment fragment = new Fragment(id, "confirmDeleteWithIssuesFrag", MilestoneActionsPanel.this);
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 81f7d51475..836401f0dc 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@ -14,11 +14,11 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueQuery;
-import io.onedev.server.entityquery.issue.MilestoneCriteria;
import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.MilestoneDueLabel;
import io.onedev.server.web.component.MilestoneStatusLabel;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
index 7d4b4e44d5..47becca151 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
@@ -11,12 +11,12 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.issue.IssueCriteria;
-import io.onedev.server.entityquery.issue.IssueQuery;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.newissue.NewIssueEditor;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
index ff33a51301..be181b227c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
@@ -37,7 +37,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.manager.PullRequestManager;
@@ -53,6 +52,7 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.component.branchpicker.AffinalBranchPicker;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
index d7a662c159..bf4c0a344c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
@@ -66,8 +66,6 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.EntityQuery;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
import io.onedev.server.manager.PullRequestActionManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.PullRequestUpdateManager;
@@ -84,6 +82,8 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.build.PullRequestBuildsPanel;
@@ -430,7 +430,7 @@ public abstract class RequestDetailPage extends ProjectPage {
@Override
protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count) {
- return getPullRequestManager().query(getProject(), query, offset, count);
+ return getPullRequestManager().query(getProject(), getLoginUser(), query, offset, count);
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java
index 9df936c10d..df21d2c293 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java
@@ -33,13 +33,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.diff.revision.CommentSupport;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
index 6845d6688b..2fea11e930 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
@@ -24,12 +24,12 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.codesearch.CommitIndexed;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
+import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.BuildStatusPanel;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
index 923a40ed0f..76ee4f3ed4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div id="request-list">
+ <div id="request-list" class="query-save-support">
<div wicket:id="side" class="side"></div>
<div class="main">
<div class="head">
@@ -13,7 +13,7 @@
</form>
<a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>
<div class="others clearfix">
- <a wicket:id="saveQuery" class="pull-left"><i class="fa fa-save"></i> Save Query</a>
+ <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>
<div wicket:id="pageInfo" class="page-info pull-right"></div>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
index 7ede810233..eb7561ee37 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.PullRequestManager;
@@ -50,6 +49,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestQuerySetting;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
@@ -389,14 +389,14 @@ public class RequestListPage extends ProjectPage {
@Override
public Iterator<? extends PullRequest> iterator(long first, long count) {
- return getPullRequestManager().query(getProject(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();
+ return getPullRequestManager().query(getProject(), getLoginUser(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();
}
@Override
public long size() {
PullRequestQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
- return getPullRequestManager().count(getProject(), parsedQuery.getCriteria());
+ return getPullRequestManager().count(getProject(), getLoginUser(), parsedQuery.getCriteria());
else
return 0;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java
index 61ab5bb1c3..86d7015d4c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java
@@ -14,7 +14,7 @@ public class SaveQueryBean implements Serializable {
private String name;
- @Editable(description="Specify a name to identify the preset query")
+ @Editable(description="Specify name of the saved query")
@NotEmpty
@OmitName
public String getName() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
index 040fa76693..3d402d63b7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
@@ -12,6 +12,7 @@
<div wicket:id="userQueries">
<span class="btn-group">
<a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>
+ <a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a>
<a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>
</span>
</div>
@@ -20,6 +21,7 @@
<div wicket:id="projectQueries">
<span class="btn-group">
<a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>
+ <a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a>
<a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>
</span>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
index f1b0059ef9..f27a42c2c8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
@@ -33,6 +33,7 @@ import io.onedev.server.model.support.WatchStatus;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.subscriptionstatus.SubscriptionStatusLink;
import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
@@ -72,6 +73,22 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
return WatchStatus.DEFAULT;
}
+ private boolean getProjectSubscriptionStatus(T namedQuery) {
+ QuerySetting<T> querySetting = getQuerySetting();
+ if (querySetting != null)
+ return querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().contains(namedQuery.getName());
+ else
+ return false;
+ }
+
+ private boolean getUserSubscriptionStatus(T namedQuery) {
+ QuerySetting<T> querySetting = getQuerySetting();
+ if (querySetting != null)
+ return querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().contains(namedQuery.getName());
+ else
+ return false;
+ }
+
private Project getProject() {
ProjectPage page = (ProjectPage) getPage();
return page.getProject();
@@ -247,6 +264,35 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
}
});
+
+ item.add(new SubscriptionStatusLink("subscriptionStatus") {
+
+ @Override
+ protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {
+ target.add(this);
+ QuerySetting<T> querySetting = getQuerySetting();
+ if (subscriptionStatus)
+ querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().add(namedQuery.getName());
+ else
+ querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().remove(namedQuery.getName());
+
+ onSaveQuerySetting(querySetting);
+
+ }
+
+ @Override
+ protected boolean getSubscriptionStatus() {
+ return getUserSubscriptionStatus(namedQuery);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getQuerySetting().getQuerySubscriptionSupport() != null);
+ }
+
+ });
+
}
@Override
@@ -306,6 +352,32 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
+ item.add(new SubscriptionStatusLink("subscriptionStatus") {
+
+ @Override
+ protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {
+ target.add(this);
+
+ QuerySetting<T> querySetting = getQuerySetting();
+ if (subscriptionStatus)
+ querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().add(namedQuery.getName());
+ else
+ querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().remove(namedQuery.getName());
+ onSaveQuerySetting(querySetting);
+ }
+
+ @Override
+ protected boolean getSubscriptionStatus() {
+ return getProjectSubscriptionStatus(namedQuery);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.getUser() != null && getQuerySetting().getQuerySubscriptionSupport() != null);
+ }
+
+ });
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
index d9e7fa4589..96c604d877 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
@@ -16,10 +16,10 @@
.saved-queries>.body>:last-child {
margin-bottom: 0;
}
-.saved-queries>.body .watch-status:after {
+.saved-queries>.body .watch-status:after, .saved-queries>.body .subscription-status:after {
display: none;
}
-.saved-queries>.body .watch-status:before {
+.saved-queries>.body .watch-status:before, .saved-queries>.body .subscription-status:before {
line-height: 12px;
}
@@ -32,3 +32,29 @@
.edit-saved-queries tfoot {
display: none;
}
+
+.query-save-support {
+ display: table;
+ width: 100%;
+}
+.query-save-support>div {
+ display: table-cell;
+}
+.query-save-support>.side {
+ width: 240px;
+ border: 1px solid #E0E0E0;
+ padding: 20px;
+ border-radius: 4px;
+}
+.query-save-support>.main {
+ padding-left: 20px;
+ vertical-align: top;
+}
+.query-save-support>.main .save-query {
+ color: #666;
+}
+.query-save-support>.main .save-query[disabled] {
+ text-decoration: none;
+ color: #999;
+ cursor: default;
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 795b443f3a..d859611705 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,3 +1,3 @@
<wicket:extend>
- <a wicket:id="test">test</a>
+ <a wicket:id="test" class="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/test.css b/core/src/main/java/io/onedev/server/web/page/test/test.css
index ed6c57dc9b..e68ba6a656 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/test.css
+++ b/core/src/main/java/io/onedev/server/web/page/test/test.css
@@ -1,5 +1,2 @@
-.column {
- border: 1px solid red;
- height: 200px;
- overflow: auto;
+a.test:before {
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
index 3d9a17835e..81accf952a 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
@@ -4,7 +4,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.codesearch.CommitIndexed;
+import io.onedev.server.search.code.CommitIndexed;
@Singleton
public class CommitIndexedBroadcaster {
diff --git a/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
index a8554808b6..b2bae52fb9 100644
--- a/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
@@ -12,6 +12,7 @@ import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
public class TestCodeCommentQueryGrammar {
diff --git a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
index 6e5e7aed0b..2850de3e1d 100644
--- a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
@@ -12,6 +12,7 @@ import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.server.search.entity.issue.IssueQueryLexer;
public class TestIssueQueryGrammar {
diff --git a/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
index 4e074b3710..39b0219806 100644
--- a/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
@@ -12,6 +12,7 @@ import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
public class TestPullRequestQueryGrammar {
diff --git a/core/src/test/java/io/onedev/server/search/commit/CommitQueryUtilsTest.java b/core/src/test/java/io/onedev/server/search/commit/CommitQueryUtilsTest.java
new file mode 100644
index 0000000000..2d19b515f1
--- /dev/null
+++ b/core/src/test/java/io/onedev/server/search/commit/CommitQueryUtilsTest.java
@@ -0,0 +1,61 @@
+package io.onedev.server.search.commit;
+
+import static org.junit.Assert.*;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.Repository;
+import org.junit.Test;
+
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.git.AbstractGitTest;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+
+public class CommitQueryUtilsTest extends AbstractGitTest {
+
+ @Test
+ public void testMatches() throws Exception {
+ addFileAndCommit("initial", "", "initial");
+ git.checkout().setCreateBranch(true).setName("dev").call();
+ addFileAndCommit("dev/file1", "", "dev1");
+ addFileAndCommit("dev/file2", "", "dev2");
+ git.checkout().setName("master").call();
+
+ CommitQueryUtilsTest.this.user = new PersonIdent("bar", "[email protected]");
+
+ addFileAndCommit("master/file1", "", "master1");
+ addFileAndCommit("master/file2", "", "master2");
+
+ Project project = new Project() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Repository getRepository() {
+ return git.getRepository();
+ }
+
+ };
+ ObjectId newCommitId = git.getRepository().resolve("master");
+ ObjectId oldCommitId = git.getRepository().resolve("master~1");
+ RefUpdated event = new RefUpdated(project, "refs/heads/master", oldCommitId, newCommitId);
+
+ User user = new User();
+ user.setEmail(CommitQueryUtilsTest.this.user.getEmailAddress());
+ assertTrue(CommitQueryUtils.matches(event, user, null));
+ assertFalse(CommitQueryUtils.matches(event, user, "branch(dev)"));
+ assertTrue(CommitQueryUtils.matches(event, user, "default-branch"));
+ assertTrue(CommitQueryUtils.matches(event, user, "branch(master) path(master/*)"));
+ assertFalse(CommitQueryUtils.matches(event, user, "path(master/file)"));
+ assertTrue(CommitQueryUtils.matches(event, user, "path(master/file) path(master/file*)"));
+ assertTrue(CommitQueryUtils.matches(event, user, "message(dev) message(master)"));
+ assertTrue(CommitQueryUtils.matches(event, user, "message(dev) message(m*s)"));
+ assertTrue(CommitQueryUtils.matches(event, user, "authored-by-me author([email protected])"));
+ assertFalse(CommitQueryUtils.matches(event, user, "authored-by-me committer([email protected])"));
+ assertTrue(CommitQueryUtils.matches(event, user, "authored-by-me committer([email protected])"));
+ assertTrue(CommitQueryUtils.matches(event, user, "after(2 days ago) after(1 hour ago)"));
+ assertFalse(CommitQueryUtils.matches(event, user, "before(1 hour ago) after(1 day ago)"));
+ }
+
+}
diff --git a/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java b/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java
index 2ff8812fd9..dc3dcc4f41 100644
--- a/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java
+++ b/core/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
import com.google.common.base.Splitter;
-import io.onedev.server.codesearch.query.regex.RegexLiterals;
+import io.onedev.server.search.code.query.regex.RegexLiterals;
public class RegexLiteralsTest {