The Unified and Autonomous Development Platform
Continue to refactor various queries
Robin Shenc6b3b68bfa39
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 98abf8085a..8b701aeb87 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -32,7 +32,6 @@ import javax.validation.Validator;import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;@@ -93,6 +92,7 @@ import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.BuildCommitAware;import io.onedev.server.util.JobLogger;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.javaindex 62f73032fe..9d65b5ff78 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java@@ -15,7 +15,6 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.EditContext;import io.onedev.server.util.SecurityUtils;@@ -58,8 +57,7 @@ public class ProjectDependency implements Serializable {private static List<String> getProjectChoices() {List<String> choices = new ArrayList<>();Project project = ((ProjectPage)WicketUtils.getPage()).getProject();- User user = SecurityUtils.getUser();- for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(user, new AccessProject())) {+ for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {if (!each.equals(project))choices.add(each.getName());}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex d60c85dcb7..a7ba4aa821 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -11,7 +11,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -40,12 +39,11 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> queryUnfinished();- List<Build> query(Project project, @Nullable User user, String term, int count);+ List<Build> query(Project project, String term, int count);- List<Build> query(@Nullable Project project, @Nullable User user,- EntityQuery<Build> buildQuery, int firstResult, int maxResults);+ List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery, int firstResult, int maxResults);- int count(@Nullable Project project, @Nullable User user, EntityCriteria<Build> buildCriteria);+ int count(@Nullable Project project, EntityCriteria<Build> buildCriteria);Collection<Long> getBuildIdsByProject(Long projectId);@@ -53,7 +51,7 @@ public interface BuildManager extends EntityManager<Build> {Collection<String> getJobNames(@Nullable Project project);- List<String> queryVersions(Project project, @Nullable User user, String matchWith, int count);+ List<String> queryVersions(Project project, String matchWith, int count);- Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user);+ Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.javaindex 2f6c98881c..1fc32b8b69 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java@@ -29,10 +29,11 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {void create(CodeComment comment, @Nullable PullRequest request);- List<CodeComment> query(Project project, @Nullable PullRequest request, User user,+ List<CodeComment> query(Project project, @Nullable PullRequest request,EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);- int count(Project project, @Nullable PullRequest request, User user, EntityCriteria<CodeComment> commentCriteria);+ int count(Project project, @Nullable PullRequest request,+ EntityCriteria<CodeComment> commentCriteria);void delete(User user, CodeComment comment);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex b9742f5f30..6b2b0ccb01 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -10,7 +10,6 @@ import io.onedev.server.issue.StateSpec;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.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -29,14 +28,14 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);- List<Issue> query(@Nullable Project project, @Nullable User user, EntityQuery<Issue> issueQuery,+ List<Issue> query(@Nullable Project project, EntityQuery<Issue> issueQuery,int firstResult, int maxResults);- int count(@Nullable Project project, @Nullable User user, @Nullable IssueCriteria issueCriteria);+ int count(@Nullable Project project, @Nullable IssueCriteria issueCriteria);List<Issue> query(Project project, String term, int count);- int count(Milestone milestone, @Nullable User user, @Nullable StateSpec.Category category);+ int count(Milestone milestone, @Nullable StateSpec.Category category);Collection<String> getUndefinedStates();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 574c92f7e7..12323fc57b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -9,7 +9,6 @@ import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.Repository;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -47,10 +46,10 @@ public interface ProjectManager extends EntityManager<Project> {Repository getRepository(Project project);- Collection<Project> getPermittedProjects(@Nullable User user, Permission permission);+ Collection<Project> getPermittedProjects(Permission permission);- List<Project> query(@Nullable User user, EntityQuery<Project> projecQuery, int firstResult, int maxResults);+ List<Project> query(EntityQuery<Project> projecQuery, int firstResult, int maxResults);- int count(@Nullable User user, @Nullable EntityCriteria<Project> projectCriteria);+ int count(EntityCriteria<Project> projectCriteria);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex daf8838e37..fc5ac17856 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -75,11 +75,10 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void checkQuality(PullRequest request);- List<PullRequest> query(@Nullable Project targetProject, @Nullable User user,+ List<PullRequest> query(@Nullable Project targetProject,EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);- int count(@Nullable Project targetProject, @Nullable User user,- EntityCriteria<PullRequest> requestCriteria);+ int count(@Nullable Project targetProject, EntityCriteria<PullRequest> requestCriteria);List<PullRequest> query(Project targetProject, String term, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex df3b474ef2..cc0664ef62 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -25,7 +25,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import javax.persistence.criteria.Selection;-import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.errors.MissingObjectException;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -49,12 +49,12 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.match.StringMatcher;import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;-import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;@@ -79,11 +79,9 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.security.permission.ManageProject;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.query.BuildQueryConstants;@@ -111,6 +109,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsprivate final TransactionManager transactionManager;+ private final UserManager userManager;+private final Map<Long, BuildFacade> builds = new HashMap<>();private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();@@ -124,7 +124,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Injectpublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,- GroupManager groupManager, StorageManager storageManager,+ GroupManager groupManager, StorageManager storageManager, UserManager userManager,ProjectManager projectManager, TransactionManager transactionManager) {super(dao);this.buildParamManager = buildParamManager;@@ -132,6 +132,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsthis.storageManager = storageManager;this.groupManager = groupManager;this.projectManager = projectManager;+ this.userManager = userManager;this.taskScheduler = taskScheduler;this.transactionManager = transactionManager;}@@ -292,16 +293,15 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<Build> query(Project project, @Nullable User user, String term, int count) {+ public List<Build> query(Project project, String term, int count) {List<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.eq(BuildQueryConstants.ATTR_PROJECT, project));- Subject subject = User.asSubject(user);- if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {+ if (!SecurityUtils.canManage(project)) {List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project, user).get(project))+ for (String jobName: getAccessibleJobNames(project).get(project))jobCriterions.add(Restrictions.eq(BuildQueryConstants.ATTR_JOB, jobName));if (!jobCriterions.isEmpty())criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));@@ -330,13 +330,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<String> queryVersions(Project project, @Nullable User user, String matchWith, int count) {+ public List<String> queryVersions(Project project, String matchWith, int count) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<String> criteriaQuery = builder.createQuery(String.class);Root<Build> root = criteriaQuery.from(Build.class);criteriaQuery.select(root.get(BuildQueryConstants.ATTR_VERSION)).distinct(true);- Collection<Predicate> predicates = getPredicates(project, root, builder, user);+ Collection<Predicate> predicates = getPredicates(project, root, builder);predicates.add(builder.like(builder.lower(root.get(BuildQueryConstants.ATTR_VERSION)),"%" + matchWith.toLowerCase() + "%"));@@ -365,22 +365,21 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root,- CriteriaBuilder builder, @Nullable User user) {+ CriteriaBuilder builder) {Collection<Predicate> predicates = new ArrayList<>();- Subject subject = User.asSubject(user);if (project != null) {predicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), project));- if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {+ if (!SecurityUtils.canManage(project)) {List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project, user).get(project))+ for (String jobName: getAccessibleJobNames(project).get(project))jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));}- } else if (!subject.isPermitted(new SystemAdministration())) {+ } else if (!SecurityUtils.isAdministrator()) {List<Predicate> projectPredicates = new ArrayList<>();- for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null, user).entrySet()) {- if (subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {+ for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null).entrySet()) {+ if (SecurityUtils.canManage(project)) {projectPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()));} else {List<Predicate> jobPredicates = new ArrayList<>();@@ -397,22 +396,23 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn predicates;}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria,- @Nullable Project project, Root<Build> root, CriteriaBuilder builder, @Nullable User user) {- Collection<Predicate> predicates = getPredicates(project, root, builder, user);- if (criteria != null)- predicates.add(criteria.getPredicate(root, builder, user));+ private Predicate[] getPredicates(@Nullable Project project,+ io.onedev.server.search.entity.EntityCriteria<Build> criteria,+ Root<Build> root, CriteriaBuilder builder) {+ Collection<Predicate> predicates = getPredicates(project, root, builder);+ if (criteria != null)+ predicates.add(criteria.getPredicate(root, builder));return predicates.toArray(new Predicate[0]);}- private CriteriaQuery<Build> buildCriteriaQuery(Session session, @Nullable Project project,- EntityQuery<Build> buildQuery, @Nullable User user) {+ private CriteriaQuery<Build> buildCriteriaQuery(@Nullable Project project,+ Session session, EntityQuery<Build> buildQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);query.select(root).distinct(true);- query.where(getPredicates(buildQuery.getCriteria(), project, root, builder, user));+ query.where(getPredicates(project, buildQuery.getCriteria(), root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: buildQuery.getSorts()) {@@ -431,9 +431,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<Build> query(@Nullable Project project, @Nullable User user,- EntityQuery<Build> buildQuery, int firstResult, int maxResults) {- CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(getSession(), project, buildQuery, user);+ public List<Build> query(@Nullable Project project, EntityQuery<Build> buildQuery,+ int firstResult, int maxResults) {+ CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(project, getSession(), buildQuery);Query<Build> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -442,13 +442,12 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public int count(@Nullable Project project, @Nullable User user,- io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {+ public int count(@Nullable Project project, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.where(getPredicates(buildCriteria, project, root, builder, user));+ criteriaQuery.where(getPredicates(project, buildCriteria, root, builder));criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();@@ -519,35 +518,45 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Overridepublic Boolean call() {- List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);- if (!builds.isEmpty()) {- logger.debug("Checking build preserve condition: {}->{}",- firstResult.get()+1, firstResult.get()+builds.size());- }- for (Build build: builds) {- Project project = build.getProject();- Optional<BuildQuery> query = preserveConditions.get(project.getId());- if (query == null) {- try {- String queryString = project.getBuildSetting().getBuildsToPreserve();- query = Optional.of(BuildQuery.parse(project, queryString));- if (query.get().needsLogin())- throw new OneException("This query needs login which is not supported here");- } catch (Exception e) {- logger.error("Error parsing build preserve condition of project '{}'", project.getName(), e);- query = Optional.absent();- }- preserveConditions.put(project.getId(), query);+ ThreadContext.bind(userManager.getRoot().asSubject());+ User.push(null); // do not support various 'is me' criterias+ try {+ List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);+ if (!builds.isEmpty()) {+ logger.debug("Checking build preserve condition: {}->{}",+ firstResult.get()+1, firstResult.get()+builds.size());}- if (query.isPresent()) {- if (!query.get().matches(build, null)) {- logger.debug("Preserve condition not satisfied, deleting build {}...", build.getId());- delete(build);+ for (Build build: builds) {+ Project project = build.getProject();+ Optional<BuildQuery> query = preserveConditions.get(project.getId());+ if (query == null) {+ try {+ String queryString = project.getBuildSetting().getBuildsToPreserve();+ query = Optional.of(BuildQuery.parse(project, queryString));+ } catch (Exception e) {+ String message = String.format("Error parsing build preserve condition of project '%s'",+ project.getName());+ logger.error(message, e);+ query = Optional.absent();+ }+ preserveConditions.put(project.getId(), query);+ }+ if (query.isPresent()) {+ try {+ if (!query.get().matches(build))+ delete(build);+ } catch (Exception e) {+ String message = String.format("Error preserving build '%s'", build.getFQN());+ logger.error(message, e);+ }}}- }- firstResult.set(firstResult.get() + CLEANUP_BATCH);- return builds.size() == CLEANUP_BATCH;+ firstResult.set(firstResult.get() + CLEANUP_BATCH);+ return builds.size() == CLEANUP_BATCH;+ } finally {+ User.pop();+ ThreadContext.unbindSubject();+ }}})) {}@@ -742,12 +751,12 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}@Override- public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user) {+ public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project) {jobNamesLock.readLock().lock();try {Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();- Subject subject = User.asSubject(user);- if (subject.isPermitted(new SystemAdministration())) {+ User user = SecurityUtils.getUser();+ if (SecurityUtils.isAdministrator()) {for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 45899b3622..919ffcd664 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -236,8 +236,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,- Project project, PullRequest request, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ private Predicate[] getPredicates(Project project, io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,+ PullRequest request, Root<CodeComment> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (request != null) {Join<?, ?> relations = root.join(CodeCommentQueryConstants.ATTR_RELATIONS, JoinType.INNER);@@ -245,19 +245,19 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment} else {predicates.add(builder.equal(root.get(CodeCommentQueryConstants.ATTR_PROJECT), project));}- if (criteria != null)- predicates.add(criteria.getPredicate(root, builder, user));+ if (criteria != null)+ predicates.add(criteria.getPredicate(root, builder));return predicates.toArray(new Predicate[0]);}- private CriteriaQuery<CodeComment> buildCriteriaQuery(Session session, Project project, PullRequest request,- EntityQuery<CodeComment> commentQuery, User user) {+ private CriteriaQuery<CodeComment> buildCriteriaQuery(Project project, Session session,+ PullRequest request, EntityQuery<CodeComment> commentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);Root<CodeComment> root = query.from(CodeComment.class);query.select(root).distinct(true);- query.where(getPredicates(commentQuery.getCriteria(), project, request, root, builder, user));+ query.where(getPredicates(project, commentQuery.getCriteria(), request, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: commentQuery.getSorts()) {@@ -276,9 +276,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment@Sessional@Override- 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, user);+ public List<CodeComment> query(Project project, PullRequest request,+ EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults) {+ CriteriaQuery<CodeComment> criteriaQuery = buildCriteriaQuery(project, getSession(), request, commentQuery);Query<CodeComment> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -287,13 +287,13 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment@Sessional@Override- public int count(Project project, PullRequest request, User user,+ public int count(Project project, PullRequest request,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);- criteriaQuery.where(getPredicates(commentCriteria, project, request, root, builder, user));+ criteriaQuery.where(getPredicates(project, commentCriteria, request, root, builder));criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 5739fa2892..6e0801a75a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -11,7 +11,6 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;-import org.apache.shiro.SecurityUtils;import org.apache.wicket.util.lang.Objects;import org.eclipse.jgit.lib.ObjectId;@@ -55,10 +54,12 @@ import io.onedev.server.persistence.TransactionManager;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.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.Input;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;@Singleton@@ -228,20 +229,22 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeif ((trigger.getJobNames() == null || PatternSet.fromString(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))&& build.getStatus() == Build.Status.SUCCESSFUL&& (branches == null || project.isCommitOnBranches(commitId, branches))) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true);+ List<IssueCriteria> criterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ criterias.add(new StateCriteria(fromState));+ criterias.add(query.getCriteria());+ query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());Build.push(build);+ User.push(null); // do not support various 'is me' criteriastry {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true);- List<IssueCriteria> criterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- criterias.add(new StateCriteria(fromState));- criterias.add(query.getCriteria());- query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());- for (Issue issue: issueManager.query(project, null, query, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null, null);}} finally {Build.pop();+ User.pop();}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 70adf78708..b4a962530a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -67,8 +67,8 @@ 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.permission.AccessProject;-import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;@@ -180,30 +180,31 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements});}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria,- @Nullable Project project, Root<Issue> root, CriteriaBuilder builder, @Nullable User user) {+ private Predicate[] getPredicates(@Nullable Project project,+ io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Root<Issue> root,+ CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (project != null) {predicates.add(builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), project));- } else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {- Collection<Project> projects = projectManager.getPermittedProjects(user, new AccessProject());+ } else if (!SecurityUtils.isAdministrator()) {+ Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());if (!projects.isEmpty())predicates.add(root.get(IssueQueryConstants.ATTR_PROJECT).in(projects));elsepredicates.add(builder.disjunction());}if (criteria != null)- predicates.add(criteria.getPredicate(root, builder, user));+ predicates.add(criteria.getPredicate(root, builder));return predicates.toArray(new Predicate[0]);}- private CriteriaQuery<Issue> buildCriteriaQuery(Session session, @Nullable Project project,- EntityQuery<Issue> issueQuery, @Nullable User user) {+ private CriteriaQuery<Issue> buildCriteriaQuery(@Nullable Project project,+ Session session, EntityQuery<Issue> issueQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Issue> query = builder.createQuery(Issue.class);Root<Issue> root = query.from(Issue.class);- query.where(getPredicates(issueQuery.getCriteria(), project, root, builder, user));+ query.where(getPredicates(project, issueQuery.getCriteria(), root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: issueQuery.getSorts()) {@@ -235,9 +236,10 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(@Nullable Project project, @Nullable User user,- io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {- CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);+ public List<Issue> query(@Nullable Project project,+ io.onedev.server.search.entity.EntityQuery<Issue> issueQuery,+ int firstResult, int maxResults) {+ CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(project, getSession(), issueQuery);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -256,32 +258,32 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public int count(@Nullable Project project, @Nullable User user, IssueCriteria issueCriteria) {+ public int count(@Nullable Project project,IssueCriteria issueCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(getPredicates(issueCriteria, project, root, builder, user));+ criteriaQuery.where(getPredicates(project, issueCriteria, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}@Override- public int count(Milestone milestone, @Nullable User user, @Nullable StateSpec.Category category) {+ public int count(Milestone milestone, @Nullable StateSpec.Category category) {if (category != null) {IssueCriteria criteria = getIssueSetting().getCategoryCriteria(category);if (criteria != null) {List<IssueCriteria> criterias = new ArrayList<>();criterias.add(new MilestoneCriteria(milestone.getName()));criterias.add(criteria);- return count(milestone.getProject(), user, new AndCriteria(criterias));+ return count(milestone.getProject(), new AndCriteria(criterias));} else {return 0;}} else {IssueCriteria criteria = new MilestoneCriteria(milestone.getName());- return count(milestone.getProject(), user, criteria);+ return count(milestone.getProject(), criteria);}}@@ -631,5 +633,6 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements} finally {issuesLock.readLock().unlock();}- }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 7d346aa5ae..0c6233bb54 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -13,7 +13,6 @@ import java.util.Map;import java.util.concurrent.ConcurrentHashMap;import java.util.stream.Collectors;-import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;@@ -79,7 +78,6 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;@@ -447,12 +445,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Sessional@Override- public Collection<Project> getPermittedProjects(@Nullable User user, Permission permission) {+ public Collection<Project> getPermittedProjects(Permission permission) {Collection<Project> projects = new HashSet<>();- if (User.asSubject(user).isPermitted(new SystemAdministration())) {+ if (SecurityUtils.isAdministrator()) {projects.addAll(query());} else {+ User user = SecurityUtils.getUser();if (user != null) {for (Membership membership: user.getMemberships()) {for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations()) {@@ -477,14 +476,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn projects;}- private CriteriaQuery<Project> buildCriteriaQuery(Session session, EntityQuery<Project> projectQuery,- @Nullable User user) {+ private CriteriaQuery<Project> buildCriteriaQuery(Session session, EntityQuery<Project> projectQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Project> query = builder.createQuery(Project.class);Root<Project> root = query.from(Project.class);query.select(root).distinct(true);- query.where(getPredicates(projectQuery.getCriteria(), root, builder, user));+ query.where(getPredicates(projectQuery.getCriteria(), root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: projectQuery.getSorts()) {@@ -502,25 +500,25 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Project> criteria,- Root<Project> root, CriteriaBuilder builder, @Nullable User user) {+ Root<Project> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();- if (!User.asSubject(user).isPermitted(new SystemAdministration())) {- Collection<Long> projectIds = getPermittedProjects(user, new AccessProject())+ if (!SecurityUtils.isAdministrator()) {+ Collection<Long> projectIds = getPermittedProjects(new AccessProject()).stream().map(it->it.getId()).collect(Collectors.toSet());if (!projectIds.isEmpty())predicates.add(root.get(ProjectQueryConstants.ATTR_ID).in(projectIds));elsepredicates.add(builder.disjunction());}- if (criteria != null)- predicates.add(criteria.getPredicate(root, builder, user));+ if (criteria != null)+ predicates.add(criteria.getPredicate(root, builder));return predicates.toArray(new Predicate[0]);}@Sessional@Override- public List<Project> query(User user, EntityQuery<Project> projectQuery, int firstResult, int maxResults) {- CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(getSession(), projectQuery, user);+ public List<Project> query(EntityQuery<Project> projectQuery, int firstResult, int maxResults) {+ CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(getSession(), projectQuery);Query<Project> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -529,12 +527,12 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Sessional@Override- public int count(User user, io.onedev.server.search.entity.EntityCriteria<Project> projectCriteria) {+ public int count(io.onedev.server.search.entity.EntityCriteria<Project> projectCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Project> root = criteriaQuery.from(Project.class);- criteriaQuery.where(getPredicates(projectCriteria, root, builder, user));+ criteriaQuery.where(getPredicates(projectCriteria, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex f19c889971..9dd9fe2043 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -123,7 +123,6 @@ import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;@@ -952,32 +951,33 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreturn addedContributions;}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,- @Nullable Project targetProject, @Nullable User user, Root<PullRequest> root, CriteriaBuilder builder) {+ private Predicate[] getPredicates(@Nullable Project targetProject,+ io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,+ Root<PullRequest> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (targetProject != null) {predicates.add(builder.equal(root.get("targetProject"), targetProject));- } else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {- Collection<Project> projects = projectManager.getPermittedProjects(user, new ReadCode());+ } else if (!SecurityUtils.isAdministrator()) {+ Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());if (!projects.isEmpty())predicates.add(root.get(PullRequestQueryConstants.ATTR_TARGET_PROJECT).in(projects));elsepredicates.add(builder.disjunction());}- if (criteria != null)- predicates.add(criteria.getPredicate(root, builder, user));+ if (criteria != null)+ predicates.add(criteria.getPredicate(root, builder));return predicates.toArray(new Predicate[0]);}private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, @Nullable Project targetProject,- User user, EntityQuery<PullRequest> requestQuery) {+ EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);Root<PullRequest> root = query.from(PullRequest.class);query.select(root).distinct(true);- query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, root, builder));+ query.where(getPredicates(targetProject, requestQuery.getCriteria(), root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: requestQuery.getSorts()) {@@ -999,9 +999,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public List<PullRequest> query(@Nullable Project targetProject, @Nullable User user,+ public List<PullRequest> query(@Nullable Project targetProject,EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {- CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);Query<PullRequest> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);@@ -1010,13 +1010,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public int count(@Nullable Project targetProject, @Nullable User user,+ public int count(@Nullable Project targetProject,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);- criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, root, builder));+ criteriaQuery.where(getPredicates(targetProject, requestCriteria, root, builder));criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex a13953e405..2782f6512d 100644--- a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -70,7 +70,7 @@ public class BoardSpec implements Serializable {}@Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")- @IssueQuery+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)@Nullablepublic String getBaseQuery() {return baseQuery;@@ -82,7 +82,7 @@ public class BoardSpec implements Serializable {@Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "+ "Backlog issues are those not associating with any milestones")- @IssueQuery+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)@Nullablepublic String getBacklogBaseQuery() {return backlogBaseQuery;diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex 51143d6d91..631e7421d6 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -74,7 +74,7 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {@Editable(order=300, description="Specify an issue query to filter issues eligible for this transition."+ "This query will be combined with 'from states' criteria of this transition")- @IssueQuery+ @IssueQuery(withCurrentUserCriteria = false, withCurrentBuildCriteria = true)@NotEmptypublic String getIssueQuery() {return issueQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex d10adde1cd..0a0c5d25b2 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -702,6 +702,10 @@ public class Build extends AbstractEntity implements Referenceable {}}+ public String getFQN() {+ return getProject().getName() + "#" + getNumber();+ }+public Collection<String> getOnBranches() {CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);Collection<ObjectId> descendants = commitInfoManager.getDescendants(diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 99bb1e5441..24752a7a74 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -505,5 +505,9 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStpublic Project getAttachmentProject() {return getProject();}++ public String getFQN() {+ return getProject() + "#" + getNumber();+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex cd471c1650..f77c009e53 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -868,4 +868,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn getTargetProject();}+ public String getFQN() {+ return getTargetProject() + "#" + getNumber();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 8aafb0b0fa..c3f083485f 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.LinkedHashMap;import java.util.LinkedHashSet;+import java.util.Stack;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -15,7 +16,6 @@ import javax.persistence.Lob;import javax.persistence.OneToMany;import javax.persistence.Table;-import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationInfo;import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.subject.SimplePrincipalCollection;@@ -38,6 +38,7 @@ import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.validation.annotation.UserName;import io.onedev.server.util.watch.QuerySubscriptionSupport;@@ -55,7 +56,16 @@ public class User extends AbstractEntity implements AuthenticationInfo {public static final Long ROOT_ID = 1L;- @Column(unique=true, nullable=false)+ private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {++ @Override+ protected Stack<User> initialValue() {+ return new Stack<User>();+ }++ };++ @Column(unique=true, nullable=false)private String name;@Column(length=1024, nullable=false)@@ -477,4 +487,20 @@ public class User extends AbstractEntity implements AuthenticationInfo {return groups;}+ public static void push(User user) {+ stack.get().push(user);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static User get() {+ if (!stack.get().isEmpty())+ return stack.get().peek();+ else+ return SecurityUtils.getUser();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.javaindex a0dd46a320..2597cae9ce 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java@@ -34,7 +34,7 @@ public class NamedBuildQuery implements NamedQuery {}@Editable- @BuildQuery+ @BuildQuery(withCurrentUserCriteria = true)@NotEmpty@Overridepublic String getQuery() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javaindex 7d2f956d3b..049a186c5b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java@@ -29,7 +29,7 @@ public class ProjectBuildSetting implements Serializable {@Editable(description="Specify builds to preserve. OneDev will run every night to remove builds not matching "+ "query specified here")- @BuildQuery+ @BuildQuery(withCurrentUserCriteria = false)@NotEmptypublic String getBuildsToPreserve() {return buildsToPreserve;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.javaindex 7ae589a45a..b7a71e21ad 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java@@ -16,7 +16,7 @@ public class GlobalProjectSetting implements Serializable {public GlobalProjectSetting() {namedQueries.add(new NamedProjectQuery("All projects", "all"));- namedQueries.add(new NamedProjectQuery("My projects", "\"Owner\" is me"));+ namedQueries.add(new NamedProjectQuery("My projects", "owned by me"));}public List<NamedProjectQuery> getNamedQueries() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 696e1d6ca2..dbe6a2324f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -35,7 +35,7 @@ public class NamedIssueQuery implements NamedQuery {}@Editable- @IssueQuery+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)@NotEmpty@Overridepublic String getQuery() {diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex bfcfdad196..dff95daa40 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -9,6 +9,9 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;@@ -25,6 +28,8 @@ import io.onedev.server.search.entity.build.BuildQuery;@Singletonpublic class BuildNotificationManager {+ private static final Logger logger = LoggerFactory.getLogger(BuildNotificationManager.class);+private final MailManager mailManager;private final UrlManager urlManager;@@ -89,12 +94,18 @@ public class BuildNotificationManager {for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {User user = entry.getKey();for (String queryString: entry.getValue()) {+ User.push(user);try {- if (BuildQuery.parse(event.getProject(), queryString).matches(build, user)) {+ if (BuildQuery.parse(event.getProject(), queryString).matches(build)) {notifyEmails.add(user.getEmail());break;}} catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}}}@@ -114,12 +125,18 @@ public class BuildNotificationManager {for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {User user = entry.getKey();for (String queryString: entry.getValue()) {+ User.push(user);try {- if (BuildQuery.parse(null, queryString).matches(build, user)) {+ if (BuildQuery.parse(null, queryString).matches(build)) {notifyEmails.add(user.getEmail());break;}} catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}}}diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex 5be2e52fc1..012ef2c2c7 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -11,6 +11,8 @@ import javax.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.entitymanager.UrlManager;@@ -20,11 +22,14 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.search.commit.CommitQuery;@Singletonpublic class CommitNotificationManager {+ private static final Logger logger = LoggerFactory.getLogger(CommitNotificationManager.class);+private final MailManager mailManager;private final UrlManager urlManager;@@ -63,12 +68,18 @@ public class CommitNotificationManager {for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {User user = entry.getKey();for (String queryString: entry.getValue()) {+ User.push(user);try {- if (CommitQuery.parse(event.getProject(), queryString).matches(event, user)) {+ if (CommitQuery.parse(project, queryString).matches(event)) {notifyEmails.add(user.getEmail());break;}} catch (Exception e) {+ String message = String.format("Error processing commit subscription (user: %s, project: %s, commit: %s, query: %s)",+ user.getName(), project.getName(), event.getNewCommitId().name(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}}}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.javaindex ab0aec9ad7..f59f4afa10 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java@@ -9,7 +9,6 @@ import com.google.common.base.Preconditions;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;public class AfterCriteria extends CommitCriteria {@@ -23,11 +22,6 @@ public class AfterCriteria extends CommitCriteria {this.values = values;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {for (String value: values)@@ -35,7 +29,7 @@ public class AfterCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);for (String value: values) {if (!commit.getCommitterIdent().getWhen().after(DateUtils.parseRelaxed(value)))diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.javaindex a26da42f68..f32f594054 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java@@ -25,15 +25,6 @@ public class AuthorCriteria extends CommitCriteria {this.values = values;}- @Override- public boolean needsLogin() {- for (String value: values) {- if (value == null) // authored by me- return true;- }- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {for (String value: values) {@@ -49,11 +40,14 @@ public class AuthorCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);+ String authorEmail = commit.getAuthorIdent().getEmailAddress();for (String value: values) {if (value == null) { // authored by me- if (user.getEmail().equals(commit.getAuthorIdent().getEmailAddress()))+ if (User.get() == null)+ throw new OneException("Please login to perform this query");+ else if (User.get().getEmail().equals(authorEmail))return true;} else {if (matches("*" + value + "*", commit.getAuthorIdent()))diff --git a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.javaindex d2249455e1..92c2e260bb 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java@@ -9,7 +9,6 @@ import com.google.common.base.Preconditions;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;public class BeforeCriteria extends CommitCriteria {@@ -23,11 +22,6 @@ public class BeforeCriteria extends CommitCriteria {this.values = values;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {for (String value: values)@@ -35,7 +29,7 @@ public class BeforeCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);for (String value: values) {if (!commit.getCommitterIdent().getWhen().before(DateUtils.parseRelaxed(value)))diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.javaindex 2d7b573a21..109591abb1 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java@@ -8,7 +8,6 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;-import io.onedev.server.model.User;public abstract class CommitCriteria implements Serializable {@@ -19,10 +18,8 @@ public abstract class CommitCriteria implements Serializable {return WildcardUtils.matchString(value, formatted);}- public abstract boolean needsLogin();-public abstract void fill(Project project, RevListCommand command);- public abstract boolean matches(RefUpdated event, User user);+ public abstract boolean matches(RefUpdated event);}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex dd86fa687e..36e054e76d 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -28,7 +28,6 @@ import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;public class CommitQuery implements Serializable {@@ -144,18 +143,14 @@ public class CommitQuery implements Serializable {return new CommitQuery(criterias);}-- public boolean needsLogin() {- return criterias.stream().anyMatch(it->it.needsLogin());- }private static String getValue(TerminalNode valueNode) {return StringUtils.unescape(FenceAware.unfence(valueNode.getText()));}- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {if (!event.getNewCommitId().equals(ObjectId.zeroId()))- return criterias.stream().allMatch(it->it.matches(event, user));+ return criterias.stream().allMatch(it->it.matches(event));elsereturn false;}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.javaindex 1e44e75656..d889f41cc8 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java@@ -25,15 +25,6 @@ public class CommitterCriteria extends CommitCriteria {this.values = values;}- @Override- public boolean needsLogin() {- for (String value: values) {- if (value == null) // committed by me- return true;- }- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {for (String value: values) {@@ -49,11 +40,14 @@ public class CommitterCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);+ String committerEmail = commit.getCommitterIdent().getEmailAddress();for (String value: values) {if (value == null) { // committed by me- if (user.getEmail().equals(commit.getCommitterIdent().getEmailAddress()))+ if (User.get() == null)+ throw new OneException("Please login to perform this query");+ else if (User.get().getEmail().equals(committerEmail))return true;} else {if (matches("*" + value + "*", commit.getCommitterIdent()))diff --git a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.javaindex eb55e1564f..0485d37c57 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java@@ -10,7 +10,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+public class MessageCriteria extends CommitCriteria {@@ -23,11 +23,6 @@ public class MessageCriteria extends CommitCriteria {this.values = values;}- @Override- public boolean needsLogin() {- return false;- }-public List<String> getValues() {return values;}@@ -39,7 +34,7 @@ public class MessageCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {RevCommit commit = event.getProject().getRevCommit(event.getNewCommitId(), true);for (String value: values) {if (WildcardUtils.matchString("*" + value + "*", commit.getFullMessage()))diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.javaindex 15dc00674a..e0dd26f57b 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java@@ -15,7 +15,7 @@ import io.onedev.server.event.RefUpdated;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;+public class PathCriteria extends CommitCriteria {@@ -32,11 +32,6 @@ public class PathCriteria extends CommitCriteria {return values;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {for (String value: values)@@ -44,7 +39,7 @@ public class PathCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {Project project = event.getProject();RevCommit commit = project.getRevCommit(event.getNewCommitId(), true);diff --git a/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.javaindex 0e0ce19c16..7eb97a4565 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java@@ -11,7 +11,6 @@ import com.google.common.base.Preconditions;import io.onedev.server.event.RefUpdated;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.Revision.Scope;public class RevisionCriteria extends CommitCriteria {@@ -25,11 +24,6 @@ public class RevisionCriteria extends CommitCriteria {this.revisions = revisions;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic void fill(Project project, RevListCommand command) {boolean ranged = false;@@ -52,7 +46,7 @@ public class RevisionCriteria extends CommitCriteria {}@Override- public boolean matches(RefUpdated event, User user) {+ public boolean matches(RefUpdated event) {List<Revision> untilRevisions = revisions.stream().filter(it->it.getScope() != Scope.SINCE).collect(Collectors.toList());if (!untilRevisions.isEmpty()) {for (Revision revision: untilRevisions) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.javaindex ea79493e16..3c70988303 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.User;+public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -21,31 +21,22 @@ public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder, user));+ predicates.add(criteria.getPredicate(root, builder));return builder.and(predicates.toArray(new Predicate[0]));}@Override- public boolean matches(T entity, User user) {+ public boolean matches(T entity) {for (EntityCriteria<T> criteria: criterias) {- if (!criteria.matches(entity, user))+ if (!criteria.matches(entity))return false;}return true;}- @Override- public boolean needsLogin() {- for (EntityCriteria<T> criteria: criterias) {- if (criteria.needsLogin())- return true;- }- return false;- }-@Overridepublic String toString() {StringBuilder builder = new StringBuilder();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.javaindex 08e64fc7a7..0d9b029618 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java@@ -5,7 +5,6 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;-import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -14,7 +13,6 @@ import javax.persistence.criteria.Root;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.RangeBuilder;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.User;public abstract class EntityCriteria<T extends AbstractEntity> implements Serializable {@@ -22,11 +20,9 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serialpublic static final int IN_CLAUSE_LIMIT = 1000;- public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder, @Nullable User user);+ public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder);- public abstract boolean matches(T entity, @Nullable User user);-- public abstract boolean needsLogin();+ public abstract boolean matches(T entity);protected Predicate inManyValues(CriteriaBuilder builder, Path<Long> attribute, Collection<Long> inValues,Collection<Long> allValues) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 9de4bfae24..d898311d44 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -174,12 +174,8 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializathrow new OneException("Unable to find milestone: " + value);}- public boolean needsLogin() {- return getCriteria() != null && getCriteria().needsLogin();- }-- public boolean matches(T entity, User user) {- return getCriteria() == null || getCriteria().matches(entity, user);+ public boolean matches(T entity) {+ return getCriteria() == null || getCriteria().matches(entity);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.javaindex 389bc12414..31f87aa574 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java@@ -5,7 +5,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.User;public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -18,18 +17,13 @@ public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {- return criteria.getPredicate(root, builder, user).not();+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ return criteria.getPredicate(root, builder).not();}@Override- public boolean matches(T entity, User user) {- return !criteria.matches(entity, user);- }-- @Override- public boolean needsLogin() {- return criteria.needsLogin();+ public boolean matches(T entity) {+ return !criteria.matches(entity);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.javaindex 05914472fc..22f74cca04 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.User;+public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -21,26 +21,17 @@ public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder, user));+ predicates.add(criteria.getPredicate(root, builder));return builder.or(predicates.toArray(new Predicate[0]));}@Override- public boolean matches(T entity, User user) {- for (EntityCriteria<T> criteria: criterias) {- if (criteria.matches(entity, user))- return true;- }- return false;- }-- @Override- public boolean needsLogin() {+ public boolean matches(T entity) {for (EntityCriteria<T> criteria: criterias) {- if (criteria.needsLogin())+ if (criteria.matches(entity))return true;}return false;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.javaindex e6a52a16f5..2bc4081487 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java@@ -7,13 +7,21 @@ import java.util.Optional;import javax.annotation.Nullable;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;+public abstract class QueryWatchBuilder<T extends AbstractEntity> {+ private static final Logger logger = LoggerFactory.getLogger(QueryWatchBuilder.class);+private final Map<String, Optional<EntityQuery<T>>> parsedQueries = new HashMap<>();private final Map<User, Boolean> watches = new HashMap<>();@@ -42,19 +50,37 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {private boolean matches(@Nullable NamedQuery namedQuery, User user) {if (namedQuery != null) {- Optional<EntityQuery<T>> entityQuery = parsedQueries.get(namedQuery.getQuery());- if (entityQuery == null) {- try {- entityQuery = Optional.of(parse(namedQuery.getQuery()));- } catch (Exception e) {- entityQuery = Optional.empty();+ User.push(user);+ try {+ Optional<EntityQuery<T>> entityQuery = parsedQueries.get(namedQuery.getQuery());+ if (entityQuery == null) {+ try {+ entityQuery = Optional.of(parse(namedQuery.getQuery()));+ } catch (Exception e) {+ entityQuery = Optional.empty();+ }+ parsedQueries.put(namedQuery.getQuery(), entityQuery);+ }+ return entityQuery.isPresent() && entityQuery.get().matches(getEntity());+ } catch (Exception e) {+ String message;+ if (getEntity() instanceof Issue) {+ Issue issue = (Issue) getEntity();+ message = String.format("Error processing watches (user: %s, issue: %s, query: %s)",+ user.getName(), issue.getFQN(), namedQuery.getQuery());+ } else if (getEntity() instanceof PullRequest) {+ PullRequest request = (PullRequest) getEntity();+ message = String.format("Error processing watches (user: %s, pull request: %s, query: %s)",+ user.getName(), request.getFQN(), namedQuery.getQuery());+ } else {+ throw new RuntimeException("Unexpected watch entity type: " + getEntity().getClass());}- parsedQueries.put(namedQuery.getQuery(), entityQuery);+ logger.error(message, e);+ } finally {+ User.pop();}- return entityQuery.isPresent() && entityQuery.get().matches(getEntity(), user);- } else {- return false;- }+ }+ return false;}protected abstract T getEntity();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javaindex 810d7a5d2c..841983022f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java@@ -11,7 +11,7 @@ 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.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.and(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), request.getTargetProject()),@@ -38,16 +38,11 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getProject().equals(request.getTargetProject())&& build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request));}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.javaindex 2f1faed727..224ef8eb5a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -14,20 +14,15 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {return builder.isNotEmpty(root.get(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS));}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return !build.getPullRequestBuilds().isEmpty();}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequests);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.javaindex b92b4b4715..9551fd3c75 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -27,21 +28,16 @@ public class CancelledByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<User> attribute = root.get(BuildQueryConstants.ATTR_CANCELLER);return builder.equal(attribute, this.user);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return Objects.equals(build.getCanceller(), this.user);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex 526e90275e..f609f39f72 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -15,26 +16,21 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<User> attribute = root.get(BuildQueryConstants.ATTR_CANCELLER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(Build build, User user) {- if (user != null)- return user.equals(build.getCanceller());+ public boolean matches(Build build) {+ if (User.get() != null)+ return User.get().equals(build.getCanceller());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex c192d096c2..605b0122e2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class CancelledCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.CANCELLED);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.CANCELLED;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Cancelled);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.javaindex 6e06e53c6f..7de9e99fb5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java@@ -9,7 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -27,7 +27,7 @@ public class CommitCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> projectAttribute = BuildQuery.getPath(root, BuildQueryConstants.ATTR_PROJECT);Path<?> commitAttribute = BuildQuery.getPath(root, BuildQueryConstants.ATTR_COMMIT);return builder.and(@@ -36,15 +36,10 @@ public class CommitCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getProject().equals(project) && build.getCommitHash().equals(commitId.name());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_COMMIT) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(commitId.name());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.javaindex 161227d8b4..383efc0c5f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildDependence;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.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -29,13 +29,13 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_DEPENDENTS, JoinType.LEFT);return builder.equal(join.get(BuildDependence.ATTR_DEPENDENT), build);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {for (BuildDependence dependence: this.build.getDependencies()) {if (dependence.getDependency().equals(build))return true;@@ -43,11 +43,6 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.javaindex c9dc915568..c0db8ee772 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildDependence;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.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -29,13 +29,13 @@ public class DependsOnCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_DEPENDENCIES, JoinType.LEFT);return builder.equal(join.get(BuildDependence.ATTR_DEPENDENCY), build);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {for (BuildDependence dependence: this.build.getDependents()) {if (dependence.getDependent().equals(build))return true;@@ -43,11 +43,6 @@ public class DependsOnCriteria extends EntityCriteria<Build> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.javaindex 701eb6600d..465f1d8968 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class FailedCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.FAILED);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.FAILED;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Failed);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.javaindex f694fa1d30..4bd0207e18 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(BuildQueryConstants.ATTR_FINISH_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class FinishDateCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (operator == BuildQueryLexer.IsBefore)return build.getFinishDate().before(date);elsereturn build.getFinishDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_FINISH_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 4c58b79125..52f427de11 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -18,7 +18,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;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.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -46,7 +46,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(BuildQueryConstants.ATTR_ID);Project project = issue.getProject();Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());@@ -61,7 +61,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (build.getProject().equals(issue.getProject())) {Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(build.getProject(), issue.getNumber());for (ObjectId commit: fixCommits) {@@ -73,11 +73,6 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.FixedIssue) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex 701c1e487f..6039b7b504 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -22,22 +22,17 @@ public class JobCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.get(BuildQueryConstants.ATTR_JOB);String normalized = jobName.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return WildcardUtils.matchString(jobName.toLowerCase(), build.getJobName().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_JOB) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.javaindex 69d6d7cd04..90ff246803 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;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.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;@@ -31,7 +31,7 @@ public class NumberCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(BuildQueryConstants.ATTR_NUMBER);Predicate numberPredicate;if (operator == BuildQueryLexer.Is)@@ -46,7 +46,7 @@ public class NumberCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (build.getProject().equals(number.getProject())) {if (operator == BuildQueryLexer.Is)return build.getNumber() == number.getNumber();@@ -59,11 +59,6 @@ public class NumberCriteria extends EntityCriteria<Build> {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_NUMBER) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.javaindex 42ab44435e..eaea6399b0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -28,7 +28,7 @@ public class ParamCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);return builder.and(builder.equal(join.get(BuildParam.ATTR_NAME), name),@@ -36,7 +36,7 @@ public class ParamCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {List<String> paramValues = build.getParamMap().get(name);if (paramValues == null || paramValues.isEmpty())return value == null;@@ -44,11 +44,6 @@ public class ParamCriteria extends EntityCriteria<Build> {return paramValues.contains(value);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(name) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.javaindex 5600922fec..870910709e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class PendingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.PENDING);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.PENDING;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Pending);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.javaindex fd7773e907..cddc83b78d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.util.query.ProjectQueryConstants;@@ -24,7 +24,7 @@ public class ProjectCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.join(BuildQueryConstants.ATTR_PROJECT, JoinType.INNER).get(ProjectQueryConstants.ATTR_NAME);@@ -33,16 +33,11 @@ public class ProjectCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return WildcardUtils.matchString(projectName.toLowerCase(),build.getProject().getName().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_PROJECT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.javaindex b7a83a2572..660975cfbc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(BuildQueryConstants.ATTR_QUEUEING_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (operator == BuildQueryLexer.IsBefore)return build.getPendingDate().before(date);elsereturn build.getPendingDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_QUEUEING_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javaindex cadb33dd6e..857c66c9a0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -11,7 +11,7 @@ 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.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.and(@@ -40,16 +40,11 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getProject().equals(request.getTargetProject())&& build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request) && it.isRequired());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.javaindex 5283e4619e..dbfca71f0c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -17,21 +17,16 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getPullRequestBuilds().stream().anyMatch(it->it.isRequired());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequests);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.javaindex c27fe8bbd7..48a395f62d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class RunningCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.RUNNING);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.RUNNING;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Running);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.javaindex 2ed1810502..1d7e677195 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(BuildQueryConstants.ATTR_RUNNING_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class RunningDateCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (operator == BuildQueryLexer.IsBefore)return build.getRunningDate().before(date);elsereturn build.getRunningDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_RUNNING_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.javaindex f7c5c9cb38..ee164fc8c7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -30,7 +30,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(BuildQueryConstants.ATTR_SUBMIT_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {if (operator == BuildQueryLexer.IsBefore)return build.getSubmitDate().before(date);elsereturn build.getSubmitDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_SUBMIT_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.javaindex b2a5d92340..ca71af19a1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -27,21 +28,16 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<User> attribute = root.get(BuildQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, this.user);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return Objects.equals(build.getSubmitter(), this.user);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + BuildQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 33f0fb470a..52cfca28fd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -15,26 +16,21 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<User> attribute = root.get(BuildQueryConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(Build build, User user) {- if (user != null)- return user.equals(build.getSubmitter());+ public boolean matches(Build build) {+ if (User.get() != null)+ return User.get().equals(build.getSubmitter());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex 904b88824f..7c8c7c2f87 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.SUCCESSFUL);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.SUCCESSFUL;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Successful);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.javaindex b730c49d72..1ba13ff335 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class TimedOutCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.TIMED_OUT);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.TIMED_OUT;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.TimedOut);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javaindex f38a83e7e5..a20ccdc358 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -22,23 +22,18 @@ public class VersionCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.get(BuildQueryConstants.ATTR_VERSION);String normalized = value.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {String version = build.getVersion();return version != null && WildcardUtils.matchString(value.toLowerCase(), version.toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.quote(BuildQueryConstants.FIELD_VERSION) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javaindex e8bf72912e..83c6fdff5e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -15,21 +15,16 @@ public class WaitingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.WAITING);}@Override- public boolean matches(Build build, User user) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.WAITING;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return BuildQuery.getRuleName(BuildQueryLexer.Waiting);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index ca76118540..3ebff00eb2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -7,7 +7,7 @@ query;criteria- : CreatedByMe #OperatorCriteria+ : operator=CreatedByMe #OperatorCriteria| operator=(CreatedBy|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteriadiff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.javaindex cc0875ee98..2446f95bd7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -22,22 +22,17 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(CodeCommentQueryConstants.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {String content = comment.getContent();return WildcardUtils.matchString("*" + value.toLowerCase() + "*", content);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CONTENT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.javaindex 6e909cdc25..e5ccc3f920 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -29,7 +29,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(CodeCommentQueryConstants.ATTR_CREATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);@@ -38,18 +38,13 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {if (operator == CodeCommentQueryLexer.IsBefore)return comment.getCreateDate().before(value);elsereturn comment.getCreateDate().after(value);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CREATE_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.javaindex a736083a52..4e596cd951 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java@@ -27,21 +27,16 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<User> attribute = root.get(CodeCommentQueryConstants.ATTR_USER);return builder.equal(attribute, this.user);}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {return Objects.equals(comment.getUser(), this.user);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex 3c88e0be09..a20a5a52ee 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -15,26 +16,21 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<?> attribute = root.get(CodeCommentQueryConstants.ATTR_USER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(CodeComment comment, User user) {- if (user != null)- return user.equals(comment.getUser());+ public boolean matches(CodeComment comment) {+ if (User.get() != null)+ return User.get().equals(comment.getUser());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.javaindex b33278a10e..97c665850c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java@@ -9,7 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -27,7 +27,7 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<?> projectAttribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_PROJECT);Path<?> commitAttribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_COMMIT);return builder.and(@@ -36,16 +36,11 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {return comment.getProject().equals(project)&& comment.getMarkPos().getCommit().equals(commitId.name());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.OnCommit) + " " + CodeCommentQuery.quote(commitId.name());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.javaindex c66b257236..8b5c81540d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -22,7 +22,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<String> attribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_PATH);String normalized = value.toLowerCase().replace('*', '%');if (normalized.endsWith("/"))@@ -31,15 +31,10 @@ public class PathCriteria extends EntityCriteria<CodeComment> {}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {return WildcardUtils.matchPath(value.toLowerCase(), comment.getMarkPos().getPath().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_PATH) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.javaindex cfe2cd7fef..c230682824 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -24,7 +24,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(CodeCommentQueryConstants.ATTR_REPLY_COUNT);if (operator == CodeCommentQueryLexer.Is)return builder.equal(attribute, value);@@ -35,7 +35,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {if (operator == CodeCommentQueryLexer.Is)return comment.getReplyCount() == value;else if (operator == CodeCommentQueryLexer.IsLessThan)@@ -44,11 +44,6 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {return comment.getReplyCount() > value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY_COUNT) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(String.valueOf(value));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex 15d79afeda..9b718b8b5d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -25,14 +25,14 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {From<?, ?> join = root.join(CodeCommentQueryConstants.ATTR_REPLIES, JoinType.LEFT);Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {for (CodeCommentReply reply: comment.getReplies()) {String content = reply.getContent();if (WildcardUtils.matchString("*" + value.toLowerCase() + "*", content))@@ -41,11 +41,6 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.javaindex 4fef97494e..1a231dc1bc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -29,7 +29,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {Path<Date> attribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_UPDATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);@@ -38,21 +38,18 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public boolean matches(CodeComment comment, User user) {+ public boolean matches(CodeComment comment) {if (operator == CodeCommentQueryLexer.IsBefore)return comment.getUpdateDate().before(value);elsereturn comment.getUpdateDate().after(value);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_UPDATE_DATE) + " "+ + CodeCommentQuery.getRuleName(operator) + " "+ + CodeCommentQuery.quote(rawValue);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.javaindex 441882d43b..269066ab1c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java@@ -12,7 +12,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;import io.onedev.server.search.entity.AndCriteriaHelper;import io.onedev.server.search.entity.ParensAware;import io.onedev.server.util.ValueSetEdit;@@ -29,18 +28,13 @@ public class AndCriteria extends IssueCriteria implements ParensAware {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- return new AndCriteriaHelper<Issue>(criterias).getPredicate(root, builder, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ return new AndCriteriaHelper<Issue>(criterias).getPredicate(root, builder);}@Override- public boolean matches(Issue issue, User user) {- return new AndCriteriaHelper<Issue>(criterias).matches(issue, user);- }-- @Override- public boolean needsLogin() {- return new AndCriteriaHelper<Issue>(criterias).needsLogin();+ public boolean matches(Issue issue) {+ return new AndCriteriaHelper<Issue>(criterias).matches(issue);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.javaindex 9d671aacf5..1124966894 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;+public class BooleanFieldCriteria extends FieldCriteria {@@ -23,20 +23,15 @@ public class BooleanFieldCriteria extends FieldCriteria {}@Override- public Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ public Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {return builder.equal(field.get(IssueField.ATTR_VALUE), String.valueOf(value));}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return Objects.equals(value, issue.getFieldValue(getFieldName()));}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(String.valueOf(value));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.javaindex a59affb62b..528010746b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -30,23 +30,18 @@ public class BuildFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {return builder.and(builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), build.getProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), build.getNumber()));}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());return issue.getProject().equals(build.getProject()) && Objects.equals(fieldValue, build.getNumber());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 80cfeb8bbd..e2b36aa539 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -15,8 +15,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;@@ -42,7 +42,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {if (allowMultiple) {return builder.equal(field.get(IssueField.ATTR_VALUE), value);} else {@@ -57,7 +57,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {@SuppressWarnings("unchecked")@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());if (allowMultiple) {return ((List<String>)fieldValue).contains(value);@@ -71,11 +71,6 @@ public class ChoiceFieldCriteria extends FieldCriteria {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.javaindex 448d6db4b0..0789743eb2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class CommentCountCriteria extends IssueCriteria {@@ -23,7 +23,7 @@ public class CommentCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(IssueQueryConstants.ATTR_COMMENT_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -34,7 +34,7 @@ public class CommentCountCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (operator == IssueQueryLexer.Is)return issue.getCommentCount() == value;else if (operator == IssueQueryLexer.IsGreaterThan)@@ -43,11 +43,6 @@ public class CommentCountCriteria extends IssueCriteria {return issue.getCommentCount() < value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT_COUNT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex 653fd88243..2487a955e2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class CommentCriteria extends IssueCriteria {@@ -23,14 +23,14 @@ public class CommentCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {From<?, ?> join = root.join(IssueQueryConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(IssueComment.PATH_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {for (IssueComment comment: issue.getComments()) {if (comment.getContent().toLowerCase().contains(value.toLowerCase()))return true;@@ -38,11 +38,6 @@ public class CommentCriteria extends IssueCriteria {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.javaindex f2bbd989c5..993b18b99e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;public class DateFieldCriteria extends FieldCriteria {@@ -29,7 +29,7 @@ public class DateFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {if (operator == IssueQueryLexer.IsBefore)return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), date.getTime());else@@ -37,7 +37,7 @@ public class DateFieldCriteria extends FieldCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Date fieldValue = (Date) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.IsBefore)return fieldValue != null && fieldValue.before(date);@@ -45,11 +45,6 @@ public class DateFieldCriteria extends FieldCriteria {return fieldValue != null && fieldValue.after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.javaindex 7a702cb7b4..8ac0d82387 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class DescriptionCriteria extends IssueCriteria {@@ -21,22 +21,17 @@ public class DescriptionCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(IssueQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {String description = issue.getDescription();return description != null && WildcardUtils.matchString("*" + value.toLowerCase() + "*", description);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_DESCRIPTION) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex aefce8d9db..3a9b3a85a3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -14,8 +14,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.util.query.IssueQueryConstants;public abstract class FieldCriteria extends IssueCriteria {@@ -33,13 +33,13 @@ public abstract class FieldCriteria extends IssueCriteria {}@Override- public final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(IssueQueryConstants.ATTR_FIELDS, JoinType.LEFT);Predicate namePredicate = builder.equal(join.get(IssueField.ATTR_NAME), getFieldName());- return builder.and(namePredicate, getValuePredicate(join, builder, user));+ return builder.and(namePredicate, getValuePredicate(join, builder));}- protected abstract Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user);+ protected abstract Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder);@Overridepublic Collection<String> getUndefinedFields() {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 30f05f98e9..425c806b45 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -10,6 +10,7 @@ import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;@@ -29,15 +30,15 @@ public class FieldOperatorCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {Path<?> attribute = field.get(IssueField.ATTR_VALUE);if (operator == IssueQueryLexer.IsEmpty) {return builder.isNull(attribute);} else if (operator == IssueQueryLexer.IsMe) {- if (user != null)- return builder.equal(attribute, user.getName());+ if (User.get() != null)+ return builder.equal(attribute, User.get().getName());else- return builder.disjunction();+ throw new OneException("Please login to perform this query");} else {Build build = Build.get();if (build != null) {@@ -51,21 +52,21 @@ public class FieldOperatorCriteria extends FieldCriteria {return builder.disjunction();}} else {- return builder.disjunction();+ throw new OneException("No build in query context");}}}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.IsEmpty) {return fieldValue == null;} else if (operator == IssueQueryLexer.IsMe) {- if (user != null)- return Objects.equals(fieldValue, user.getName());+ if (User.get() != null)+ return Objects.equals(fieldValue, User.get().getName());else- return false;+ throw new OneException("Please login to perform this query");} else {Build build = Build.get();if (build != null) {@@ -77,16 +78,11 @@ public class FieldOperatorCriteria extends FieldCriteria {.anyMatch(it->it.equals(fieldValue));}} else {- return false;+ throw new OneException("No build in query context");}}}- @Override- public boolean needsLogin() {- return operator == IssueQueryLexer.IsMe;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex 54d8cd3629..fb26adbce1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -26,7 +26,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAwareCommitId;@@ -79,7 +79,7 @@ public class FixedBetweenCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Set<Long> fixedIssueNumbers = new HashSet<>();Repository repository = project.getRepository();@@ -114,7 +114,7 @@ public class FixedBetweenCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (project.equals(issue.getProject())) {Repository repository = issue.getProject().getRepository();ObjectId mergeBaseId = GitUtils.getMergeBase(repository, firstCommitId, secondCommitId);@@ -138,11 +138,6 @@ public class FixedBetweenCriteria extends IssueCriteria {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return getRuleName(IssueQueryLexer.FixedBetween) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex 32da473885..92f55764da 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -33,7 +33,7 @@ public class FixedInCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();if (!fixedIssueNumbers.isEmpty()) {return builder.and(@@ -45,16 +45,11 @@ public class FixedInCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return issue.getProject().equals(build.getProject())&& build.getFixedIssueNumbers().contains(issue.getNumber());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + IssueQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javaindex 6934a6ab32..571c4fc478 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java@@ -4,35 +4,29 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+public class FixedInCurrentBuildCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Build build = Build.get();- if (build != null)- return new FixedInCriteria(build).getPredicate(root, builder, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ if (Build.get() != null)+ return new FixedInCriteria(Build.get()).getPredicate(root, builder);else- return builder.disjunction();+ throw new OneException("No build in query context");}@Override- public boolean matches(Issue issue, User user) {- Build build = Build.get();- if (build != null)- return new FixedInCriteria(build).matches(issue, user);+ public boolean matches(Issue issue) {+ if (Build.get() != null)+ return new FixedInCriteria(Build.get()).matches(issue);else- return false;- }-- @Override- public boolean needsLogin() {- return false;+ throw new OneException("No build in query context");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.javaindex d96fd1eaed..6377cca100 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -29,23 +29,18 @@ public class IssueFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {return builder.and(builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), issue.getProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), issue.getNumber()));}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());return issue.getProject().equals(this.issue.getProject()) && Objects.equals(fieldValue, this.issue.getNumber());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 586f8a2dc8..861265a756 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -35,7 +35,6 @@ import io.onedev.server.issue.fieldspec.TextField;import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;@@ -404,13 +403,8 @@ public class IssueQuery extends EntityQuery<Issue> {}@Override- public boolean needsLogin() {- return criteria != null && criteria.needsLogin();- }-- @Override- public boolean matches(Issue issue, User user) {- return criteria == null || criteria.matches(issue, user);+ public boolean matches(Issue issue) {+ return criteria == null || criteria.matches(issue);}public static String getRuleName(int rule) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.javaindex 218d74ac2d..e00dd3f9c0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java@@ -11,7 +11,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class MilestoneCriteria extends IssueCriteria {@@ -25,25 +25,20 @@ public class MilestoneCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<String> attribute = root.join(IssueQueryConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.ATTR_NAME);String normalized = milestoneName.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (issue.getMilestone() != null)return WildcardUtils.matchString(milestoneName.toLowerCase(), issue.getMilestone().getName().toLowerCase());elsereturn false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.javaindex 3ce41d8e10..0222dd5a57 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class MilestoneIsEmptyCriteria extends IssueCriteria {@@ -14,20 +14,15 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {return builder.isNull(root.join(IssueQueryConstants.ATTR_MILESTONE, JoinType.LEFT));}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return issue.getMilestone() == null;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.javaindex 6fe8ff3cdf..18da56bd0e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.NotCriteriaHelper;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;@@ -23,18 +23,13 @@ public class NotCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- return new NotCriteriaHelper<Issue>(criteria).getPredicate(root, builder, user);- }-- @Override- public boolean matches(Issue issue, User user) {- return new NotCriteriaHelper<Issue>(criteria).matches(issue, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ return new NotCriteriaHelper<Issue>(criteria).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new NotCriteriaHelper<Issue>(criteria).needsLogin();+ public boolean matches(Issue issue) {+ return new NotCriteriaHelper<Issue>(criteria).matches(issue);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.javaindex def5ed63dc..763a7a57d2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.query.IssueQueryConstants;@@ -30,7 +30,7 @@ public class NumberCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(IssueQueryConstants.ATTR_NUMBER);Predicate numberPredicate;@@ -47,7 +47,7 @@ public class NumberCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (issue.getProject().equals(number.getProject())) {if (operator == IssueQueryLexer.Is)return issue.getNumber() == number.getNumber();@@ -60,11 +60,6 @@ public class NumberCriteria extends IssueCriteria {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_NUMBER) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.javaindex 45fc4a48d3..e6261e4d47 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;+public class NumericFieldCriteria extends FieldCriteria {@@ -27,7 +27,7 @@ public class NumericFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {Path<Integer> attribute = field.get(IssueField.ATTR_ORDINAL);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -38,7 +38,7 @@ public class NumericFieldCriteria extends FieldCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Integer fieldValue = (Integer) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.Is)return Objects.equals(fieldValue, value);@@ -48,11 +48,6 @@ public class NumericFieldCriteria extends FieldCriteria {return fieldValue != null && fieldValue < value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.javaindex 524ec4e0ca..a2b78f7205 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java@@ -12,7 +12,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;import io.onedev.server.util.ValueSetEdit;@@ -29,18 +29,13 @@ public class OrCriteria extends IssueCriteria implements ParensAware {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- return new OrCriteriaHelper<Issue>(criterias).getPredicate(root, builder, user);- }-- @Override- public boolean matches(Issue issue, User user) {- return new OrCriteriaHelper<Issue>(criterias).matches(issue, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ return new OrCriteriaHelper<Issue>(criterias).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new OrCriteriaHelper<Issue>(criterias).needsLogin();+ public boolean matches(Issue issue) {+ return new OrCriteriaHelper<Issue>(criterias).matches(issue);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.javaindex af7a332fbc..92fdcd4710 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.util.query.ProjectQueryConstants;@@ -23,7 +23,7 @@ public class ProjectCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<String> attribute = root.join(IssueQueryConstants.ATTR_PROJECT, JoinType.INNER).get(ProjectQueryConstants.ATTR_NAME);@@ -32,16 +32,11 @@ public class ProjectCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return WildcardUtils.matchString(projectName.toLowerCase(),issue.getProject().getName().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_PROJECT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.javaindex 9a8a9f4007..20fddbd2e5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -30,23 +30,18 @@ public class PullRequestFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {return builder.and(builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), request.getTargetProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), request.getNumber()));}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());return issue.getProject().equals(request.getTargetProject()) && Objects.equals(fieldValue, request.getNumber());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex d2a25acc76..d5e9427289 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -13,7 +13,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class StateCriteria extends IssueCriteria {@@ -27,21 +27,16 @@ public class StateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<?> attribute = root.get(IssueQueryConstants.ATTR_STATE);return builder.equal(attribute, value);}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return issue.getState().equals(value);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic void fill(Issue issue, Set<String> initedLists) {issue.setState(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.javaindex 3a4fcbe83d..01c79b3994 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.User;+public class StringFieldCriteria extends FieldCriteria {@@ -30,7 +30,7 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {Path<String> attribute = field.get(IssueField.ATTR_VALUE);if (operator == IssueQueryLexer.Is)return builder.equal(builder.lower(attribute), value.toLowerCase());@@ -39,7 +39,7 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {String fieldValue = (String) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.Is)return value.equalsIgnoreCase(fieldValue);@@ -47,11 +47,6 @@ public class StringFieldCriteria extends FieldCriteria {return fieldValue != null && fieldValue.toLowerCase().contains(value.toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex dce2745024..200a1ef353 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -29,7 +29,7 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(IssueQueryConstants.ATTR_SUBMIT_DATE);if (operator == IssueQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -38,18 +38,13 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (operator == IssueQueryLexer.IsBefore)return issue.getSubmitDate().before(date);elsereturn issue.getSubmitDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_SUBMIT_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.javaindex be96bae622..d80819bfbb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -26,21 +27,16 @@ public class SubmittedByCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<User> attribute = root.get(IssueQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, this.user);}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {return Objects.equals(issue.getSubmitter(), this.user);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 2e83e0dbc7..95fc6c3986 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.util.query.IssueQueryConstants;@@ -14,26 +15,21 @@ public class SubmittedByMeCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<User> attribute = root.get(IssueQueryConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(Issue issue, User user) {- if (user != null)- return user.equals(issue.getSubmitter());+ public boolean matches(Issue issue) {+ if (User.get() != null)+ return User.get().equals(issue.getSubmitter());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.javaindex 605d462b23..39170a8e0a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class TitleCriteria extends IssueCriteria {@@ -21,22 +21,17 @@ public class TitleCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(IssueQueryConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {String title = issue.getTitle();return title != null && WildcardUtils.matchString("*" + value.toLowerCase() + "*", title);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_TITLE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.javaindex 6757a5b8ee..979de34a62 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -29,7 +29,7 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<Date> attribute = IssueQuery.getPath(root, IssueQueryConstants.ATTR_UPDATE_DATE);if (operator == IssueQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -38,18 +38,13 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (operator == IssueQueryLexer.IsBefore)return issue.getUpdateDate().before(date);elsereturn issue.getUpdateDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return IssueQuery.quote(IssueQueryConstants.FIELD_UPDATE_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.javaindex cc722afee5..181ef1147b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;public class VoteCountCriteria extends IssueCriteria {@@ -23,7 +23,7 @@ public class VoteCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(IssueQueryConstants.ATTR_VOTE_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -34,7 +34,7 @@ public class VoteCountCriteria extends IssueCriteria {}@Override- public boolean matches(Issue issue, User user) {+ public boolean matches(Issue issue) {if (operator == IssueQueryLexer.Is)return issue.getVoteCount() == value;else if (operator == IssueQueryLexer.IsGreaterThan)@@ -43,14 +43,11 @@ public class VoteCountCriteria extends IssueCriteria {return issue.getVoteCount() < value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueQueryConstants.FIELD_VOTE_COUNT) + " "+ + IssueQuery.getRuleName(operator) + " "+ + IssueQuery.quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.javaindex 57cbc0756f..65ac79fcfc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.java@@ -7,7 +7,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.EntityCriteria;import io.onedev.server.search.entity.ParensAware;@@ -23,18 +22,13 @@ public class AndCriteria extends EntityCriteria<Project> implements ParensAware}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- return new AndCriteriaHelper<Project>(criterias).getPredicate(root, builder, user);+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ return new AndCriteriaHelper<Project>(criterias).getPredicate(root, builder);}@Override- public boolean matches(Project project, User user) {- return new AndCriteriaHelper<Project>(criterias).matches(project, user);- }-- @Override- public boolean needsLogin() {- return new AndCriteriaHelper<Project>(criterias).needsLogin();+ public boolean matches(Project project) {+ return new AndCriteriaHelper<Project>(criterias).matches(project);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.javaindex 332e51bdc4..f8680d9b53 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;@@ -22,22 +22,17 @@ public class DescriptionCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(Project project, User user) {+ public boolean matches(Project project) {String description = project.getDescription();return description != null && WildcardUtils.matchString("*" + value.toLowerCase() + "*", description);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return ProjectQuery.quote(ProjectQueryConstants.FIELD_DESCRIPTION) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.javaindex 13bb31e460..a949b20074 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;@@ -23,7 +23,7 @@ public class ForksOfCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Path<String> attribute = root.join(ProjectQueryConstants.ATTR_FORKED_FROM, JoinType.INNER).get(ProjectQueryConstants.ATTR_NAME);@@ -32,7 +32,7 @@ public class ForksOfCriteria extends EntityCriteria<Project> {}@Override- public boolean matches(Project project, User user) {+ public boolean matches(Project project) {Project forkedFrom = project.getForkedFrom();if (forkedFrom != null) {return WildcardUtils.matchString(projectName.toLowerCase(),@@ -42,11 +42,6 @@ public class ForksOfCriteria extends EntityCriteria<Project> {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + ProjectQuery.quote(projectName);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.javaindex 160bf1523b..075edd627f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;@@ -22,23 +22,18 @@ public class NameCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Path<String> attribute = root.get(ProjectQueryConstants.ATTR_NAME);String normalized = value.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(Project project, User user) {+ public boolean matches(Project project) {String name = project.getName();return name != null && WildcardUtils.matchString(value.toLowerCase(), name.toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return ProjectQuery.quote(ProjectQueryConstants.FIELD_NAME) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.javaindex 850920041b..6633f3c6af 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.NotCriteriaHelper;@@ -20,18 +20,13 @@ public class NotCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- return new NotCriteriaHelper<Project>(criteria).getPredicate(root, builder, user);- }-- @Override- public boolean matches(Project project, User user) {- return new NotCriteriaHelper<Project>(criteria).matches(project, user);+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ return new NotCriteriaHelper<Project>(criteria).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new NotCriteriaHelper<Project>(criteria).needsLogin();+ public boolean matches(Project project) {+ return new NotCriteriaHelper<Project>(criteria).matches(project);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.javaindex f14d6ce38e..1cb3dea163 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;@@ -23,18 +23,13 @@ public class OrCriteria extends EntityCriteria<Project> implements ParensAware {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- return new OrCriteriaHelper<Project>(criterias).getPredicate(root, builder, user);- }-- @Override- public boolean matches(Project project, User user) {- return new OrCriteriaHelper<Project>(criterias).matches(project, user);+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ return new OrCriteriaHelper<Project>(criterias).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new OrCriteriaHelper<Project>(criterias).needsLogin();+ public boolean matches(Project project) {+ return new OrCriteriaHelper<Project>(criterias).matches(project);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.javaindex a79c026f9d..c8b7986f24 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java@@ -7,11 +7,12 @@ import javax.persistence.criteria.Root;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.EntityQuery;import io.onedev.server.util.query.ProjectQueryConstants;-public class OwnerCriteria extends EntityCriteria<Project> {+public class OwnedByCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@@ -19,31 +20,25 @@ public class OwnerCriteria extends EntityCriteria<Project> {private final String value;- public OwnerCriteria(String value) {+ public OwnedByCriteria(String value) {user = EntityQuery.getUser(value);this.value = value;}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_OWNER);return builder.equal(attribute, this.user);}@Override- public boolean matches(Project project, User user) {+ public boolean matches(Project project) {return project.getOwner().equals(this.user);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {- return ProjectQuery.quote(ProjectQueryConstants.FIELD_OWNER) + " "- + ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " " + ProjectQuery.quote(value);+ return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + ProjectQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javaindex 95901b9ded..44236b1e74 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java@@ -5,41 +5,36 @@ import javax.persistence.criteria.Expression;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;-public class OwnerIsMeCriteria extends EntityCriteria<Project> {+public class OwnedByMeCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_OWNER);- if (user != null)- return builder.equal(attribute, user);+ if (User.get() != null)+ return builder.equal(attribute, User.get());else- return builder.disjunction();+ throw new OneException("Please login to perform this query");}@Override- public boolean matches(Project project, User user) {- if (user != null)- return user.equals(project.getOwner());+ public boolean matches(Project project) {+ if (User.get() != null)+ return User.get().equals(project.getOwner());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridepublic String toString() {- return ProjectQuery.quote(ProjectQueryConstants.FIELD_OWNER) + " "- + ProjectQuery.getRuleName(ProjectQueryLexer.IsMe);+ return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedByMe);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4index aa5445ca82..1bea253164 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=ForksOf WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=IsMe #FieldOperatorCriteria+ : operator=OwnedByMe #OperatorCriteria+ | operator=(OwnedBy|ForksOf) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|Contains|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -32,8 +32,12 @@ Is: 'is';-IsMe- : 'is' WS+ 'me'+OwnedBy+ : 'owned' WS+ 'by'+ ;++OwnedByMe+ : 'owned' WS+ 'by' WS+ 'me';IsAfterdiff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 19c145fa4f..49b5c412b1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -16,16 +16,15 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneException;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.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.project.ProjectQueryParser.AndCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.CriteriaContext;-import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorValueCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.NotCriteriaContext;+import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorValueCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OrCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OrderContext;@@ -92,16 +91,16 @@ public class ProjectQuery extends EntityQuery<Project> {projectCriteria = new ProjectQueryBaseVisitor<EntityCriteria<Project>>() {@Override- public EntityCriteria<Project> visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted().getText());- int operator = ctx.operator.getType();- checkField(fieldName, operator);- return new OwnerIsMeCriteria();+ public EntityCriteria<Project> visitOperatorCriteria(OperatorCriteriaContext ctx) {+ return new OwnedByMeCriteria();}public EntityCriteria<Project> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());- return new ForksOfCriteria(value);+ if (ctx.operator.getType() == ProjectQueryLexer.ForksOf)+ return new ForksOfCriteria(value);+ else+ return new OwnedByCriteria(value);}@Override@@ -118,10 +117,7 @@ public class ProjectQuery extends EntityQuery<Project> {switch (operator) {case ProjectQueryLexer.Is:- if (fieldName.equals(ProjectQueryConstants.FIELD_NAME))- return new NameCriteria(value);- else- return new OwnerCriteria(value);+ return new NameCriteria(value);case ProjectQueryLexer.Contains:return new DescriptionCriteria(value);case ProjectQueryLexer.IsBefore:@@ -192,11 +188,7 @@ public class ProjectQuery extends EntityQuery<Project> {throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.Is:- if (!fieldName.equals(ProjectQueryConstants.FIELD_OWNER) && !fieldName.equals(ProjectQueryConstants.FIELD_NAME))- throw newOperatorException(fieldName, operator);- break;- case ProjectQueryLexer.IsMe:- if (!fieldName.equals(ProjectQueryConstants.FIELD_OWNER))+ if (!fieldName.equals(ProjectQueryConstants.FIELD_NAME))throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.IsBefore:@@ -208,13 +200,8 @@ public class ProjectQuery extends EntityQuery<Project> {}@Override- public boolean needsLogin() {- return criteria != null && criteria.needsLogin();- }-- @Override- public boolean matches(Project project, User user) {- return criteria == null || criteria.matches(project, user);+ public boolean matches(Project project) {+ return criteria == null || criteria.matches(project);}public static String getRuleName(int rule) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.javaindex 1a1bbca1c5..aec643f56e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.EntityQuery;import io.onedev.server.util.query.ProjectQueryConstants;@@ -30,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {Path<Date> attribute = ProjectQuery.getPath(root, ProjectQueryConstants.ATTR_UPDATE_DATE);if (operator == ProjectQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {}@Override- public boolean matches(Project project, User user) {+ public boolean matches(Project project) {if (operator == ProjectQueryLexer.IsBefore)return project.getUpdateDate().before(date);elsereturn project.getUpdateDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return ProjectQuery.quote(ProjectQueryConstants.FIELD_UPDATE_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.javaindex d4b2b41d1e..cd8756831b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.EntityCriteria;import io.onedev.server.search.entity.ParensAware;@@ -23,18 +23,13 @@ public class AndCriteria extends EntityCriteria<PullRequest> implements ParensAw}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return new AndCriteriaHelper<PullRequest>(criterias).matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new AndCriteriaHelper<PullRequest>(criterias).needsLogin();+ public boolean matches(PullRequest request) {+ return new AndCriteriaHelper<PullRequest>(criterias).matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex 2847e54686..52c6a96f5f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -28,7 +29,7 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -40,17 +41,12 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {PullRequestReview review = request.getReview(this.user);return review != null && review.getExcludeDate() == null && review.getResult() != null&& review.getResult().isApproved();}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex 18c89cd5af..381c704ea7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,39 +20,34 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ if (User.get() != null) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);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 builder.and(- builder.equal(userPath, user),+ builder.equal(userPath, User.get()),builder.isNull(excludeDatePath),builder.equal(approvedPath, true));} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(PullRequest request, User user) {- if (user != null) {- PullRequestReview review = request.getReview(user);+ public boolean matches(PullRequest request) {+ if (User.get() != null) {+ PullRequestReview review = request.getReview(User.get());return review != null&& review.getExcludeDate() == null&& review.getResult() != null&& review.getResult().isApproved();} else {- return false;+ throw new OneException("Please login to perform this query");}}- @Override- public boolean needsLogin() {- return true;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedByMe);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javaindex f638079d25..8913879a3b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -30,7 +30,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,7 +39,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (request.getCloseInfo() != null) {if (operator == PullRequestQueryLexer.IsBefore)return request.getCloseInfo().getDate().before(date);@@ -50,11 +50,6 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_CLOSE_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.javaindex 0c3de8b654..2decf58b8f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -24,7 +24,7 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(PullRequestQueryConstants.ATTR_COMMENT_COUNT);if (operator == PullRequestQueryLexer.Is)return builder.equal(attribute, value);@@ -35,7 +35,7 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (operator == PullRequestQueryLexer.Is)return request.getCommentCount() == value;else if (operator == PullRequestQueryLexer.IsGreaterThan)@@ -44,11 +44,6 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {return request.getCommentCount() < value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT_COUNT) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex 68beeed6ff..10eca3155f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -27,7 +27,7 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);Predicate commentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");@@ -49,7 +49,7 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {for (PullRequestComment comment: request.getComments()) {if (comment.getContent().toLowerCase().contains(value.toLowerCase()))return true;@@ -65,14 +65,11 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "+ + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.javaindex 4a42ca0e91..018f7da560 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,22 +22,17 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(PullRequestQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {String description = request.getDescription();return description != null && WildcardUtils.matchString("*" + value.toLowerCase() + "*", description);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_DESCRIPTION) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.javaindex 6168f53bb5..d44e44943a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -27,19 +28,14 @@ public class DiscardedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_USER);- return builder.equal(attribute, this.user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSubmitter(), this.user);+ return builder.equal(attribute, user);}@Override- public boolean needsLogin() {- return false;+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), user);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.javaindex f21abe146a..d5af85d190 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java@@ -5,8 +5,10 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -15,26 +17,21 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_USER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(PullRequest request, User user) {- if (user != null)- return user.equals(request.getSubmitter());+ public boolean matches(PullRequest request) {+ if (User.get() != null)+ return User.get().equals(request.getSubmitter());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex 12421dc38d..caf3ceabe7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java@@ -5,8 +5,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.search.entity.EntityCriteria;public class DiscardedCriteria extends EntityCriteria<PullRequest> {@@ -18,18 +18,13 @@ public class DiscardedCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria().getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return getCriteria().matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(root, builder);}@Override- public boolean needsLogin() {- return false;+ public boolean matches(PullRequest request) {+ return getCriteria().matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex 792d9c29e6..3d347b2a6c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -19,7 +19,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);@@ -32,7 +32,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {for (PullRequestBuild build: request.getPullRequestBuilds()) {if (build.getBuild().getStatus() == Build.Status.FAILED|| build.getBuild().getStatus() == Build.Status.CANCELLED@@ -43,11 +43,6 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasFailedBuilds);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex b0cb4d3386..d4ca3a9484 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -16,7 +16,7 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<?> requestHead = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);Path<?> merged = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);return builder.and(@@ -25,16 +25,11 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {MergePreview preview = request.getLastMergePreview();return preview != null && preview.getMerged() == null;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasMergeConflicts);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex 115cbcae12..67db151a06 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -19,7 +19,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -31,7 +31,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {if (review.getExcludeDate() == null && review.getResult() == null)return true;@@ -39,11 +39,6 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasPendingReviews);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex 944442dfe5..c569b80ca9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java@@ -13,7 +13,7 @@ import io.onedev.server.OneDev;import io.onedev.server.infomanager.CodeCommentRelationInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAwareCommitId;@@ -37,7 +37,7 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Collection<Long> pullRequestIds = getPullRequestIds();if (!pullRequestIds.isEmpty()) {return builder.and(@@ -53,15 +53,10 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return request.getTargetProject().equals(project) && getPullRequestIds().contains(request.getId());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesCommit) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 645655b7cb..f3cd2105c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -16,7 +16,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -35,7 +35,7 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Collection<Long> pullRequestIds = getPullRequestIds(issue.getProject());if (!pullRequestIds.isEmpty()) {return builder.and(@@ -54,16 +54,11 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return request.getTargetProject().equals(issue.getProject())&& getPullRequestIds(request.getTargetProject()).contains(request.getId());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesIssue) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.javaindex c4b4424595..005ba55e3a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,24 +22,21 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<?> attribute = root.get(PullRequestQueryConstants.ATTR_MERGE_STRATEGY);return builder.equal(attribute, value);}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return request.getMergeStrategy() == value;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_MERGE_STRATEGY) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + PullRequestQuery.quote(value.toString());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.javaindex 64cd5fc0c7..d5663476a9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java@@ -5,8 +5,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.search.entity.EntityCriteria;public class MergedCriteria extends EntityCriteria<PullRequest> {@@ -18,18 +18,13 @@ public class MergedCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria().getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return getCriteria().matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(root, builder);}@Override- public boolean needsLogin() {- return false;+ public boolean matches(PullRequest request) {+ return getCriteria().matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.javaindex 53e62e0170..bea88f8c27 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.NotCriteriaHelper;@@ -20,18 +20,13 @@ public class NotCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return new NotCriteriaHelper<PullRequest>(criteria).matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new NotCriteriaHelper<PullRequest>(criteria).needsLogin();+ public boolean matches(PullRequest request) {+ return new NotCriteriaHelper<PullRequest>(criteria).matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.javaindex ecdc008318..de6aba5ba5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;@@ -31,7 +31,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(PullRequestQueryConstants.ATTR_NUMBER);Predicate numberPredicate;@@ -48,7 +48,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (request.getTargetProject().equals(number.getProject())) {if (operator == PullRequestQueryLexer.Is)return request.getNumber() == number.getNumber();@@ -61,11 +61,6 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_NUMBER) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.javaindex cbf435bab5..e87e6b452d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java@@ -5,7 +5,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;public class OpenCriteria extends EntityCriteria<PullRequest> {@@ -17,18 +17,13 @@ public class OpenCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria().getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return getCriteria().matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(root, builder);}@Override- public boolean needsLogin() {- return false;+ public boolean matches(PullRequest request) {+ return getCriteria().matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.javaindex 64e1f71919..b0b72f30aa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;@@ -23,18 +23,13 @@ public class OrCriteria extends EntityCriteria<PullRequest> implements ParensAwa}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder, user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return new OrCriteriaHelper<PullRequest>(criterias).matches(request, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder);}@Override- public boolean needsLogin() {- return new OrCriteriaHelper<PullRequest>(criterias).needsLogin();+ public boolean matches(PullRequest request) {+ return new OrCriteriaHelper<PullRequest>(criterias).matches(request);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 7b820c039e..9f13fc70a8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -28,7 +29,7 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -40,17 +41,12 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {PullRequestReview review = request.getReview(this.user);return review != null && review.getExcludeDate() == null && review.getResult() != null&& !review.getResult().isApproved();}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex bfca377f22..c8c375cf8c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,39 +20,34 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ if (User.get() != null) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);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 builder.and(- builder.equal(userPath, user),+ builder.equal(userPath, User.get()),builder.isNull(excludeDatePath),builder.equal(approvedPath, false));} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(user);- if (user != null) {+ public boolean matches(PullRequest request) {+ if (User.get() != null) {+ PullRequestReview review = request.getReview(User.get());return review != null&& review.getExcludeDate() == null&& review.getResult() != null&& !review.getResult().isApproved();} else {- return false;+ throw new OneException("Please login to perform this query");}}- @Override- public boolean needsLogin() {- return true;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesByMe);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex 81d4a9115e..dd57adc602 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -19,7 +19,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullRequeprivate static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -31,7 +31,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {if (review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved())return true;@@ -39,11 +39,6 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullRequereturn false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.SomeoneRequestedForChanges);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.javaindex 3d7a720ec7..45971d0245 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,22 +22,17 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.get(PullRequestQueryConstants.ATTR_SOURCE_BRANCH);String normalized = branch.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return WildcardUtils.matchString(branch.toLowerCase(), request.getSourceBranch().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_BRANCH) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.javaindex 9c2d4a72eb..6607fe2b9f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -25,7 +25,7 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.join(PullRequestQueryConstants.ATTR_SOURCE_PROJECT, JoinType.INNER).get(ProjectQueryConstants.ATTR_NAME);@@ -34,7 +34,7 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {Project project = request.getSourceProject();if (project != null) {return WildcardUtils.matchString(projectName.toLowerCase(),@@ -44,11 +44,6 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {}}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_PROJECT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.javaindex b227f1f808..00cf879b21 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,7 +22,7 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<?> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_STATUS);if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))return builder.isNull(attribute);@@ -31,18 +31,13 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))return request.getCloseInfo() == null;elsereturn request.getCloseInfo() != null && request.getCloseInfo().getStatus().name().equalsIgnoreCase(value);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_STATUS) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.javaindex bad65c4510..57ca74720d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -30,7 +30,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMIT_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (operator == PullRequestQueryLexer.IsBefore)return request.getSubmitDate().before(date);elsereturn request.getSubmitDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SUBMIT_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.javaindex cfe798c0ad..cfb120a836 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -27,24 +28,20 @@ public class SubmittedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<User> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMITTER);- return builder.equal(attribute, this.user);- }-- @Override- public boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSubmitter(), this.user);+ return builder.equal(attribute, user);}@Override- public boolean needsLogin() {- return false;+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), user);}@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) ++ " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex 7a409943c9..661131be79 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -15,26 +16,21 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ if (User.get() != null) {Path<?> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ return builder.equal(attribute, User.get());} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(PullRequest request, User user) {- if (user != null)- return user.equals(request.getSubmitter());+ public boolean matches(PullRequest request) {+ if (User.get() != null)+ return User.get().equals(request.getSubmitter());else- return false;- }-- @Override- public boolean needsLogin() {- return true;+ throw new OneException("Please login to perform this query");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.javaindex ace2d17c2e..d2fdb6240d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,22 +22,17 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.get(PullRequestQueryConstants.ATTR_TARGET_BRANCH);String normalized = branch.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return WildcardUtils.matchString(branch.toLowerCase(), request.getTargetBranch().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_BRANCH) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.javaindex 234d763cd4..d79b9bf0d2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.ProjectQueryConstants;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -24,7 +24,7 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.join(PullRequestQueryConstants.ATTR_TARGET_PROJECT, JoinType.INNER).get(ProjectQueryConstants.ATTR_NAME);@@ -33,16 +33,11 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {return WildcardUtils.matchString(projectName.toLowerCase(),request.getTargetProject().getName().toLowerCase());}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_PROJECT) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.javaindex cc0d80f1de..d404123866 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -22,22 +22,17 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Expression<String> attribute = root.get(PullRequestQueryConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {String title = request.getTitle();return title != null && WildcardUtils.matchString("*" + value.toLowerCase() + "*", title);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TITLE) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex 42b71194b6..b991e3dd73 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -28,28 +29,23 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);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 builder.and(- builder.equal(userPath, this.user),+ builder.equal(userPath, user),builder.isNull(excludeDatePath),builder.isNull(approvedPath));}@Override- public boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(this.user);+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(user);return review != null && review.getExcludeDate() == null && review.getResult() == null;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex ef3878c429..c4188d4e94 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.server.OneException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,38 +20,33 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- if (user != null) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ if (User.get() != null) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);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 builder.and(- builder.equal(userPath, user),+ builder.equal(userPath, User.get()),builder.isNull(excludeDatePath),builder.isNull(approvedPath));} else {- return builder.disjunction();+ throw new OneException("Please login to perform this query");}}@Override- public boolean matches(PullRequest request, User user) {- if (user != null) {- PullRequestReview review = request.getReview(user);+ public boolean matches(PullRequest request) {+ if (User.get() != null) {+ PullRequestReview review = request.getReview(User.get());return review != null&& review.getExcludeDate() == null&& review.getResult() == null;} else {- return false;+ throw new OneException("Please login to perform this query");}}- @Override- public boolean needsLogin() {- return true;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedByMe);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex cd4c9ee581..e7407f4077 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -19,7 +19,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);@@ -33,7 +33,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {for (PullRequestBuild build: request.getPullRequestBuilds()) {if (build.getBuild().getStatus() == Build.Status.RUNNING|| build.getBuild().getStatus() == Build.Status.PENDING@@ -44,11 +44,6 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {return false;}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeVerifiedByBuilds);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.javaindex 3e566ac1da..37d9b9744e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -30,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_UPDATE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);@@ -39,18 +39,13 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {}@Override- public boolean matches(PullRequest request, User user) {+ public boolean matches(PullRequest request) {if (operator == PullRequestQueryLexer.IsBefore)return request.getUpdateDate().before(date);elsereturn request.getUpdateDate().after(date);}- @Override- public boolean needsLogin() {- return false;- }-@Overridepublic String toString() {return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_UPDATE_DATE) + " "diff --git a/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.java b/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.javaindex 1b8a97afc9..264e4359fe 100644--- a/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.java@@ -30,7 +30,7 @@ public class ProjectQueryConstants {public static final String ATTR_FORKED_FROM = "forkedFrom";public static final List<String> QUERY_FIELDS =- Lists.newArrayList(FIELD_NAME, FIELD_OWNER, FIELD_DESCRIPTION, FIELD_UPDATE_DATE);+ Lists.newArrayList(FIELD_NAME, FIELD_DESCRIPTION, FIELD_UPDATE_DATE);public static final Map<String, String> ORDER_FIELDS = Maps.newLinkedHashMap(FIELD_NAME, ATTR_NAME,diff --git a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.javaindex fcd2c7b90b..c95fca9d1e 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java@@ -4,7 +4,6 @@ import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneException;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.BuildQuery;@@ -24,14 +23,7 @@ public class BuildQueryValidator implements ConstraintValidator<BuildQuery, Stri} else {Project project = Project.get();try {- io.onedev.server.search.entity.build.BuildQuery buildQuery =- io.onedev.server.search.entity.build.BuildQuery.parse(project, value);- if (buildQuery.needsLogin()) {- String message = this.message;- if (message.length() == 0)- message = "This query needs login which is not supported here";- throw new OneException(message);- }+ io.onedev.server.search.entity.build.BuildQuery.parse(project, value);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex edf9aab4f8..4d8ec2deb2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -28,7 +28,6 @@ import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.BuildQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -39,9 +38,12 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- public BuildQueryBehavior(IModel<Project> projectModel) {+ private final boolean withCurrentUserCriteria;++ public BuildQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria) {super(BuildQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withCurrentUserCriteria = withCurrentUserCriteria;}@Override@@ -144,10 +146,11 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (SecurityUtils.getUser() == null- && (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe)))) {- return null;+ if (!withCurrentUserCriteria) {+ if (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe))) {+ return null;+ }}parseExpect = parseExpect.findExpectByLabel("operator");diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 10cdc8b2f8..8c919bacc2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,12 +1,15 @@package io.onedev.server.web.behavior;import static io.onedev.server.search.entity.EntityQuery.getValue;+import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;import static io.onedev.server.search.entity.issue.IssueQuery.checkField;import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;-import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsCurrent;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsPrevious;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT_COUNT;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_DESCRIPTION;@@ -60,7 +63,6 @@ import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -71,9 +73,16 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- public IssueQueryBehavior(IModel<Project> projectModel) {+ private final boolean withCurrentUserCriteria;++ private final boolean withCurrentBuildCriteria;++ public IssueQueryBehavior(IModel<Project> projectModel,+ boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria) {super(IssueQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withCurrentUserCriteria = withCurrentUserCriteria;+ this.withCurrentBuildCriteria = withCurrentBuildCriteria;}@Override@@ -215,12 +224,17 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (SecurityUtils.getUser() == null- && (suggestedLiteral.equals(getRuleName(IsMe))- || suggestedLiteral.equals(getRuleName(SubmittedByMe)))) {- return null;+ if (!withCurrentUserCriteria) {+ if (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(IsMe)))+ return null;+ }+ if (!withCurrentBuildCriteria) {+ if (suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))+ || suggestedLiteral.equals(getRuleName(IsCurrent))+ || suggestedLiteral.equals(getRuleName(IsPrevious))) {+ return null;+ }}-parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 31c7b3b56d..12c9e22999 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -16,6 +16,7 @@ import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneException;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.search.entity.project.ProjectQueryParser;import io.onedev.server.util.DateUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -49,7 +50,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = ProjectQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- return SuggestionUtils.suggestProjects(matchWith);+ if (operator == ProjectQueryLexer.ForksOf)+ return SuggestionUtils.suggestProjects(matchWith);+ else+ return SuggestionUtils.suggestUsers(matchWith);} else {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());try {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 9d059a3b1f..de2ebdf462 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -1,11 +1,5 @@package io.onedev.server.web.behavior;-import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getRuleName;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ApprovedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.DiscardedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.RequestedForChangesByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.SubmittedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeReviewedByMe;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_NUMBER;import java.util.ArrayList;@@ -32,7 +26,6 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.query.PullRequestQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -145,14 +138,6 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (SecurityUtils.getUser() == null- && (suggestedLiteral.equals(getRuleName(ToBeReviewedByMe))- || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe))- || suggestedLiteral.equals(getRuleName(ApprovedByMe))- || suggestedLiteral.equals(getRuleName(SubmittedByMe))- || suggestedLiteral.equals(getRuleName(DiscardedByMe)))) {- return null;- }parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex d2c063f738..a50950e65c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -14,7 +14,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Response;@@ -59,7 +58,7 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {int count = (page+1) * WebConstants.PAGE_SIZE;Project project = projectModel.getObject();if (project != null) {- List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), term, count);+ List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, term, count);new ResponseFiller<>(response).fill(builds, page, WebConstants.PAGE_SIZE);} else {response.setHasMore(false);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 1d66e686f3..2c9479ca85 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -49,6 +49,7 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.ProjectManager;@@ -58,6 +59,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;+import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;@@ -98,14 +100,7 @@ public abstract class BuildListPanel extends Panel {protected BuildQuery load() {try {BuildQuery additionalQuery = BuildQuery.parse(getProject(), query);- if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {- error("Please login to perform this query");- } else {- if (SecurityUtils.getUser() == null && getBaseQuery().needsLogin())- error("Please login to show builds");- else- return BuildQuery.merge(getBaseQuery(), additionalQuery);- }+ return BuildQuery.merge(getBaseQuery(), additionalQuery);} catch (Exception e) {logger.error("Error parsing build query: " + query, e);error(e.getMessage());@@ -333,7 +328,7 @@ public abstract class BuildListPanel extends Panel {return getProject();}- }));+ }, true));input.add(new AjaxFormComponentUpdatingBehavior("input"){@@ -366,17 +361,26 @@ public abstract class BuildListPanel extends Panel {@Overridepublic Iterator<? extends Build> iterator(long first, long count) {- return getBuildManager().query(getProject(), SecurityUtils.getUser(),- parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ try {+ return getBuildManager().query(getProject(), parsedQueryModel.getObject(),+ (int)first, (int)count).iterator();+ } catch (OneException e) {+ error(e.getMessage());+ return new ArrayList<Build>().iterator();+ }}@Overridepublic long calcSize() {BuildQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- return getBuildManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());- else- return 0;+ if (parsedQuery != null) {+ try {+ return getBuildManager().count(getProject(), parsedQuery.getCriteria());+ } catch (OneException e) {+ error(e.getMessage());+ }+ }+ return 0;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex f0a2f55433..9f7569d9f6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -29,7 +29,6 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.build.ParamValuesLabel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;@@ -63,7 +62,7 @@ public abstract class BuildSidePanel extends Panel {@Overrideprotected List<Build> query(EntityQuery<Build> query, int offset, int count) {- return getBuildManager().query(getProject(), SecurityUtils.getUser(), query, offset, count);+ return getBuildManager().query(getProject(), query, offset, count);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 0fb82beacd..fca26f6a4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;@@ -73,11 +74,7 @@ public abstract class CodeCommentListPanel extends Panel {@Overrideprotected CodeCommentQuery load() {try {- CodeCommentQuery parsedQuery = CodeCommentQuery.parse(getProject(), query);- if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())- error("Please login to perform this query");- else- return parsedQuery;+ return CodeCommentQuery.parse(getProject(), query);} catch (Exception e) {logger.error("Error parsing code comment query: " + query, e);error(e.getMessage());@@ -196,17 +193,26 @@ public abstract class CodeCommentListPanel extends Panel {@Overridepublic Iterator<? extends CodeComment> iterator(long first, long count) {- return getCodeCommentManager().query(getProject(), getPullRequest(), SecurityUtils.getUser(),- parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ try {+ return getCodeCommentManager().query(getProject(), getPullRequest(),+ parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ } catch (OneException e) {+ error(e.getMessage());+ return new ArrayList<CodeComment>().iterator();+ }}@Overridepublic long calcSize() {CodeCommentQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- return getCodeCommentManager().count(getProject(), getPullRequest(), SecurityUtils.getUser(), parsedQuery.getCriteria());- else- return 0;+ if (parsedQuery != null) {+ try {+ return getCodeCommentManager().count(getProject(), getPullRequest(), parsedQuery.getCriteria());+ } catch (OneException e) {+ error(e.getMessage());+ }+ }+ return 0;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 35bf691329..fc8b333867 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -102,14 +102,7 @@ public abstract class CommitListPanel extends Panel {protected CommitQuery load() {try {CommitQuery additionalQuery = CommitQuery.parse(getProject(), query);- if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {- error("Please login to perform this query");- } else {- if (SecurityUtils.getUser() == null && getBaseQuery().needsLogin())- error("Please login to show commits");- else- return CommitQuery.merge(getBaseQuery(), additionalQuery);- }+ return CommitQuery.merge(getBaseQuery(), additionalQuery);} catch (Exception e) {logger.error("Error parsing commit query: " + query, e);error(e.getMessage());diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.javaindex 651cf1fcb5..8a0b6acf58 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java@@ -18,7 +18,6 @@ import io.onedev.commons.utils.ReflectionUtils;import io.onedev.commons.utils.WordUtils;import io.onedev.server.model.AbstractEntity;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@@ -73,7 +72,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(), SecurityUtils.getUser()))+ if (!query.matches(getEntity()))count--;QueryPosition prevPosition = new QueryPosition(getPosition().getQuery(), count, offset);getQueryPositionSupport().navTo(target, entities.get(0), prevPosition);@@ -104,7 +103,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(), SecurityUtils.getUser()))+ if (query.matches(getEntity()))offset++;elsecount--;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 85ef944a6a..4e8074e550 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -99,14 +100,7 @@ public abstract class IssueListPanel extends Panel {protected IssueQuery load() {try {IssueQuery additionalQuery = IssueQuery.parse(getProject(), query, true);- if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {- error("Please login to perform this query");- } else {- if (SecurityUtils.getUser() == null && getBaseQuery().needsLogin())- error("Please login to show issues");- else- return IssueQuery.merge(getBaseQuery(), additionalQuery);- }+ return IssueQuery.merge(getBaseQuery(), additionalQuery);} catch (Exception e) {logger.error("Error parsing issue query: " + query, e);error(e.getMessage());@@ -227,7 +221,7 @@ public abstract class IssueListPanel extends Panel {return getProject();}- }));+ }, true, false));input.add(new AjaxFormComponentUpdatingBehavior("input"){@@ -376,8 +370,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Collection<Project> load() {- return OneDev.getInstance(ProjectManager.class).getPermittedProjects(- SecurityUtils.getUser(), new AccessProject());+ return OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject());}}) {@@ -501,16 +494,26 @@ public abstract class IssueListPanel extends Panel {@Overridepublic Iterator<? extends Issue> iterator(long first, long count) {- return getIssueManager().query(getProject(), SecurityUtils.getUser(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ try {+ return getIssueManager().query(getProject(), parsedQueryModel.getObject(),+ (int)first, (int)count).iterator();+ } catch (OneException e) {+ error(e.getMessage());+ return new ArrayList<Issue>().iterator();+ }}@Overridepublic long calcSize() {IssueQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- return getIssueManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());- else- return 0;+ if (parsedQuery != null) {+ try {+ return getIssueManager().count(getProject(), parsedQuery.getCriteria());+ } catch (OneException e) {+ error(e.getMessage());+ }+ }+ return 0;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 13b905da0c..2389a66d0e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -99,7 +99,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected List<Issue> query(EntityQuery<Issue> query, int offset, int count) {- return getIssueManager().query(getProject(), SecurityUtils.getUser(), query, offset, count);+ return getIssueManager().query(getProject(), query, offset, count);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.javaindex fbeadde6b3..7055a76b4b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java@@ -9,7 +9,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Milestone;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -22,7 +21,7 @@ public abstract class MilestoneCloseLink extends ModalLink {@Overrideprotected Component newContent(String id, ModalPanel modal) {- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), SecurityUtils.getUser(), StateSpec.Category.OPEN) != 0) {+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), StateSpec.Category.OPEN) != 0) {return new ConfirmCloseWithOpenIssuesPanel(id) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.javaindex 0026cc56ca..a876f53ff4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java@@ -8,7 +8,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Milestone;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLinkCssResourceReference;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -22,7 +21,7 @@ public abstract class MilestoneDeleteLink extends ModalLink {@Overrideprotected Component newContent(String id, ModalPanel modal) {- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), SecurityUtils.getUser(), null) != 0) {+ if (OneDev.getInstance(IssueManager.class).count(getMilestone(), null) != 0) {return new ConfirmDeleteWithIssuesPanel(id) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex a482d4571e..d68c7cd752 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -87,7 +87,7 @@ public abstract class CommentInput extends MarkdownEditor {public List<Build> findBuilds(@Nullable Project project, String query, int count) {if (project == null)project = getProject();- return OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), query, count);+ return OneDev.getInstance(BuildManager.class).query(project, query, count);}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 2ee98e545f..599bfee069 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;@@ -74,11 +75,7 @@ public class ProjectListPanel extends Panel {@Overrideprotected ProjectQuery load() {try {- ProjectQuery parsedQuery = ProjectQuery.parse(query);- if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())- error("Please login to perform this query");- else- return parsedQuery;+ return ProjectQuery.parse(query);} catch (Exception e) {logger.error("Error parsing project query: " + query, e);error(e.getMessage());@@ -216,17 +213,25 @@ public class ProjectListPanel extends Panel {@Overridepublic Iterator<? extends Project> iterator(long first, long count) {- return getProjectManager().query(SecurityUtils.getUser(),- parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ try {+ return getProjectManager().query(parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ } catch (OneException e) {+ error(e.getMessage());+ return new ArrayList<Project>().iterator();+ }}@Overridepublic long calcSize() {ProjectQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- return getProjectManager().count(SecurityUtils.getUser(), parsedQuery.getCriteria());- else- return 0;+ if (parsedQuery != null) {+ try {+ return getProjectManager().count(parsedQuery.getCriteria());+ } catch (OneException e) {+ error(e.getMessage());+ }+ }+ return 0;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex cd9deb4279..f8280a41bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;@@ -59,6 +60,7 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.PullRequestQueryBehavior;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.project.selector.ProjectSelector;@@ -86,11 +88,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected PullRequestQuery load() {try {- PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query);- if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())- error("Please login to perform this query");- else- return parsedQuery;+ return PullRequestQuery.parse(getProject(), query);} catch (Exception e) {logger.error("Error parsing pull request query: " + query, e);error(e.getMessage());@@ -251,8 +249,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected Collection<Project> load() {- return OneDev.getInstance(ProjectManager.class).getPermittedProjects(- SecurityUtils.getUser(), new ReadCode());+ return OneDev.getInstance(ProjectManager.class).getPermittedProjects(new ReadCode());}}) {@@ -346,31 +343,30 @@ public abstract class PullRequestListPanel extends Panel {});- SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {-- private Integer count;-- @Override- public void detach() {- count = null;- }+ SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {@Overridepublic Iterator<? extends PullRequest> iterator(long first, long count) {- return getPullRequestManager().query(getProject(), SecurityUtils.getUser(),- parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ try {+ return getPullRequestManager().query(getProject(), parsedQueryModel.getObject(),+ (int)first, (int)count).iterator();+ } catch (OneException e) {+ error(e.getMessage());+ return new ArrayList<PullRequest>().iterator();+ }}@Override- public long size() {- if (count == null) {- PullRequestQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- count = getPullRequestManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());- else- count = 0;+ public long calcSize() {+ PullRequestQuery parsedQuery = parsedQueryModel.getObject();+ if (parsedQuery != null) {+ try {+ return getPullRequestManager().count(getProject(), parsedQuery.getCriteria());+ } catch (OneException e) {+ error(e.getMessage());+ }}- return count;+ return 0;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex 5bdf47e572..d76f0d3ca7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -372,14 +372,8 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {@Overrideprotected List<T> load() {List<T> namedQueries = new ArrayList<>();- for (T namedQuery: getQueries()!=null?getQueries():getDefaultQueries()) {- try {- if (SecurityUtils.getUser() != null || !needsLogin(namedQuery))- namedQueries.add(namedQuery);- } catch (Exception e) {- namedQueries.add(namedQuery);- }- }+ for (T namedQuery: getQueries()!=null?getQueries():getDefaultQueries())+ namedQueries.add(namedQuery);return namedQueries;}@@ -554,8 +548,6 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {protected abstract NamedQueriesBean<T> newNamedQueriesBean();- protected abstract boolean needsLogin(T namedQuery);-protected abstract Link<Void> newQueryLink(String componentId, T namedQuery);@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.javaindex 01b09d4fa9..9aad1a1312 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java@@ -14,6 +14,8 @@ import io.onedev.server.util.validation.BuildQueryValidator;@Retention(RetentionPolicy.RUNTIME)@Constraint(validatedBy=BuildQueryValidator.class)public @interface BuildQuery {+ boolean withCurrentUserCriteria();+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.javaindex b3d36b32a1..217840497d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java@@ -14,6 +14,10 @@ import io.onedev.server.util.validation.IssueQueryValidator;@Retention(RetentionPolicy.RUNTIME)@Constraint(validatedBy=IssueQueryValidator.class)public @interface IssueQuery {+ boolean withCurrentUserCriteria();++ boolean withCurrentBuildCriteria();+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.javaindex 45b74f929e..a8a1e87b30 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java@@ -7,11 +7,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.model.Project;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.BuildQuery;import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")@@ -27,6 +30,8 @@ public class BuildQueryEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();+ BuildQuery buildQuery = Preconditions.checkNotNull(+ descriptor.getPropertyGetter().getAnnotation(BuildQuery.class));input = new TextField<String>("input", getModel());input.add(new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {@@ -35,7 +40,7 @@ public class BuildQueryEditor extends PropertyEditor<String> {return ((ProjectPage) getPage()).getProject();}- }));+ }, buildQuery.withCurrentUserCriteria()));input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.javaindex ffef09a37a..f9aa2ea9ed 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java@@ -7,11 +7,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;+import io.onedev.server.model.Project;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")@@ -27,6 +30,8 @@ public class IssueQueryEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();+ IssueQuery issueQuery = Preconditions.checkNotNull(+ getDescriptor().getPropertyGetter().getAnnotation(IssueQuery.class));input = new TextField<String>("input", getModel());input.add(new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {@@ -38,7 +43,7 @@ public class IssueQueryEditor extends PropertyEditor<String> {return null;}- }));+ }, issueQuery.withCurrentUserCriteria(), issueQuery.withCurrentBuildCriteria()));input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javaindex 12fbe970be..d7681caa9d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.build;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -21,8 +20,6 @@ import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalBuildSetting;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -50,22 +47,10 @@ public class BuildListPage extends LayoutPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getLoginUser() != null) {- for (NamedBuildQuery namedQuery: getLoginUser().getBuildQuerySetting().getUserQueries())- queries.add(namedQuery.getQuery());- }- for (NamedBuildQuery namedQuery: getBuildSetting().getNamedQueries())- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !BuildQuery.parse(null, each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }+ if (getLoginUser() != null && !getLoginUser().getBuildQuerySetting().getUserQueries().isEmpty())+ query = getLoginUser().getBuildQuerySetting().getUserQueries().iterator().next().getQuery();+ else if (!getBuildSetting().getNamedQueries().isEmpty())+ query = getBuildSetting().getNamedQueries().iterator().next().getQuery();}return query;}@@ -99,11 +84,6 @@ public class BuildListPage extends LayoutPage {return new NamedBuildQueriesBean();}- @Override- protected boolean needsLogin(NamedBuildQuery namedQuery) {- return BuildQuery.parse(null, namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, BuildListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javaindex 6f1d624a6c..02f454ba45 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.issue;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -21,7 +20,6 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.modal.ModalPanel;@@ -46,22 +44,10 @@ public class IssueListPage extends LayoutPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getLoginUser() != null) {- for (NamedIssueQuery namedQuery: getLoginUser().getIssueQuerySetting().getUserQueries())- queries.add(namedQuery.getQuery());- }- for (NamedIssueQuery namedQuery: getIssueSetting().getNamedQueries())- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (getLoginUser() != null || !IssueQuery.parse(null, each, true).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }+ if (getLoginUser() != null && !getLoginUser().getIssueQuerySetting().getUserQueries().isEmpty())+ query = getLoginUser().getIssueQuerySetting().getUserQueries().iterator().next().getQuery();+ else if (!getIssueSetting().getNamedQueries().isEmpty())+ query = getIssueSetting().getNamedQueries().iterator().next().getQuery();}return query;}@@ -103,11 +89,6 @@ public class IssueListPage extends LayoutPage {return new NamedIssueQueriesBean();}- @Override- protected boolean needsLogin(NamedIssueQuery namedQuery) {- return IssueQuery.parse(null, namedQuery.getQuery(), true).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedIssueQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, IssueListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex fd9bb6004e..62c62968f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -20,8 +19,6 @@ import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalProjectSetting;-import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.list.ProjectListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -49,22 +46,10 @@ public class ProjectListPage extends LayoutPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getLoginUser() != null) {- for (NamedProjectQuery namedQuery: getLoginUser().getProjectQuerySetting().getUserQueries())- queries.add(namedQuery.getQuery());- }- for (NamedProjectQuery namedQuery: getProjectSetting().getNamedQueries())- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !ProjectQuery.parse(each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }+ if (getLoginUser() != null && !getLoginUser().getProjectQuerySetting().getUserQueries().isEmpty())+ query = getLoginUser().getProjectQuerySetting().getUserQueries().iterator().next().getQuery();+ else if (!getProjectSetting().getNamedQueries().isEmpty())+ query = getProjectSetting().getNamedQueries().iterator().next().getQuery();}return query;}@@ -98,11 +83,6 @@ public class ProjectListPage extends LayoutPage {return new NamedProjectQueriesBean();}- @Override- protected boolean needsLogin(NamedProjectQuery namedQuery) {- return ProjectQuery.parse(namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedProjectQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex e4b31d4bdb..474beeb53c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.builds;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -24,8 +23,6 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalBuildSetting;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -49,23 +46,12 @@ public class ProjectBuildsPage extends ProjectPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getProject().getBuildQuerySettingOfCurrentUser() != null) {- for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())- queries.add(namedQuery.getQuery());+ if (getProject().getBuildQuerySettingOfCurrentUser() != null+ && !getProject().getBuildQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {+ query = getProject().getBuildQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();+ } else if (!getProject().getBuildSetting().getNamedQueries(true).isEmpty()) {+ query = getProject().getBuildSetting().getNamedQueries(true).iterator().next().getQuery();}- for (NamedBuildQuery namedQuery: getProject().getBuildSetting().getNamedQueries(true))- queries.add(namedQuery.getQuery());- query = null;- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }}return query;}@@ -102,11 +88,6 @@ public class ProjectBuildsPage extends ProjectPage {return new NamedBuildQueriesBean();}- @Override- protected boolean needsLogin(NamedBuildQuery namedQuery) {- return BuildQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.javaindex ac0ab6fe1e..71a7eab3ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.codecomments;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -21,7 +20,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.component.modal.ModalPanel;@@ -45,22 +43,12 @@ public class ProjectCodeCommentsPage extends ProjectPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getProject().getCodeCommentQuerySettingOfCurrentUser() != null) {- for (NamedCodeCommentQuery namedQuery: getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries())- queries.add(namedQuery.getQuery());+ if (getProject().getCodeCommentQuerySettingOfCurrentUser() != null+ && !getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {+ query = getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();+ } else if (!getProject().getNamedCodeCommentQueries().isEmpty()) {+ query = getProject().getNamedCodeCommentQueries().iterator().next().getQuery();}- for (NamedCodeCommentQuery namedQuery: getProject().getNamedCodeCommentQueries())- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }}return query;}@@ -93,11 +81,6 @@ public class ProjectCodeCommentsPage extends ProjectPage {return new NamedCodeCommentQueriesBean();}- @Override- protected boolean needsLogin(NamedCodeCommentQuery namedQuery) {- return CodeCommentQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedCodeCommentQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectCodeCommentsPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 2cbd5c15c5..71d09b71cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.commits;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -21,7 +20,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.modal.ModalPanel;@@ -46,22 +44,12 @@ public class ProjectCommitsPage extends ProjectPage {protected String load() {String query = getPageParameters().get(PARAM_COMMIT_QUERY).toString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getProject().getCommitQuerySettingOfCurrentUser() != null) {- for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())- queries.add(namedQuery.getQuery());+ if (getProject().getCommitQuerySettingOfCurrentUser() != null+ && !getProject().getCommitQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {+ query = getProject().getCommitQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();+ } else if (!getProject().getNamedCommitQueries().isEmpty()) {+ query = getProject().getNamedCommitQueries().iterator().next().getQuery();}- for (NamedCommitQuery namedQuery: getProject().getNamedCommitQueries())- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !CommitQuery.parse(getProject(), each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }}return query;}@@ -96,11 +84,6 @@ public class ProjectCommitsPage extends ProjectPage {return new NamedCommitQueriesBean();}- @Override- protected boolean needsLogin(NamedCommitQuery namedQuery) {- return CommitQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedCommitQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectCommitsPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.javaindex 4a599d74ca..4940285e85 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java@@ -57,14 +57,7 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde});List<Tab> tabs = new ArrayList<>();- tabs.add(new IssuesTab("Issue List", ProjectIssueListPage.class) {-- @Override- public Component render(String componentId) {- return new PageTabLink(componentId, this);- }-- });+ tabs.add(new IssuesTab("Issue List", ProjectIssueListPage.class));tabs.add(new IssuesTab("Issue Boards", IssueBoardsPage.class));tabs.add(new IssuesTab("Milestones", MilestoneListPage.class, NewMilestonePage.class,MilestoneDetailPage.class, MilestoneEditPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex f33ec5e338..98ba249c84 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -23,6 +23,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;@@ -61,10 +62,15 @@ abstract class BacklogColumnPanel extends Panel {@Overrideprotected Integer load() {- if (getQuery() != null)- return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());- else+ if (getQuery() != null) {+ try {+ return OneDev.getInstance(IssueManager.class).count(getProject(), getQuery().getCriteria());+ } catch (OneException e) {+ return 0;+ }+ } else {return 0;+ }}};@@ -163,7 +169,7 @@ abstract class BacklogColumnPanel extends Panel {issue = SerializationUtils.clone(issue);issue.setMilestone(null);}- if (getQuery().matches(issue, SecurityUtils.getUser())) {+ if (getQuery().matches(issue)) {String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());issueDragging.getHandler().appendJavaScript(script);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex f419ad383b..2c44f5e2ec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -103,10 +103,15 @@ abstract class BoardColumnPanel extends Panel implements EditContext {@Overrideprotected Integer load() {- if (getQuery() != null)- return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());- else+ if (getQuery() != null) {+ try {+ return OneDev.getInstance(IssueManager.class).count(getProject(), getQuery().getCriteria());+ } catch(OneException e) {+ return 0;+ }+ } else {return 0;+ }}};@@ -175,7 +180,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {issue = SerializationUtils.clone(issue);issue.setMilestone(getMilestone());}- if (getQuery().matches(issue, SecurityUtils.getUser())) {+ if (getQuery().matches(issue)) {String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());issueDragging.getHandler().appendJavaScript(script);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.htmlindex 6604754402..03af5a0373 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html@@ -1,3 +1,4 @@<wicket:panel>+ <div wicket:id="feedback"></div><div wicket:id="cards" class="card"></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 925accc2f0..fc1ade91bf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -15,17 +15,18 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;import io.onedev.server.web.util.QueryPosition;+import io.onedev.server.OneException;@SuppressWarnings("serial")abstract class CardListPanel extends Panel {@@ -38,32 +39,38 @@ abstract class CardListPanel extends Panel {protected void onInitialize() {super.onInitialize();+ add(new NotificationPanel("feedback", this));+RepeatingView cardsView = new RepeatingView("cards");int index = 0;- for (Issue issue: queryIssues(0, WebConstants.PAGE_SIZE)) {- Long issueId = issue.getId();- IModel<Issue> model = new LoadableDetachableModel<Issue>() {-- @Override- protected Issue load() {- return OneDev.getInstance(IssueManager.class).load(issueId);- }-- };- int cardOffset = index;- cardsView.add(new BoardCardPanel(cardsView.newChildId(), model) {-- @Override- protected QueryPosition getPosition() {- IssueQuery query = getQuery();- if (query != null)- return new QueryPosition(query.toString(), getCardCount(), cardOffset);- else- return null;- }-- });- index++;+ try {+ for (Issue issue: queryIssues(0, WebConstants.PAGE_SIZE)) {+ Long issueId = issue.getId();+ IModel<Issue> model = new LoadableDetachableModel<Issue>() {++ @Override+ protected Issue load() {+ return OneDev.getInstance(IssueManager.class).load(issueId);+ }++ };+ int cardOffset = index;+ cardsView.add(new BoardCardPanel(cardsView.newChildId(), model) {++ @Override+ protected QueryPosition getPosition() {+ IssueQuery query = getQuery();+ if (query != null)+ return new QueryPosition(query.toString(), getCardCount(), cardOffset);+ else+ return null;+ }++ });+ index++;+ }+ } catch (OneException e) {+ error(e.getMessage());}add(cardsView);@@ -137,10 +144,11 @@ abstract class CardListPanel extends Panel {}private List<Issue> queryIssues(int offset, int count) {- if (getQuery() != null)- return getIssueManager().query(getProject(), SecurityUtils.getUser(), getQuery(), offset, count);- else+ if (getQuery() != null) {+ return getIssueManager().query(getProject(), getQuery(), offset, count);+ } else {return new ArrayList<>();+ }}protected abstract Project getProject();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 78eca86915..75889b9e58 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -125,34 +125,21 @@ public class IssueBoardsPage extends ProjectIssuesPage {return null;}- if (SecurityUtils.getUser() == null && additionalQuery.needsLogin()) {- error("Please login to perform this query");+ IssueQuery baseQuery;+ try {+ baseQuery = IssueQuery.parse(getProject(), baseQueryString, true);+ } catch (Exception e) {+ String prefix;+ if (backlog)+ prefix = "Error parsing backlog base query: ";+ else+ prefix = "Error parsing base query: ";++ logger.error(prefix + baseQueryString, e);+ error(prefix + e.getMessage());return null;- } else {- IssueQuery baseQuery;- try {- baseQuery = IssueQuery.parse(getProject(), baseQueryString, true);- } catch (Exception e) {- String prefix;- if (backlog)- prefix = "Error parsing backlog base query: ";- else- prefix = "Error parsing base query: ";-- logger.error(prefix + baseQueryString, e);- error(prefix + e.getMessage());- return null;- }- if (SecurityUtils.getUser() == null && baseQuery.needsLogin()) {- if (backlog)- error("Login is required for backlog base query");- else- error("Login is required for base query");- return null;- } else {- return IssueQuery.merge(baseQuery, additionalQuery);- }- }+ }+ return IssueQuery.merge(baseQuery, additionalQuery);}public IssueBoardsPage(PageParameters params) {@@ -610,7 +597,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {elsemodel = Model.of(query);TextField<String> input = new TextField<String>("input", model);- input.add(new IssueQueryBehavior(projectModel));+ input.add(new IssueQueryBehavior(projectModel, true, false));if (backlog)input.add(AttributeAppender.append("placeholder", "Filter backlog issues"));elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 08e7262fcc..97e31888ec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.issues.list;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -22,8 +21,6 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -47,22 +44,12 @@ public class ProjectIssueListPage extends ProjectIssuesPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getProject().getIssueQuerySettingOfCurrentUser() != null) {- for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())- queries.add(namedQuery.getQuery());+ if (getProject().getIssueQuerySettingOfCurrentUser() != null+ && !getProject().getIssueQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {+ query = getProject().getIssueQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();+ } else if (!getProject().getIssueSetting().getNamedQueries(true).isEmpty()) {+ query = getProject().getIssueSetting().getNamedQueries(true).iterator().next().getQuery();}- for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getNamedQueries(true))- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !IssueQuery.parse(getProject(), each, true).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }}return query;}@@ -95,11 +82,6 @@ public class ProjectIssueListPage extends ProjectIssuesPage {return new NamedIssueQueriesBean();}- @Override- protected boolean needsLogin(NamedIssueQuery namedQuery) {- return IssueQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedIssueQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectIssueListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex 904a0f8e35..3ff5e0cd6b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.project.pullrequests;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -26,7 +25,6 @@ import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalPullRequestSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;@@ -51,22 +49,12 @@ public class ProjectPullRequestsPage extends ProjectPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getProject().getPullRequestQuerySettingOfCurrentUser() != null) {- for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())- queries.add(namedQuery.getQuery());+ if (getProject().getPullRequestQuerySettingOfCurrentUser() != null+ && !getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {+ query = getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();+ } else if (!getProject().getPullRequestSetting().getNamedQueries(true).isEmpty()) {+ query = getProject().getPullRequestSetting().getNamedQueries(true).iterator().next().getQuery();}- for (NamedPullRequestQuery namedQuery: getProject().getPullRequestSetting().getNamedQueries(true))- queries.add(namedQuery.getQuery());- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }}return query;}@@ -103,11 +91,6 @@ public class ProjectPullRequestsPage extends ProjectPage {return new NamedPullRequestQueriesBean();}- @Override- protected boolean needsLogin(NamedPullRequestQuery namedQuery) {- return PullRequestQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedPullRequestQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, ProjectPullRequestsPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 1c665f5c4c..75816d2ba9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -464,7 +464,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count) {- return getPullRequestManager().query(getProject(), getLoginUser(), query, offset, count);+ return getPullRequestManager().query(getProject(), query, offset, count);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.javaindex c467d6f6d6..8bcdc5d281 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java@@ -1,7 +1,6 @@package io.onedev.server.web.page.pullrequest;import java.util.ArrayList;-import java.util.List;import javax.annotation.Nullable;@@ -23,8 +22,6 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalPullRequestSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -48,23 +45,10 @@ public class PullRequestListPage extends LayoutPage {protected String load() {String query = getPageParameters().get(PARAM_QUERY).toOptionalString();if (query == null) {- List<String> queries = new ArrayList<>();- if (getLoginUser() != null) {- for (NamedPullRequestQuery namedQuery: getLoginUser().getPullRequestQuerySetting().getUserQueries())- queries.add(namedQuery.getQuery());- }- for (NamedPullRequestQuery namedQuery: getPullRequestSetting().getNamedQueries())- queries.add(namedQuery.getQuery());-- for (String each: queries) {- try {- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(null, each).needsLogin()) {- query = each;- break;- }- } catch (Exception e) {- }- }+ if (getLoginUser() != null && !getLoginUser().getPullRequestQuerySetting().getUserQueries().isEmpty())+ query = getLoginUser().getPullRequestQuerySetting().getUserQueries().iterator().next().getQuery();+ else if (!getPullRequestSetting().getNamedQueries().isEmpty())+ query = getPullRequestSetting().getNamedQueries().iterator().next().getQuery();}return query;}@@ -97,11 +81,6 @@ public class PullRequestListPage extends LayoutPage {return new NamedPullRequestQueriesBean();}- @Override- protected boolean needsLogin(NamedPullRequestQuery namedQuery) {- return PullRequestQuery.parse(null, namedQuery.getQuery()).needsLogin();- }-@Overrideprotected Link<Void> newQueryLink(String componentId, NamedPullRequestQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, PullRequestListPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 4f3fc2ede7..22926925ed 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -49,8 +49,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.script.ScriptContribution;import io.onedev.server.util.script.identity.ScriptIdentity;@@ -76,7 +74,7 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {List<String> branchNames = project.getBranches().stream()@@ -96,7 +94,7 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {List<String> tagNames = project.getTags().stream()@@ -116,7 +114,7 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project))return null;else@@ -128,8 +126,7 @@ public class SuggestionUtils {public static List<InputSuggestion> suggestProjects(String matchWith) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- User user = SecurityUtils.getUser();- List<String> projectNames = projectManager.getPermittedProjects(user, new AccessProject())+ List<String> projectNames = projectManager.getPermittedProjects(new AccessProject()).stream().map(it->it.getName()).sorted()@@ -214,9 +211,9 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, @Nullable User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {List<InputSuggestion> suggestions = new ArrayList<>();- if (User.asSubject(user).isPermitted(new ProjectPermission(project, new AccessProject()))) {+ if (SecurityUtils.canAccess(project)) {for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, count))suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));}@@ -230,9 +227,9 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, @Nullable User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {List<InputSuggestion> suggestions = new ArrayList<>();- if (User.asSubject(user).isPermitted(new ProjectPermission(project, new ReadCode()))) {+ if (SecurityUtils.canReadCode(project)) {PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);for (PullRequest request: pullRequestManager.query(project, matchWith, count))suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));@@ -247,9 +244,10 @@ public class SuggestionUtils {return suggest(project, matchWith, new ProjectScopedSuggester() {@Override- public List<InputSuggestion> suggest(Project project, @Nullable User user, String matchWith) {+ public List<InputSuggestion> suggest(Project project, String matchWith) {List<InputSuggestion> suggestions = new ArrayList<>();- for (Build build: OneDev.getInstance(BuildManager.class).query(project, user, matchWith, count)) {+ for (Build build: OneDev.getInstance(BuildManager.class)+ .query(project, matchWith, count)) {String description;if (build.getVersion() != null)description = "(" + build.getVersion() + ") " + build.getJobName();@@ -279,7 +277,6 @@ public class SuggestionUtils {private static List<InputSuggestion> suggest(@Nullable Project project, String matchWith,ProjectScopedSuggester projectScopedSuggester, String scopeSeparator) {- User user = SecurityUtils.getUser();if (project == null) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);if (matchWith.contains(scopeSeparator)) {@@ -287,8 +284,7 @@ public class SuggestionUtils {matchWith = StringUtils.substringAfter(matchWith, scopeSeparator);project = projectManager.find(projectName);if (project != null) {- List<InputSuggestion> projectScopedSuggestions =- projectScopedSuggester.suggest(project, user, matchWith);+ List<InputSuggestion> projectScopedSuggestions = projectScopedSuggester.suggest(project, matchWith);if (projectScopedSuggestions != null) {List<InputSuggestion> suggestions = new ArrayList<>();for (InputSuggestion suggestion: projectScopedSuggestions) {@@ -322,7 +318,7 @@ public class SuggestionUtils {}} else {List<InputSuggestion> suggestions = new ArrayList<>();- for (Project each: projectManager.getPermittedProjects(user, new AccessProject())) {+ for (Project each: projectManager.getPermittedProjects(new AccessProject())) {LinearRange match = LinearRange.match(each.getName() + scopeSeparator, matchWith);if (match != null) {suggestions.add(new InputSuggestion(@@ -337,21 +333,20 @@ public class SuggestionUtils {return suggestions;}} else {- return projectScopedSuggester.suggest(project, user, matchWith);+ return projectScopedSuggester.suggest(project, matchWith);}}public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class)- .getAccessibleJobNames(project, SecurityUtils.getUser())- .get(project));+ .getAccessibleJobNames(project).get(project));Collections.sort(jobNames);return suggest(jobNames, matchWith);}public static List<InputSuggestion> suggestBuildVersions(Project project, String matchWith) {Collection<String> buildVersions = OneDev.getInstance(BuildManager.class).queryVersions(- project, SecurityUtils.getUser(), matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);List<InputSuggestion> suggestions = new ArrayList<>();for (String buildVersion: buildVersions) {LinearRange match = LinearRange.match(buildVersion, matchWith);@@ -463,7 +458,7 @@ public class SuggestionUtils {static interface ProjectScopedSuggester {@Nullable- List<InputSuggestion> suggest(Project project, @Nullable User user, String matchWith);+ List<InputSuggestion> suggest(Project project, String matchWith);}diff --git a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.javaindex 57bab867c6..d9c0b86879 100644--- a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java+++ b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java@@ -13,6 +13,7 @@ import io.onedev.server.git.AbstractGitTest;import io.onedev.server.model.Project;import io.onedev.server.model.User;+public class CommitQueryTest extends AbstractGitTest {@Test@@ -44,20 +45,25 @@ public class CommitQueryTest extends AbstractGitTest {User user = new User();user.setEmail(CommitQueryTest.this.user.getEmailAddress());- assertTrue(CommitQuery.parse(project, null).matches(event, user));- assertFalse(CommitQuery.parse(project, "branch(dev)").matches(event, user));- assertTrue(CommitQuery.parse(project, "default-branch").matches(event, user));- assertTrue(CommitQuery.parse(project, "branch(master) path(master/*)").matches(event, user));- assertFalse(CommitQuery.parse(project, "path(master/file)").matches(event, user));- assertTrue(CommitQuery.parse(project, "path(master/)").matches(event, user));- assertTrue(CommitQuery.parse(project, "path(master/file) path(master/file*)").matches(event, user));- assertTrue(CommitQuery.parse(project, "message(dev) message(master)").matches(event, user));- assertTrue(CommitQuery.parse(project, "message(dev) message(m*s)").matches(event, user));- assertTrue(CommitQuery.parse(project, "authored-by-me author([email protected])").matches(event, user));- assertFalse(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event, user));- assertTrue(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event, user));- assertTrue(CommitQuery.parse(project, "after(2 days ago) after(1 hour ago)").matches(event, user));- assertFalse(CommitQuery.parse(project, "before(1 hour ago) after(1 day ago)").matches(event, user));+ User.push(user);+ try {+ assertTrue(CommitQuery.parse(project, null).matches(event));+ assertFalse(CommitQuery.parse(project, "branch(dev)").matches(event));+ assertTrue(CommitQuery.parse(project, "default-branch").matches(event));+ assertTrue(CommitQuery.parse(project, "branch(master) path(master/*)").matches(event));+ assertFalse(CommitQuery.parse(project, "path(master/file)").matches(event));+ assertTrue(CommitQuery.parse(project, "path(master/)").matches(event));+ assertTrue(CommitQuery.parse(project, "path(master/file) path(master/file*)").matches(event));+ assertTrue(CommitQuery.parse(project, "message(dev) message(master)").matches(event));+ assertTrue(CommitQuery.parse(project, "message(dev) message(m*s)").matches(event));+ assertTrue(CommitQuery.parse(project, "authored-by-me author([email protected])").matches(event));+ assertFalse(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event));+ assertTrue(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event));+ assertTrue(CommitQuery.parse(project, "after(2 days ago) after(1 hour ago)").matches(event));+ assertFalse(CommitQuery.parse(project, "before(1 hour ago) after(1 day ago)").matches(event));+ } finally {+ User.pop();+ }}}